Rooba
/
pupy
mirror of https://github.com/n1nj4sec/pupy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tcp transports perf improvments

This commit is contained in:
n1nj4sec 2016-06-18 17:58:01 +02:00
parent 46f8440443
commit f5227e79a1
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pupy/network/lib/streams/PupySocketStream.py
View File

@ -51,9 +51,7 @@ class PupySocketStream(SocketStream):
def on_connect(self): def on_connect(self):
self.transport.on_connect() self.transport.on_connect()
d=self.downstream.read() super(PupySocketStream, self).write(self.downstream.read())
if d:
super(PupySocketStream, self).write(d)
def _read(self): def _read(self):
try: try:
@ -73,10 +71,16 @@ class PupySocketStream(SocketStream):
self.buf_in.write(BYTES_LITERAL(buf)) self.buf_in.write(BYTES_LITERAL(buf))
def poll(self, timeout): def poll(self, timeout):
return super(PupySocketStream, self).poll(timeout) or len(self.upstream)>0 return len(self.upstream)>0 or self.sock_poll(timeout)
def sock_poll(self, timeout): def sock_poll(self, timeout):
return super(PupySocketStream, self).poll(timeout) with self.downstream_lock:
if super(PupySocketStream, self).poll(timeout):
self._read()
self.transport.downstream_recv(self.buf_in)
return True
else:
return False
def _upstream_recv(self): def _upstream_recv(self):
""" called as a callback on the downstream.write """ """ called as a callback on the downstream.write """
@ -88,10 +92,8 @@ class PupySocketStream(SocketStream):
if len(self.upstream)>=count: if len(self.upstream)>=count:
return self.upstream.read(count) return self.upstream.read(count)
while len(self.upstream)<count: while len(self.upstream)<count:
if self.sock_poll(0.0001): self.sock_poll(0.1)
with self.downstream_lock: #self._read()
self._read()
self.transport.downstream_recv(self.buf_in)
#it seems we can actively wait here with only perf enhancement #it seems we can actively wait here with only perf enhancement
#if len(self.upstream)<count: #if len(self.upstream)<count:
@ -189,7 +191,7 @@ class PupyUDPSocketStream(object):
while len(self.upstream)<count: while len(self.upstream)<count:
if self.client_side: if self.client_side:
with self.downstream_lock: with self.downstream_lock:
if self._poll_read(0.0001): if self._poll_read(1):
self.transport.downstream_recv(self.buf_in) self.transport.downstream_recv(self.buf_in)
else: else:
time.sleep(0.0001) time.sleep(0.0001)