mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-02-11 12:30:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clarification & cleanup

Browse Source
This commit is contained in:
Jonathan Frederic 2016-01-15 09:50:31 -08:00
parent 69faf0fb9b
commit 7232a6a99a
2 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
notebook/notebookapp.py
View File

@ -790,11 +790,11 @@ class NotebookApp(JupyterApp):
help="Reraise exceptions encountered loading server extensions?", help="Reraise exceptions encountered loading server extensions?",
) )
iopub_msg_rate_limit = Float(0, config=True, allow_none=True, help="""(msg/sec) iopub_msg_rate_limit = Float(0, config=True, help="""(msg/sec)
Maximum rate at which messages can be sent on iopub before they are Maximum rate at which messages can be sent on iopub before they are
limited.""") limited.""")
iopub_data_rate_limit = Float(0, config=True, allow_none=True, help="""(bytes/sec) iopub_data_rate_limit = Float(0, config=True, help="""(bytes/sec)
Maximum rate at which messages can be sent on iopub before they are Maximum rate at which messages can be sent on iopub before they are
limited.""") limited.""")

44
notebook/services/kernels/handlers.py
View File

@ -196,15 +196,14 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
self._kernel_info_future = Future() self._kernel_info_future = Future()
# Rate limiting code # Rate limiting code
self._iopub_msg_count = 0 self._iopub_window_msg_count = 0
self._iopub_byte_count = 0 self._iopub_window_byte_count = 0
self._iopub_msgs_exceeded = False self._iopub_msgs_exceeded = False
self._iopub_data_exceeded = False self._iopub_data_exceeded = False
# Queue of (time stamp, delta) # Queue of (time stamp, byte count)
# Allows you to specify that the msg or byte counts should be adjusted # Allows you to specify that the byte count should be lowered
# by a delta amount at some point in the future. # by a delta amount at some point in the future.
self._queue_msg_count = [] self._iopub_window_byte_queue = []
self._queue_byte_count = []
@gen.coroutine @gen.coroutine
def pre_get(self): def pre_get(self):
@ -284,40 +283,31 @@ class ZMQChannelsHandler(AuthenticatedZMQStreamHandler):
if channel == 'iopub': if channel == 'iopub':
# Remove the counts queued for removal. # Remove the counts queued for removal.
while len(self._queue_msg_count) > 0: now = IOLoop.current().time()
queued = self._queue_msg_count[0] while len(self._iopub_window_byte_queue) > 0:
if (IOLoop.current().time() >= queued[0]): queued = self._iopub_window_byte_queue[0]
self._iopub_msg_count += queued[1] if (now >= queued[0]):
del self._queue_msg_count[0] self._iopub_window_byte_count -= queued[1]
else: self._iopub_window_msg_count -= 1
# This part of the queue hasn't be reached yet, so we can del self._iopub_window_byte_queue[0]
# abort the loop.
break
while len(self._queue_byte_count) > 0:
queued = self._queue_byte_count[0]
if (IOLoop.current().time() >= queued[0]):
self._iopub_byte_count += queued[1]
del self._queue_byte_count[0]
else: else:
# This part of the queue hasn't be reached yet, so we can # This part of the queue hasn't be reached yet, so we can
# abort the loop. # abort the loop.
break break
# Increment the bytes and message count # Increment the bytes and message count
self._iopub_msg_count += 1 self._iopub_window_msg_count += 1
byte_count = sum([len(x) for x in msg_list]) byte_count = sum([len(x) for x in msg_list])
self._iopub_byte_count += byte_count self._iopub_window_byte_count += byte_count
# Queue a removal of the byte and message count for a time in the # Queue a removal of the byte and message count for a time in the
# future, when we are no longer interested in it. # future, when we are no longer interested in it.
self._queue_msg_count.append((IOLoop.current().time() + self.limit_window, -1)) self._iopub_window_byte_queue.append((now + self.limit_window, byte_count))
self._queue_byte_count.append((IOLoop.current().time() + self.limit_window, -byte_count))
# Check the limits, set the limit flags, and reset the # Check the limits, set the limit flags, and reset the
# message and data counts. # message and data counts.
msg_rate = float(self._iopub_msg_count) / self.limit_window msg_rate = float(self._iopub_window_msg_count) / self.limit_window
data_rate = float(self._iopub_byte_count) / self.limit_window data_rate = float(self._iopub_window_byte_count) / self.limit_window
# Check the msg rate # Check the msg rate
if self.iopub_msg_rate_limit is not None and msg_rate > self.iopub_msg_rate_limit and self.iopub_msg_rate_limit > 0: if self.iopub_msg_rate_limit is not None and msg_rate > self.iopub_msg_rate_limit and self.iopub_msg_rate_limit > 0: