diff options
| author | James <olpc@xo-05-28-3A.localdomain> | 2007-07-18 22:54:33 (GMT) |
|---|---|---|
| committer | James <olpc@xo-05-28-3A.localdomain> | 2007-07-18 22:54:33 (GMT) |
| commit | 89f7701457b2222b2d3eaee7ee00285f9f52991a (patch) | |
| tree | 83d7c3f65dbe8d662d95db2bfb22923e86149cda /Util | |
| parent | 610b262bb15f09ae93faa5291f1190a9e0fafa6a (diff) | |
| parent | 4aae75847e4066f3ee48b8650fa59de981828477 (diff) | |
Merge branch 'master' of git+ssh://jaberg@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'Util')
| -rw-r--r-- | Util/Network.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Util/Network.py b/Util/Network.py index 4d69ecd..397110f 100644 --- a/Util/Network.py +++ b/Util/Network.py @@ -48,6 +48,7 @@ message_enum = [ ("PR_LATENCY_QUERY", 4), # test latency ("PR_SYNC_QUERY", 4), # test sync ("PR_TEMPO_QUERY", 0), # test sync +("PR_REQUEST_TEMPO_CHANGE", 4), # request tempo change ("MAX_MSG_ID", 0) ] @@ -79,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": @@ -89,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 @@ -388,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 @@ -426,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 |