Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add locking around output buffer #123

Merged
merged 3 commits into from
Apr 15, 2016
Merged

Add locking around output buffer #123

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
215b8c3
Add locking around output buffer to fix https://github.com/ipython/ip…
thomasj02 Apr 14, 2016
6c9decf
Add _ to conform to code style
thomasj02 Apr 14, 2016
26a12db
Use 'with' for locking
thomasj02 Apr 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions ipykernel/iostream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import os
import threading
import sys
import threading
import uuid
import warnings
from io import StringIO, UnsupportedOperation
Expand Down Expand Up @@ -222,6 +223,7 @@ def __init__(self, session, pub_thread, name, pipe=None):
self._flush_lock = threading.Lock()
self._flush_timeout = None
self._io_loop = pub_thread.io_loop
self._buffer_lock = threading.Lock()
self._new_buffer()

def _is_master_process(self):
Expand Down Expand Up @@ -314,7 +316,8 @@ def write(self, string):
string = string.decode(self.encoding, 'replace')

is_child = (not self._is_master_process())
self._buffer.write(string)
with self._buffer_lock:
self._buffer.write(string)
if is_child:
# newlines imply flush in subprocesses
# mp.Pool cannot be trusted to flush promptly (or ever),
Expand All @@ -333,12 +336,13 @@ def writelines(self, sequence):

def _flush_buffer(self):
"""clear the current buffer and return the current buffer data"""
data = u''
if self._buffer is not None:
buf = self._buffer
self._new_buffer()
data = buf.getvalue()
buf.close()
with self._buffer_lock:
data = u''
if self._buffer is not None:
buf = self._buffer
self._new_buffer()
data = buf.getvalue()
buf.close()
return data

def _new_buffer(self):
Expand Down