Changeset 476 for trunk/RBTelepathy
- Timestamp:
- 03/17/03 23:35:30 (6 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/RBTelepathy/RBTelepathy/Stream/SocketAdaptor.py
r465 r476 49 49 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 50 50 51 isshutdown = False 51 52 _sendData = None 52 isshutdown = False53 53 _isshutdown_send = False 54 54 _isshutdown_recv = False 55 maxsend = 100000 55 56 log = logging.getLogger('SocketStream') 56 57 … … 80 81 raise ErrorTypes.StreamError('Cannot write to stream after shutdown') 81 82 else: 82 self._sendData.append( [data, len(data)])83 self._sendData.append(data) 83 84 def _delSendData(self): 84 85 del self._sendData … … 87 88 88 89 def send(self, data): 89 self.SendData.append( [data, len(data)])90 self.SendData.append(data) 90 91 write = send 91 92 … … 144 145 145 146 def _ProcessWrite(self, *args, **kw): 146 remaining = self._sendData[0][1] 147 data = self._sendData[0][0] 148 if remaining > 100000: 149 start, end = -remaining, -remaining + 100000 150 nSent = self._SocketSend(data[start:end], *args, **kw) 147 data = self._sendData[0] 148 remaining = len(data) 149 if remaining > self.maxsend: 150 nSent = self._SocketSend(buffer(data, 0, self.maxsend), *args, **kw) 151 151 else: 152 nSent = self._SocketSend(data [-remaining:], *args, **kw)152 nSent = self._SocketSend(data, *args, **kw) 153 153 if nSent is not None: 154 remaining -= nSent 155 if remaining > 0: 156 print ":: Sent", nSent 157 self._sendData[0][1] = remaining 158 else: 159 self._sendData.pop(0) 154 data = buffer(data, nSent) 155 if data: self._sendData[0] = data 156 else: self._sendData.pop(0) 160 157 161 158 if self.isshutdown:
