dorian
/
paramiko
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[project @ Arch-1:robey@lag.net--2005-master-shake%paramiko--dev--1--patch-71] 

the window-adjust can be sent outside of the lock, as long as the window size tracking is done within the lock (ie: allocate window space within the lock, then send the ack later) -- helps avoid deadlocks
This commit is contained in:
Robey Pointer 2005-10-29 20:41:14 +00:00
parent f65edffbfb
commit 3c67e35b5f
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
paramiko/channel.py
View File

@ -539,9 +539,18 @@ class Channel (object):
else: else:
out = self.in_buffer[:nbytes] out = self.in_buffer[:nbytes]
self.in_buffer = self.in_buffer[nbytes:] self.in_buffer = self.in_buffer[nbytes:]
self._check_add_window(len(out)) ack = self._check_add_window(len(out))
finally: finally:
self.lock.release() self.lock.release()
# no need to hold the channel lock when sending this
if ack > 0:
m = Message()
m.add_byte(chr(MSG_CHANNEL_WINDOW_ADJUST))
m.add_int(self.remote_chanid)
m.add_int(ack)
self.transport._send_user_message(m)
return out return out
def recv_stderr_ready(self): def recv_stderr_ready(self):
@ -1056,19 +1065,17 @@ class Channel (object):
def _check_add_window(self, n): def _check_add_window(self, n):
# already holding the lock! # already holding the lock!
if self.closed or self.eof_received or not self.active: if self.closed or self.eof_received or not self.active:
return return 0
if self.ultra_debug: if self.ultra_debug:
self._log(DEBUG, 'addwindow %d' % n) self._log(DEBUG, 'addwindow %d' % n)
self.in_window_sofar += n self.in_window_sofar += n
if self.in_window_sofar > self.in_window_threshold: if self.in_window_sofar <= self.in_window_threshold:
if self.ultra_debug: return 0
self._log(DEBUG, 'addwindow send %d' % self.in_window_sofar) if self.ultra_debug:
m = Message() self._log(DEBUG, 'addwindow send %d' % self.in_window_sofar)
m.add_byte(chr(MSG_CHANNEL_WINDOW_ADJUST)) out = self.in_window_sofar
m.add_int(self.remote_chanid) self.in_window_sofar = 0
m.add_int(self.in_window_sofar) return out
self.transport._send_user_message(m)
self.in_window_sofar = 0
def _wait_for_send_window(self, size): def _wait_for_send_window(self, size):
""" """