Changeset 77 for trigger/CommSocket.py

Timestamp:

06/30/09 11:09:39 (15 years ago)

Author:

rissim

Message:

trigger: gui added, interface modified

File:

• trigger/CommSocket.py (modified) (7 diffs)

trigger/CommSocket.py

@@ -20 +20 @@
 import time
 BUFSIZ = 1024
-
-
+class Sender(threading.Thread):
+    """ Sends the messages """
+    outputs = []
+    oldmessage=''
+     
+    def run(self):
+        running = 1
+        while running:
+            time.sleep(0.001)
+            if(self.oldmessage!=GlobalVariables.ServerMessage):
+                self.oldmessage=GlobalVariables.ServerMessage
+             
+                for o in self.outputs:
+                    # o.send(msg)
+                    #print "sending (glob): ",GlobalVariables.ServerMessage,"\n"
+                    send(o,GlobalVariables.ServerMessage )
+                if(GlobalVariables.UserInput[1:]=='exit' or GlobalVariables.UserInput[1:]=='EXIT'):
+                    running=0
+              
+
+
+         
 class CommServer(threading.Thread):
     """ Simple  server using select """
-    
+    oldmessage=''
+    sender=Sender()
     def __init__(self, port=3490, backlog=5):
         self.clients = 0
@@ -36 +57 @@
         print 'SERVER: Listening to port',port,'...'
         self.server.listen(backlog)
+        self.sender.start()
         # Trap keyboard interrupts
         #signal.signal(signal.SIGINT, self.sighandler)
         threading.Thread.__init__(self)
     #def sighandler(self, signum, frame):
-    #    if(GlobalVariables.UserInput=='exit' or GlobalVariables.UserInput=='EXIT'):
+    #    if(GlobalVariables.UserInput[1:]=='exit' or GlobalVariables.UserInput[1:]=='EXIT'):
     #        running=0
     #        for o in self.outputs:
@@ -71 +93 @@
 
         while running:
-            time.sleep(0.01)
-            if(GlobalVariables.UserInput=='exit' or GlobalVariables.UserInput=='EXIT'):
+            time.sleep(0.001)
+            #if(self.oldmessage!=GlobalVariables.ServerMessage):
+            #    self.oldmessage=GlobalVariables.ServerMessage
+            #    for o in self.outputs:
+            #        # o.send(msg)
+            #        #print "sending (glob): ",GlobalVariables.ServerMessage,"\n"
+            #        send(o,GlobalVariables.ServerMessage )
+            if(GlobalVariables.UserInput[1:]=='exit' or GlobalVariables.UserInput[1:]=='EXIT'):
                 running=0
             
@@ -87 +115 @@
                     # handle the server socket
                     client, address = self.server.accept()
-                    print 'SERVER: got connection %d from %s' % (client.fileno(), address)
+                    #print 'SERVER: got connection %d from %s' % (client.fileno(), address)
+                    GlobalVariables.ServerMessage = 'SERVER: got connection %d from %s' %( client.fileno(), address)+"\n"
                     # Read the login name
-                    cname = receive(client).split('NAME: ')[1]
-                    
+                    cname="TESTUSER"
+                    #cname = receive(client).split('NAME: ')[1]
+                    #print cname
                     # Compute client name and send back
                     self.clients += 1
-                    send(client, 'FROM SERVER: CLIENT: ' + str(address[0]))
+                    #send(client, 'FROM SERVER: CLIENT: ' + str(address[0]))
+                    #send(client,"test");
+                    #send(client,"test2");
+                    
                     inputs.append(client)
 
@@ -99 +132 @@
                     # Send joining information to other clients
                     msg = '\nFROM SERVER: (Connected: New client (%d) from %s)' % (self.clients, self.getname(client))
-                    for o in self.outputs:
-                        # o.send(msg)
-                        send(o, msg)
-                    
+                    GlobalVariables.ServerMessage=msg;
+                    time.sleep(0.001)
+                    #print "appending ", client
                     self.outputs.append(client)
-
+                    self.sender.outputs=self.outputs
                 #elif s == sys.stdin:
                     # handle standard input
@@ -119 +151 @@
                     # handle all other sockets
                     try:
-                        # data = s.recv(BUFSIZ)
-                        data = receive(s)
+                        data = s.recv(BUFSIZ)
+                        
+                        #data = receive(s)
+                        #print data
                         if data:
+                            GlobalVariables.counter += 1
+                            GlobalVariables.counter %= 10
+                            data = str(GlobalVariables.counter)+data
                             # Send as new client's message...
                             msg = 'SERVER: You sent: >> ' + data
+                            msg+="\n"
                             GlobalVariables.UserInput=data
-                            print "SERVER: recv data: "+data
-                            for o in self.outputs:
-                                send(o, msg)
-                            if(GlobalVariables.UserInput=='exit' or GlobalVariables.UserInput=='EXIT'):
+                            #print "SERVER: recv data: "+data
+                            #print "msg is: ",msg
+
+                            #for o in self.outputs:
+                                #msg="TSTSTS"
+                             #   print "sending ",msg," to ",o
+                                
+                              #  send(o, msg)
+                            if(GlobalVariables.UserInput[1:]=='exit' or GlobalVariables.UserInput[1:]=='EXIT'):
                                 running=0
                                 # Send data to all except ourselves
                                                             
                         else:
-                            print 'SERVER: %d hung up' % s.fileno()
+                            GlobalVariables.ServerMessage ='SERVER: %d hung up' % s.fileno()
                             self.clients -= 1
                             s.close()
                             inputs.remove(s)
                             self.outputs.remove(s)
-
+                            self.sender.outputs=self.outputs
                             # Send client leaving information to others
                             msg = 'SERVER: \n(Hung up: Client from %s)' % self.getname(s)
-                            for o in self.outputs:
+                            #for o in self.outputs:
                                 # o.send(msg)
-                                send(o, msg)
+                                # send(o, msg)
                                 
                     except socket.error, e:
@@ -151 +194 @@
                         
 
-        print 'SERVER: Shutting down server...'
+        GlobalVariables.ServerMessage ='SERVER: Shutting down server...'
+        
         # Close existing client sockets
         for o in self.outputs: