Add map data transfer, fix socket reading queue.

[plomrogue2-experiments] / server.py

diff --git a/server.py b/server.py
index 0a0ac88fc230d59e6a72c423f5a385a82b82b000..4e3f4a25330c240f6798217a8bcb60994594071e 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -81,6 +81,8 @@ class IO_Handler(socketserver.BaseRequestHandler):
 
 class World:
     turn = 0
+    map_ = 'xxxxx\nx...x\nx.X.x\nx...x\nxxxxx'
+    player_pos = (3,3)
 
 
 def fib(n):
@@ -93,9 +95,12 @@ 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()
+        self.pool_result = None
 
     def send_to(self, connection_id, msg):
         """Send msg to client of connection_id."""
@@ -112,7 +117,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,15 +129,29 @@ 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 game turn data to everyone.
+
+        To simulate game processing waiting times, a one second delay between
+        TURN_FINISHED and NEW_TURN occurs; after NEW_TURN, some expensive
+        calculations are started as pool processes that need to be finished
+        until a further INC finishes the turn.
+        """
+        from time import sleep
+        if self.pool_result is not None:
+            self.pool_result.wait()
+        self.send_all('TURN_FINISHED ' + str(self.world.turn))
+        sleep(1)
         self.world.turn += 1
         self.send_all('NEW_TURN ' + str(self.world.turn))
+        self.send_all('TERRAIN ' + self.world.map_)
+        self.send_all('POSITION_Y ' + str(self.world.player_pos[0]))
+        self.send_all('POSITION_X ' + str(self.world.player_pos[1]))
+        self.pool_result = self.pool.map_async(fib, (35,35))
 
     def cmd_get_turn(self, connection_id):
         """Send world.turn to caller."""
@@ -187,8 +205,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]