Changeset 445

Timestamp:

05/08/08 10:19:56 (8 months ago)

Author:

mgoldman

Message:

communication refactor phase 2

Note: this should not have had an effect on current workingness

Files:

• branches/trunk-pmd-intproto/server/master.py (modified) (4 diffs)

branches/trunk-pmd-intproto/server/master.py

@@ -34 +34 @@
-        root_layer.update()
-
+def ret2(a,b):
+        return b
-
-class Master:
@@ -137 +139 @@
-
-        def service_manager(self, (mgr, info)):
+                '''
+                Handle servicing of a manager connection.  In general, we read
+                a request from the manager.  
+                
+                If the request is one of a couple
+                of types handled internally by the server, process the request
+                and send the results back to the manager. (This may or may not
+                interact with one or more clients.)
+
+                If the request is of an unknown type, pass the message along to
+                clients.  Collect the results from each client and packagge
+                them up in a message.  Send this back to the manager.
+                '''
-                try:
-                        print "Servicing " + repr(info)
@@ -155 +170 @@
-                                        res = self.storeadd((mgr, info), val)
-                                elif val.msg == 'remove':
-val
+self.storeremove((mgr, info), val)
-                                else:
-
-
-
-
-
+
-                                pickle.dump(res, mgr.makefile())
-                                return res
@@ -215 +226 @@
-                n.update()
-                return True
+        
+        def comm(self, func, msg, (mgr, info)):
+                target = val.targets
+                val.targets = None
+                if target == None:
+                        val = func((mgr, info), msg)
+                        self.clients.send_all(val)
+                        res = []
+                        for (c, i) in self.clients.get_clients().items():
+                                ret = pickle.load(c.makefile())
+                                res.append((ret, i))
+                else:
+                        print "This section unfinished."
+                        raise NotImplementedError
+                return res
-
-        def run(self):