Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/Util
diff options
context:
space:
mode:
authoramartin <olpc@xo-05-28-21.localdomain>2007-07-19 06:23:33 (GMT)
committer amartin <olpc@xo-05-28-21.localdomain>2007-07-19 06:23:33 (GMT)
commit97a8424004a08a2ac0aa26eb8b35e464ebe86f3b (patch)
tree244a7b64a784e90e7b101a0d3d51ac538e0a33b5 /Util
parent8a15fb18bcd05d494a5f23eb47042cba46469965 (diff)
network
Diffstat (limited to 'Util')
-rw-r--r--Util/Network.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/Util/Network.py b/Util/Network.py
index e9210aa..397110f 100644
--- a/Util/Network.py
+++ b/Util/Network.py
@@ -80,7 +80,9 @@ class Listener( threading.Thread ):
def run(self):
while 1: # rely on the owner to kill us when necessary
try:
+ print "Listerner:: select"
inputReady, outputReady, exceptReady = select.select( self.inputSockets, self.outputSockets, self.exceptSockets )
+ print "Listener:: inputready", inputReady
if self.listenerSocket in inputReady:
data, s = self.listenerSocket.recvfrom(MAX_SIZE)
if data == "REFRESH":
@@ -90,8 +92,10 @@ class Listener( threading.Thread ):
continue
else:
break # exit thread
+ print "Listener:: threads_enter"
gtk.gdk.threads_enter()
self.owner._processSockets( inputReady, outputReady, exceptReady )
+ print "Listener:: threads_leave"
gtk.gdk.threads_leave()
except socket.error, (value, message):
print "Listener:: socket error: " + message
@@ -389,12 +393,12 @@ class Network:
if size >= 0:
if length != size:
- print "Network:: message wrong length! Got %d expected %d: %s %s" % (len(data), MSG_SIZE[message], MSG_NAME[message], data)
+ print "Network:: message wrong length! Got %d expected %d: %s" % (len(data), MSG_SIZE[message], MSG_NAME[message])
return
msg = chr(message) + data
elif size == -1:
if length > 255:
- print "Network:: oversized message! Got %d, max size 255: %s %s" % (length, MSG_NAME[message], data)
+ print "Network:: oversized message! Got %d, max size 255: %s" % (length, MSG_NAME[message])
return
msg = chr(message) + chr(length) + data
else: # size == -2
@@ -427,12 +431,12 @@ class Network:
if size >= 0:
if length != size:
- print "Network:: message wrong length! Got %d expected %d: %s %s" % (MSG_SIZE[message], len(data), MSG_NAME[message], data)
+ print "Network:: message wrong length! Got %d expected %d: %s" % (MSG_SIZE[message], len(data), MSG_NAME[message])
return
msg = chr(message) + data
elif size == -1:
if length > 255:
- print "Network:: oversized message! Size %d, max size 255: %s %s" % (length, MSG_NAME[message], data)
+ print "Network:: oversized message! Size %d, max size 255: %s" % (length, MSG_NAME[message])
return
msg = chr(message) + chr(length) + data
else: # size == -2