X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;ds=inline;f=server.py;h=ed60b6a34b455b95a1511db4512cb0268e636ba2;hb=c26fe38bd460cb28bf01d06df94310bcc4219c3b;hp=0a0ac88fc230d59e6a72c423f5a385a82b82b000;hpb=4c633486d35862198e0ed6553ee52e43a0401a3b;p=plomrogue2-experiments

diff --git a/server.py b/server.py
index 0a0ac88..ed60b6a 100755
--- a/server.py
+++ b/server.py
@@ -93,9 +93,11 @@ def fib(n):
 
 class CommandHandler:
 
-    def __init__(self, world, queues_out):
-        self.world = world
+    def __init__(self, queues_out):
+        from multiprocessing import Pool
         self.queues_out = queues_out
+        self.pool = Pool()
+        self.world = World()
 
     def send_to(self, connection_id, msg):
         """Send msg to client of connection_id."""
@@ -112,7 +114,6 @@ class CommandHandler:
         Numbers are calculated in parallel as far as possible, using fib().
         A 'CALCULATING …' message is sent to caller before the result.
         """
-        from multiprocessing import Pool
         fib_fail = 'MALFORMED FIB REQUEST'
         if len(tokens) < 2:
             self.send_to(connection_id, fib_fail)
@@ -125,13 +126,13 @@ class CommandHandler:
                 self.send_to(connection_id, fib_fail)
                 return
         self.send_to(connection_id, 'CALCULATING …')
-        with Pool(len(numbers)) as p:
-            results = p.map(fib, numbers)
+        results = self.pool.map(fib, numbers)
         reply = ' '.join([str(r) for r in results])
         self.send_to(connection_id, reply)
 
     def cmd_inc(self, connection_id):
-        """Increment world.turn, send NEW_TURN message to all clients."""
+        """Increment world.turn, send TURN_FINISHED, NEW_TURN to everyone."""
+        self.send_all('TURN_FINISHED ' + str(self.world.turn))
         self.world.turn += 1
         self.send_all('NEW_TURN ' + str(self.world.turn))
 
@@ -187,8 +188,7 @@ def io_loop(q):
     sending out replies.
     """
     queues_out = {}
-    world = World()
-    command_handler = CommandHandler(world, queues_out)
+    command_handler = CommandHandler(queues_out)
     while True:
         x = q.get()
         command_type = x[0]