Trying to fix bug with fifo and network players
[progcomp2013.git] / qchess / qchess.py
index 327d193..1dd8691 100755 (executable)
@@ -20,7 +20,7 @@ class Piece():
                
                self.move_pattern = None
                self.coverage = None
-               self.possible_moves = None
+               self.possible_moves = {}
                
 
        def init_from_copy(self, c):
@@ -59,7 +59,10 @@ class Piece():
                # Draw the two possible types underneath the current_type image
                for i in range(len(self.types)):
                        if always_reveal_states == True or self.types[i][0] != '?':
-                               img = small_images[self.colour][self.types[i]]
+                               if self.types[i][0] == '?':
+                                       img = small_images[self.colour][self.types[i][1:]]
+                               else:
+                                       img = small_images[self.colour][self.types[i]]
                        else:
                                img = small_images[self.colour]["unknown"] # If the type hasn't been revealed, show a placeholder
 
@@ -254,7 +257,7 @@ class Board():
        # Select a piece on the board (colour is the colour of whoever is doing the selecting)
        def select(self, x,y, colour=None):
                if not self.on_board(x, y): # Get on board everyone!
-                       raise Exception("BOUNDS")
+                       raise Exception("BOUNDS " + str(x) + ","+str(y))
 
                piece = self.grid[x][y]
                if piece == None:
@@ -269,10 +272,11 @@ class Board():
 
        # Update the board when a piece has been selected
        # "type" is apparently reserved, so I'll use "state"
-       def update_select(self, x, y, type_index, state):
+       def update_select(self, x, y, type_index, state, sanity=True, deselect=True):
+               #debug(str(self) + " update_select called")
                piece = self.grid[x][y]
                if piece.types[type_index] == "unknown":
-                       if not state in self.unrevealed_types[piece.colour].keys():
+                       if not state in self.unrevealed_types[piece.colour].keys() and sanity == True:
                                raise Exception("SANITY: Too many " + piece.colour + " " + state + "s")
                        self.unrevealed_types[piece.colour][state] -= 1
                        if self.unrevealed_types[piece.colour][state] <= 0:
@@ -281,20 +285,20 @@ class Board():
                piece.types[type_index] = state
                piece.current_type = state
 
-               if len(self.possible_moves(piece)) <= 0:
+               if deselect == True and len(self.possible_moves(piece)) <= 0:
                        piece.deselect() # Piece can't move; deselect it
                        
                # Piece needs to recalculate moves
                piece.possible_moves = None
                
        # Update the board when a piece has been moved
-       def update_move(self, x, y, x2, y2):
-                               
+       def update_move(self, x, y, x2, y2, sanity=True):
+               #debug(str(self) + " update_move called \""+str(x)+ " " + str(y) + " -> " + str(x2) + " " + str(y2) + "\"")     
                piece = self.grid[x][y]
                #print "Moving " + str(x) + "," + str(y) + " to " + str(x2) + "," + str(y2) + "; possible_moves are " + str(self.possible_moves(piece))
                
-               if not [x2,y2] in self.possible_moves(piece):
-                       raise Exception("ILLEGAL move")
+               if not [x2,y2] in self.possible_moves(piece) and sanity == True:
+                       raise Exception("ILLEGAL move " + str(x2)+","+str(y2))
                
                self.grid[x][y] = None
                taken = self.grid[x2][y2]
@@ -328,8 +332,8 @@ class Board():
 
        # Update the board from a string
        # Guesses what to do based on the format of the string
-       def update(self, result):
-               #print "Update called with \"" + str(result) + "\""
+       def update(self, result, sanity=True, deselect=True):
+               #debug(str(self) + " update called \""+str(result)+"\"")
                # String always starts with 'x y'
                try:
                        s = result.split(" ")
@@ -338,8 +342,8 @@ class Board():
                        raise Exception("GIBBERISH \""+ str(result) + "\"") # Raise expectations
 
                piece = self.grid[x][y]
-               if piece == None:
-                       raise Exception("EMPTY")
+               if piece == None and sanity == True:
+                       raise Exception("EMPTY " + str(x) + " " + str(y))
 
                # If a piece is being moved, the third token is '->'
                # We could get away with just using four integers, but that wouldn't look as cool
@@ -351,7 +355,7 @@ class Board():
                                raise Exception("GIBBERISH \"" + str(result) + "\"") # Raise the alarm
 
                        # Move the piece (take opponent if possible)
-                       self.update_move(x, y, x2, y2)
+                       self.update_move(x, y, x2, y2, sanity)
                        
                else:
                        # Otherwise we will just assume a piece has been selected
@@ -361,8 +365,9 @@ class Board():
                        except:
                                raise Exception("GIBBERISH \"" + result + "\"") # Throw a hissy fit
 
+
                        # Select the piece
-                       self.update_select(x, y, type_index, state)
+                       self.update_select(x, y, type_index, state, sanity=sanity, deselect=deselect)
 
                return result
 
@@ -405,7 +410,7 @@ class Board():
                
                for i in range(len(p.types)):
                        t = p.types[i]
-                       prob = 0.5
+                       prob = 1.0 / float(len(p.types))
                        if t == "unknown" or p.types[i][0] == '?':
                                total_types = 0
                                for t2 in self.unrevealed_types[p.colour].keys():
@@ -413,20 +418,26 @@ class Board():
                                
                                for t2 in self.unrevealed_types[p.colour].keys():
                                        prob2 = float(self.unrevealed_types[p.colour][t2]) / float(total_types)
-                                       p.current_type = t2
-                                       for point in self.possible_moves(p, reject_allied):
+                                       #p.current_type = t2
+                                       for point in self.possible_moves(p, reject_allied, state=t2):
                                                result[point[0]][point[1]] += prob2 * prob
                                
                        else:
-                               p.current_type = t
-                               for point in self.possible_moves(p, reject_allied):
-                                       result[point[0]][point[1]] += prob
+                               #p.current_type = t
+                               for point in self.possible_moves(p, reject_allied, state=t):
+                                               result[point[0]][point[1]] += prob
                
                #self.verify()
-               p.current_type = "unknown"
+               #p.current_type = "unknown"
                return result
 
        def prob_is_type(self, p, state):
+               if p.current_type != 0:
+                       if state == p.current_type:
+                               return 1.0
+                       else:
+                               return 0.0
+               
                prob = 0.5
                result = 0
                for i in range(len(p.types)):
@@ -461,8 +472,7 @@ class Board():
                        p.current_type = old_type
                        return result
                
-               if p.possible_moves != None:
-                       return p.possible_moves
+               
                
                
                result = []
@@ -470,7 +480,7 @@ class Board():
 
                
                if p.current_type == "unknown":
-                       raise Exception("SANITY: Piece state unknown")
+                       raise Exception("SANITY: Unknown state for piece: "+str(p))
                        # The below commented out code causes things to break badly
                        #for t in p.types:
                        #       if t == "unknown":
@@ -583,6 +593,8 @@ class Board():
        def on_board(self, x, y):
                return (x >= 0 and x < w) and (y >= 0 and y < h)
        
+       
+       
        # Pushes a move temporarily
        def push_move(self, piece, x, y):
                target = self.grid[x][y]
@@ -608,13 +620,13 @@ class Board():
                self.grid[x2][y2] = target
                
                for p in self.pieces["white"] + self.pieces["black"]:
-                               p.possible_moves = None
+                       p.possible_moves = None
                
 # --- board.py --- #
 import subprocess
 import select
 import platform
-
+import re
 
 agent_timeout = -1.0 # Timeout in seconds for AI players to make moves
                        # WARNING: Won't work for windows based operating systems
@@ -629,10 +641,154 @@ class Player():
                self.colour = colour
 
        def update(self, result):
-               pass
+               return result
 
        def reset_board(self, s):
                pass
+       
+       def __str__(self):
+               return self.name + "<"+str(self.colour)+">"
+
+       def base_player(self):
+               return self
+       
+
+
+def open_fifo(name, mode, timeout=None):
+       if timeout == None:
+               return open(name, mode)
+       
+       
+       class Worker(threading.Thread):
+               def __init__(self):
+                       threading.Thread.__init__(self)
+                       self.result = None
+                       self.exception = None
+
+                       
+               def run(self):          
+                       try:
+                               self.result = open(name, mode)
+                       except Exception, e:
+                               self.exception = e
+                               self.result = None
+               
+
+       w = Worker()
+       w.start()
+       
+       start = time.time()
+       while time.time() - start < timeout:
+               if w.is_alive() == False:
+                       w.join()
+                       if w.exception != None:
+                               raise w.exception
+                       return w.result
+               time.sleep(0.1)
+       
+       
+       if w.is_alive():
+               #sys.stderr.write("FIFO_TIMEOUT!\n")
+               # Recursive to deal with possible race condition
+               try:
+                       if mode == "r":
+                               f = open_fifo(name, "w", 1)
+                       else:
+                               f = open_fifo(name, "r", 1)
+               except:
+                       pass
+                       
+               #sys.stderr.write("Opened other end!\n")
+               while w.is_alive():
+                       time.sleep(0.1)
+                       
+               w.join()
+               f.close()
+               w.result.close()
+               raise Exception("FIFO_TIMEOUT")
+       else:
+               w.join()
+               if w.exception != None:
+                       raise w.exception
+               return w.result
+       
+
+# Player that runs through a fifo
+class FifoPlayer(Player):
+       
+       timeout = 300
+       
+       def __init__(self, name, colour):
+               Player.__init__(self, name, colour)
+               os.mkfifo(self.name+".in")
+               os.mkfifo(self.name+".out")
+
+               try:
+                       self.fifo_out = open_fifo(self.name+".out","w", FifoPlayer.timeout)
+               except:
+                       raise Exception("FIFO_TIMEOUT")
+               else:
+                       self.fifo_out.write("START "+colour+"\n")
+                       self.fifo_out.close()
+
+               
+               
+               
+               
+       def update(self, result):
+               sys.stderr.write("update fifo called\n")
+               try:
+                       self.fifo_out = open_fifo(self.name+".out", "w", FifoPlayer.timeout)
+               except:
+                       raise Exception("FIFO_TIMEOUT")
+               else:
+                       self.fifo_out.write(result +"\n")
+                       self.fifo_out.close()
+                       return result
+               
+       def select(self):
+               sys.stderr.write("select fifo called\n")
+               try:
+                       self.fifo_out = open_fifo(self.name+".out", "w", FifoPlayer.timeout)
+               except:
+                       #sys.stderr.write("TIMEOUT\n")
+                       raise Exception("FIFO_TIMEOUT")
+               else:
+                       
+                       self.fifo_out.write("SELECT?\n")
+                       self.fifo_out.close()
+                       self.fifo_in = open_fifo(self.name+".in", "r", FifoPlayer.timeout)
+                       s = map(int, self.fifo_in.readline().strip(" \r\n").split(" "))
+                       self.fifo_in.close()
+                       return s
+       
+       def get_move(self):
+               sys.stderr.write("get_move fifo called\n")
+               try:
+                       self.fifo_out = open_fifo(self.name+".out", "w", FifoPlayer.timeout)
+               except:
+                       raise Exception("FIFO_TIMEOUT")
+               else:
+                       self.fifo_out.write("MOVE?\n")
+                       self.fifo_out.close()
+                       self.fifo_in = open_fifo(self.name+".in", "r", FifoPlayer.timeout)
+                       s = map(int, self.fifo_in.readline().strip(" \r\n").split(" "))
+                       self.fifo_in.close()
+                       return s
+       
+       def quit(self, result):
+               try:
+                       self.fifo_out = open_fifo(self.name+".out", "w", FifoPlayer.timeout)
+               except:
+                       os.remove(self.name+".in")
+                       os.remove(self.name+".out")
+                       #raise Exception("FIFO_TIMEOUT")
+                       
+               else:
+                       self.fifo_out.write(result + "\n")
+                       self.fifo_out.close()
+                       os.remove(self.name+".in")
+                       os.remove(self.name+".out")
 
 # Player that runs from another process
 class ExternalAgent(Player):
@@ -666,7 +822,7 @@ class ExternalAgent(Player):
                if self.p.stdout in ready:
                        #sys.stderr.write("Reading from " + str(self.p) + " 's stdout...\n")
                        try:
-                               result = self.p.stdout.readline().strip("\r\n")
+                               result = self.p.stdout.readline().strip(" \t\r\n")
                                #sys.stderr.write("Read \'" + result + "\' from " + str(self.p) + "\n")
                                return result
                        except: # Exception, e:
@@ -680,7 +836,8 @@ class ExternalAgent(Player):
                line = self.get_response()
                
                try:
-                       result = map(int, line.split(" "))
+                       m = re.match("\s*(\d+)\s+(\d+)\s*", line)
+                       result = map(int, [m.group(1), m.group(2)])
                except:
                        raise Exception("GIBBERISH \"" + str(line) + "\"")
                return result
@@ -688,7 +845,7 @@ class ExternalAgent(Player):
        def update(self, result):
                #print "Update " + str(result) + " called for AgentPlayer"
                self.send_message(result)
-
+               return result
 
        def get_move(self):
                
@@ -696,7 +853,9 @@ class ExternalAgent(Player):
                line = self.get_response()
                
                try:
-                       result = map(int, line.split(" "))
+                       m = re.match("\s*(\d+)\s+(\d+)\s*", line)
+                       result = map(int, [m.group(1), m.group(2)])
+
                except:
                        raise Exception("GIBBERISH \"" + str(line) + "\"")
                return result
@@ -739,9 +898,11 @@ class HumanPlayer(Player):
                                sys.stdout.write("SELECTION?\n")
                                try:
                                        p = map(int, sys.stdin.readline().strip("\r\n ").split(" "))
+                                       return p
                                except:
                                        sys.stderr.write("ILLEGAL GIBBERISH\n")
                                        continue
+
        # It's your move captain
        def get_move(self):
                if isinstance(graphics, GraphicsThread):
@@ -757,6 +918,7 @@ class HumanPlayer(Player):
                                sys.stdout.write("MOVE?\n")
                                try:
                                        p = map(int, sys.stdin.readline().strip("\r\n ").split(" "))
+                                       return p
                                except:
                                        sys.stderr.write("ILLEGAL GIBBERISH\n")
                                        continue
@@ -772,6 +934,7 @@ class HumanPlayer(Player):
                        pass
                else:
                        sys.stdout.write(result + "\n") 
+               return result
 
 
 # Default internal player (makes random moves)
@@ -787,7 +950,8 @@ class InternalAgent(Player):
        def update(self, result):
                
                self.board.update(result)
-               self.board.verify()
+               #self.board.verify()
+               return result
 
        def reset_board(self, s):
                self.board.reset_board(s)
@@ -871,10 +1035,9 @@ class ExternalWrapper(ExternalAgent):
 
 
 class AgentBishop(AgentRandom): # Inherits from AgentRandom (in qchess)
-       def __init__(self, name, colour):
+       def __init__(self, name, colour,value={"pawn" : 1, "bishop" : 3, "knight" : 3, "rook" : 5, "queen" : 9, "king" : 100, "unknown" : 2}):
                InternalAgent.__init__(self, name, colour)
-               self.value = {"pawn" : 1, "bishop" : 3, "knight" : 3, "rook" : 5, "queen" : 9, "king" : 100, "unknown" : 4}
-
+               self.value = value
                self.aggression = 2.0 # Multiplier for scoring due to aggressive actions
                self.defence = 1.0 # Multiplier for scoring due to defensive actions
                
@@ -1069,8 +1232,11 @@ class Worker(multiprocessing.Process):
                self.q = q
 
        def run(self):
-               #print str(self) + " runs " + str(self.function) + " with args " + str(self.args) 
+               #print str(self) + " runs " + str(self.function) + " with args " + str(self.args)
+               #try:
                self.q.put(self.function(*self.args))
+               #except IOError:
+               #       pass
                
                
 
@@ -1091,7 +1257,7 @@ def TimeoutFunction(function, args, timeout):
                        w.terminate()
                        s.join()
                        raise Exception("TIMEOUT")
-
+               time.sleep(0.1)
        
                
 
@@ -1123,38 +1289,143 @@ import select
 network_timeout_start = -1.0 # Timeout in seconds to wait for the start of a message
 network_timeout_delay = 1.0 # Maximum time between two characters being received
 
+class NetworkPlayer(Player):
+       def __init__(self, colour, network, player):
+               Player.__init__(self, "@network:"+str(network.address), colour) 
+               self.player = player
+               self.network = network
+               
+       def __str__(self):
+               return "NetworkPlayer<"+str(self.colour)+","+str(self.player)+">"
+               
+       def select(self):
+               #debug(str(self) + " select called")
+               if self.player != None:
+                       s = self.player.select()
+                       self.send_message(str(s[0]) + " " + str(s[1]))
+               else:
+                       s = map(int, self.get_response().split(" "))
+                       for p in game.players:
+                               if p != self and isinstance(p, NetworkPlayer) and p.player == None:
+                                       p.network.send_message(str(s[0]) + " " + str(s[1]))
+               if s == [-1,-1]:
+                       game.final_result = "network terminate"
+                       game.stop()
+               return s
+       
+       def send_message(self, message):
+               #debug(str(self) + " send_message(\""+str(message)+"\") called")
+               self.network.send_message(message)
+               
+       def get_response(self):
+               #debug(str(self) + " get_response() called")
+               s = self.network.get_response()
+               #debug(str(self) + " get_response() returns \""+str(s)+"\"")
+               return s
+                       
+                       
+       def get_move(self):
+               #debug(str(self) + " get_move called")
+               if self.player != None:
+                       s = self.player.get_move()
+                       self.send_message(str(s[0]) + " " + str(s[1]))
+               else:
+                       s = map(int, self.get_response().split(" "))
+                       for p in game.players:
+                               if p != self and isinstance(p, NetworkPlayer) and p.player == None:
+                                       p.network.send_message(str(s[0]) + " " + str(s[1]))
+                                       
+               if s == [-1,-1]:
+                       game.final_result = "network terminate"
+                       game.stop()
+               return s
+       
+       def update(self, result):
+               #debug(str(self) + " update(\""+str(result)+"\") called")
+               if self.network.server == True:
+                       if self.player == None:
+                               self.send_message(result)
+               elif self.player != None:
+                       result = self.get_response()
+                       if result == "-1 -1":
+                               game.final_result = "network terminate"
+                               game.stop()
+                               return "-1 -1"
+                       self.board.update(result, deselect=False)
+               
+               
+               
+               if self.player != None:
+                       result = self.player.update(result)
+                       
+               return result
+               
+               
+       
+       def base_player(self):
+               if self.player == None:
+                       return self
+               else:
+                       return self.player.base_player()
+               
+       def quit(self, result):
+               try:
+                       self.send_message("-1 -1")
+               except:
+                       pass
+
 class Network():
-       def __init__(self, colour, address = None):
+       def __init__(self, address = (None,4562)):
                self.socket = socket.socket()
+               self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
                #self.socket.setblocking(0)
-
-               if colour == "white":
-                       self.port = 4562
-               else:
-                       self.port = 4563
-
-               self.src = None
-
-       #       print str(self) + " listens on port " + str(self.port)
-
-               if address == None:
-                       self.host = socket.gethostname()
-                       self.socket.bind((self.host, self.port))
+               self.address = address
+               self.server = (address[0] == None)
+               
+               
+               self.connected = False
+                       
+       def connect(self):      
+               #debug(str(self) + "Tries to connect")
+               self.connected = True
+               if self.address[0] == None:
+                       self.host = "0.0.0.0" #socket.gethostname() # Breaks things???
+                       self.socket.bind((self.host, self.address[1]))
                        self.socket.listen(5)   
 
-                       self.src, self.address = self.socket.accept()
+                       self.src, self.actual_address = self.socket.accept()
+                       
                        self.src.send("ok\n")
-                       if self.get_response() == "QUIT":
+                       s = self.get_response()
+                       if s == "QUIT":
+                               self.src.close()
+                               return
+                       elif s != "ok":
                                self.src.close()
+                               self.__init__(colour, (self.address[0], int(s)), baseplayer)
+                               return
+                       
                else:
-                       self.host = address
-                       self.socket.connect((address, self.port))
+                       time.sleep(0.3)
+                       self.socket.connect(self.address)
                        self.src = self.socket
                        self.src.send("ok\n")
-                       if self.get_response() == "QUIT":
+                       s = self.get_response()
+                       if s == "QUIT":
                                self.src.close()
+                               return
+                       elif s != "ok":
+                               self.src.close()
+                               self.__init__(colour, (self.address[0], int(s)), baseplayer)
+                               return
+                       
+
+               
+       def __str__(self):
+               return "@network:"+str(self.address)
 
        def get_response(self):
+               
                # Timeout the start of the message (first character)
                if network_timeout_start > 0.0:
                        ready = select.select([self.src], [], [], network_timeout_start)[0]
@@ -1177,6 +1448,7 @@ class Network():
                        else:
                                raise Exception("UNRESPONSIVE")
 
+               
                return s.strip(" \r\n")
 
        def send_message(self,s):
@@ -1189,125 +1461,12 @@ class Network():
                        self.src.send(s + "\n")
                else:
                        raise Exception("UNRESPONSIVE")
-
-       def check_quit(self, s):
-               s = s.split(" ")
-               if s[0] == "QUIT":
-                       with game.lock:
-                               game.final_result = " ".join(s[1:]) + " " + str(opponent(self.colour))
-                       game.stop()
-                       return True
-
-               
-
-class NetworkSender(Player,Network):
-       def __init__(self, base_player, address = None):
-               self.base_player = base_player
-               Player.__init__(self, base_player.name, base_player.colour)
-
-               self.address = address
-
-       def connect(self):
-               Network.__init__(self, self.base_player.colour, self.address)
-
-
-
-       def select(self):
-               [x,y] = self.base_player.select()
-               choice = self.board.grid[x][y]
-               s = str(x) + " " + str(y)
-               #print str(self) + ".select sends " + s
-               self.send_message(s)
-               return [x,y]
-
-       def get_move(self):
-               [x,y] = self.base_player.get_move()
-               s = str(x) + " " + str(y)
-               #print str(self) + ".get_move sends " + s
-               self.send_message(s)
-               return [x,y]
-
-       def update(self, s):
-               self.base_player.update(s)
-               s = s.split(" ")
-               [x,y] = map(int, s[0:2])
-               selected = self.board.grid[x][y]
-               if selected != None and selected.colour == self.colour and len(s) > 2 and not "->" in s:
-                       s = " ".join(s[0:3])
-                       for i in range(2):
-                               if selected.types_revealed[i] == True:
-                                       s += " " + str(selected.types[i])
-                               else:
-                                       s += " unknown"
-                       #print str(self) + ".update sends " + s
-                       self.send_message(s)
-                               
-
-       def quit(self, final_result):
-               self.base_player.quit(final_result)
-               #self.src.send("QUIT " + str(final_result) + "\n")
-               self.src.close()
-
-class NetworkReceiver(Player,Network):
-       def __init__(self, colour, address=None):
                
-               Player.__init__(self, address, colour)
-
-               self.address = address
-
-               self.board = None
-
-       def connect(self):
-               Network.__init__(self, self.colour, self.address)
-                       
-
-       def select(self):
                
-               s = self.get_response()
-               #print str(self) + ".select gets " + s
-               [x,y] = map(int,s.split(" "))
-               if x == -1 and y == -1:
-                       #print str(self) + ".select quits the game"
-                       with game.lock:
-                               game.final_state = "network terminated " + self.colour
-                       game.stop()
-               return [x,y]
-       def get_move(self):
-               s = self.get_response()
-               #print str(self) + ".get_move gets " + s
-               [x,y] = map(int,s.split(" "))
-               if x == -1 and y == -1:
-                       #print str(self) + ".get_move quits the game"
-                       with game.lock:
-                               game.final_state = "network terminated " + self.colour
-                       game.stop()
-               return [x,y]
 
-       def update(self, result):
-               
-               result = result.split(" ")
-               [x,y] = map(int, result[0:2])
-               selected = self.board.grid[x][y]
-               if selected != None and selected.colour == self.colour and len(result) > 2 and not "->" in result:
-                       s = self.get_response()
-                       #print str(self) + ".update - receives " + str(s)
-                       s = s.split(" ")
-                       selected.choice = int(s[2])
-                       for i in range(2):
-                               selected.types[i] = str(s[3+i])
-                               if s[3+i] == "unknown":
-                                       selected.types_revealed[i] = False
-                               else:
-                                       selected.types_revealed[i] = True
-                       selected.current_type = selected.types[selected.choice] 
-               else:
-                       pass
-                       #print str(self) + ".update - ignore result " + str(result)                     
-               
-
-       def quit(self, final_result):
+       def close(self):
+               self.src.shutdown()
                self.src.close()
-       
 # --- network.py --- #
 import threading
 
@@ -1323,15 +1482,14 @@ class StoppableThread(threading.Thread):
                self._stop.set()
 
        def stopped(self):
-               return self._stop.isSet()
-# --- thread_util.py --- #
+               return self._stop.isSet()# --- thread_util.py --- #
 log_files = []
 import datetime
 import urllib2
 
 class LogFile():
-       def __init__(self, log):        
-               
+       def __init__(self, log, name):  
+               self.name = name
                self.log = log
                self.logged = []
                self.log.write("# Log starts " + str(datetime.datetime.now()) + "\n")
@@ -1344,7 +1502,7 @@ class LogFile():
        def setup(self, board, players):
                
                for p in players:
-                       self.log.write("# " + p.colour + " : " + p.name + "\n")
+                       self.log.write("# " + str(p.colour) + " : " + str(p.name) + "\n")
                
                self.log.write("# Initial board\n")
                for x in range(0, w):
@@ -1365,7 +1523,7 @@ class ShortLog(LogFile):
                        self.log = sys.stdout
                else:
                        self.log = open(file_name, "w", 0)
-               LogFile.__init__(self, self.log)
+               LogFile.__init__(self, self.log, "@"+file_name)
                self.file_name = file_name
                self.phase = 0
 
@@ -1500,6 +1658,9 @@ def log(s):
        for l in log_files:
                l.write(s)
                
+def debug(s):
+       sys.stderr.write("# DEBUG: " + s + "\n")
+               
 
 def log_init(board, players):
        for l in log_files:
@@ -1513,7 +1674,7 @@ def log_init(board, players):
 
 # A thread that runs the game
 class GameThread(StoppableThread):
-       def __init__(self, board, players):
+       def __init__(self, board, players, server = True):
                StoppableThread.__init__(self)
                self.board = board
                self.players = players
@@ -1522,8 +1683,11 @@ class GameThread(StoppableThread):
                self.lock = threading.RLock() #lock for access of self.state
                self.cond = threading.Condition() # conditional for some reason, I forgot
                self.final_result = ""
+               self.server = server
+               self.retry_illegal = False
                
                
+       
 
        # Run the game (run in new thread with start(), run in current thread with run())
        def run(self):
@@ -1532,22 +1696,35 @@ class GameThread(StoppableThread):
                        
                        for p in self.players:
                                with self.lock:
-                                       if isinstance(p, NetworkSender):
-                                               self.state["turn"] = p.base_player # "turn" contains the player who's turn it is
-                                       else:
-                                               self.state["turn"] = p
-                               #try:
-                               if True:
+                                       self.state["turn"] = p.base_player()
+                               try:
+                               #if True:
                                        [x,y] = p.select() # Player selects a square
                                        if self.stopped():
+                                               #debug("Quitting in select")
                                                break
-
-                                       
                                                
-
-                                       result = self.board.select(x, y, colour = p.colour)                             
+                                       if isinstance(p, NetworkPlayer):
+                                               if p.network.server == True:
+                                                       result = self.board.select(x, y, colour = p.colour)
+                                               else:
+                                                       result = None
+                                                       
+                                       else:
+                                               result = self.board.select(x, y, colour = p.colour)
+                                       
+                                       result = p.update(result)
+                                       if self.stopped():
+                                               break
                                        for p2 in self.players:
+                                               if p2 == p:
+                                                       continue
                                                p2.update(result) # Inform players of what happened
+                                               if self.stopped():
+                                                       break
+                                       
+                                       if self.stopped():
+                                               break
 
 
                                        log(result)
@@ -1571,21 +1748,43 @@ class GameThread(StoppableThread):
                                                                graphics.state["dest"] = None
                                                continue
 
-                                       try:
-                                               [x2,y2] = p.get_move() # Player selects a destination
-                                       except:
-                                               self.stop()
+                                       #try:
+                                       [x2,y2] = p.get_move() # Player selects a destination
+                                       #except:
+                                       #       self.stop()
 
                                        if self.stopped():
+                                               #debug("Quitting in get_move")
                                                break
-
-                                       result = str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2)
-                                       log(result)
-
-                                       self.board.update_move(x, y, x2, y2)
                                        
+                                       if isinstance(p, NetworkPlayer):
+                                               if p.network.server == True:
+                                                       result = str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2)
+                                                       self.board.update_move(x, y, x2, y2)
+                                               else:
+                                                       result = None
+                                                       
+                                       else:
+                                               result = str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2)
+                                               self.board.update_move(x, y, x2, y2)
+                                       
+                                       result = p.update(result)
+                                       if self.stopped():
+                                               break
                                        for p2 in self.players:
+                                               if p2 == p:
+                                                       continue
                                                p2.update(result) # Inform players of what happened
+                                               if self.stopped():
+                                                       break
+                                       
+                                       if self.stopped():
+                                               break
+                                       
+                                       
+                                                                                       
+                                       log(result)
+
 
                                                                                
 
@@ -1601,26 +1800,32 @@ class GameThread(StoppableThread):
                                                        graphics.state["dest"] = None
                                                        graphics.state["moves"] = None
 
-                       # Commented out exception stuff for now, because it makes it impossible to tell if I made an IndentationError somewhere
-                       #       except Exception,e:
-                       #               result = e.message
-                       #               #sys.stderr.write(result + "\n")
-                       #               
-                       #               self.stop()
-                       #               with self.lock:
-                       #                       self.final_result = self.state["turn"].colour + " " + e.message
-
-                               end = self.board.end_condition()
-                               if end != None:         
-                                       with self.lock:
-                                               if end == "DRAW":
-                                                       self.final_result = self.state["turn"].colour + " " + end
-                                               else:
-                                                       self.final_result = end
-                                       self.stop()
+                       
+                                       end = self.board.end_condition()
+                                       if end != None:         
+                                               with self.lock:
+                                                       if end == "DRAW":
+                                                               self.final_result = self.state["turn"].colour + " " + end
+                                                       else:
+                                                               self.final_result = end
+                                               self.stop()
                                
-                               if self.stopped():
-                                       break
+                                       if self.stopped():
+                                               break
+                               except Exception,e:
+                               #if False:
+
+                                       
+                                       result = e.message
+                                       if self.retry_illegal:
+                                               self.state["turn"].update(result);
+                                       else:
+                                               sys.stderr.write("qchess.py exception: "+result + "\n")
+                                               self.stop()
+                                               with self.lock:
+                                                       self.final_result = self.state["turn"].colour + " " + e.message
+                                               break
+
 
 
                for p2 in self.players:
@@ -1869,11 +2074,14 @@ def load_images(image_dir=os.path.join(os.path.curdir, "data", "images")):
                        small_images[c].update({p : pygame.image.load(os.path.join(image_dir, c + "_" + p + "_small.png"))})
 # --- images.py --- #
 graphics_enabled = True
+
 try:
        import pygame
+       os.environ["SDL_VIDEO_ALLOW_SCREENSAVER"] = "1"
 except:
        graphics_enabled = False
        
+import time
 
 
 
@@ -1894,6 +2102,9 @@ class GraphicsThread(StoppableThread):
                self.error = 0
                self.lock = threading.RLock()
                self.cond = threading.Condition()
+               self.sleep_timeout = None
+               self.last_event = time.time()
+               self.blackout = False
 
                #print "Test font"
                pygame.font.Font(os.path.join(os.path.curdir, "data", "DejaVuSans.ttf"), 32).render("Hello", True,(0,0,0))
@@ -1917,19 +2128,28 @@ class GraphicsThread(StoppableThread):
                
                while not self.stopped():
                        
-                       #print "Display grid"
-                       self.board.display_grid(window = self.window, grid_sz = self.grid_sz) # Draw the board
+                       if self.sleep_timeout == None or (time.time() - self.last_event) < self.sleep_timeout:
+                       
+                               #print "Display grid"
+                               self.board.display_grid(window = self.window, grid_sz = self.grid_sz) # Draw the board
 
-                       #print "Display overlay"
-                       self.overlay()
+                               #print "Display overlay"
+                               self.overlay()
 
-                       #print "Display pieces"
-                       self.board.display_pieces(window = self.window, grid_sz = self.grid_sz) # Draw the board                
+                               #print "Display pieces"
+                               self.board.display_pieces(window = self.window, grid_sz = self.grid_sz) # Draw the board                
+                               self.blackout = False
+                               
+                       elif pygame.mouse.get_focused() and not self.blackout:
+                               os.system("xset dpms force off")
+                               self.blackout = True
+                               self.window.fill((0,0,0))
 
                        pygame.display.flip()
 
                        for event in pygame.event.get():
-                               if event.type == pygame.QUIT:
+                               self.last_event = time.time()
+                               if event.type == pygame.QUIT or (event.type == pygame.KEYDOWN and event.key == pygame.K_q):
                                        if isinstance(game, GameThread):
                                                with game.lock:
                                                        game.final_result = ""
@@ -1941,10 +2161,13 @@ class GraphicsThread(StoppableThread):
                                        break
                                elif event.type == pygame.MOUSEBUTTONDOWN:
                                        self.mouse_down(event)
+                                       
                                elif event.type == pygame.MOUSEBUTTONUP:
-                                       self.mouse_up(event)
+                                       self.mouse_up(event)                    
+                               
+                               
                                        
-
+  
                                
                                                                
                                                
@@ -2219,6 +2442,18 @@ class GraphicsThread(StoppableThread):
                                                #print "Reject " + str(i) + str(event.pos) + " vs " + str(t)
                
 
+       # Function to choose between dedicated server or normal play
+       def SelectServer(self):
+       
+               choice = self.SelectButton(["Normal", "Join Eigenserver"],prompt="Game type?")
+               if choice == 0:
+                       return None
+               choice = self.SelectButton(["progcomp.ucc", "other"], prompt="Address?")
+               if choice == 0:
+                       return "progcomp.ucc.asn.au"
+               else:
+                       return self.getstr(prompt = "Enter address:")
+                       
        # Function to pick players in a nice GUI way
        def SelectPlayers(self, players = []):
 
@@ -2281,7 +2516,7 @@ class GraphicsThread(StoppableThread):
                                                                time.sleep(1)
                                                                p = None
                                                players.append(p)
-                       elif choice == 2:
+                       elif choice == 1:
                                address = ""
                                while address == "":
                                        self.board.display_grid(self.window, self.grid_sz)
@@ -2308,6 +2543,87 @@ class GraphicsThread(StoppableThread):
                                
                        
 # --- graphics.py --- #
+def dedicated_server():
+       global log_files
+       
+       max_games = 5
+       games = []
+       gameID = 0
+       while True:
+               # Get players
+               gameID += 1
+               log("Getting clients...")
+               s = socket.socket()
+               s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+               s.bind(("0.0.0.0", 4562))
+               s.listen(2)
+               ss = s.accept()
+               
+               log("Got white player")
+               
+               args = ["python", "qchess.py", "--no-graphics", "@network::"+str(4600+2*len(games)), "@network::"+str(4600+2*len(games))]
+               if len(log_files) != 0:
+                       for l in log_files:
+                               if l.name == "":
+                                       args.append("--log")
+                               else:
+                                       args.append("--log="+str(l.name)+"_"+str(gameID))
+               
+               g = subprocess.Popen(args, stdout=subprocess.PIPE)
+               games.append(g)
+               
+               time.sleep(0.5)
+               ss[0].send("white " + str(4600 + 2*(len(games)-1)))
+               ss[0].shutdown(socket.SHUT_RD)
+               ss[0].close()
+               
+               time.sleep(0.5)
+               ss = s.accept()
+               
+               log("Got black player")
+               
+               time.sleep(0.5)
+               ss[0].send("black " + str(4600 + 2*(len(games)-1)))
+               ss[0].shutdown(socket.SHUT_RD)
+               ss[0].close()
+               
+               s.shutdown(socket.SHUT_RDWR)
+               s.close()
+               
+               
+               while len(games) > max_games:
+                       #log("Too many games; waiting for game to finish...")
+                       ready = select.select(map(lambda e : e.stdout, games),[], [])
+                       for r in ready[0]:
+                               s = r.readline().strip(" \r\n").split(" ")
+                               if s[0] == "white" or s[0] == "black":
+                                       for g in games[:]:
+                                               if g.stdout == r:
+                                                       log("Game " + str(g) + " has finished")
+                                                       games.remove(g)
+                                                       
+       return 0
+       
+def client(addr, player="@human"):
+       
+       
+       
+       s = socket.socket()
+       s.connect((addr, 4562))
+       
+       [colour,port] = s.recv(1024).strip(" \r\n").split(" ")
+       
+       #debug("Colour: " + colour + ", port: " + port)
+       
+       s.shutdown(socket.SHUT_RDWR)
+       s.close()
+       
+       if colour == "white":
+               p = subprocess.Popen(["python", "qchess.py", player, "@network:"+addr+":"+port])
+       else:
+               p = subprocess.Popen(["python", "qchess.py", "@network:"+addr+":"+port, player])
+       p.wait()
+       return 0# --- server.py --- #
 #!/usr/bin/python -u
 
 # Do you know what the -u does? It unbuffers stdin and stdout
@@ -2326,6 +2642,7 @@ import os
 import time
 
 turn_delay = 0.5
+sleep_timeout = None
 [game, graphics] = [None, None]
 
 def make_player(name, colour):
@@ -2334,10 +2651,22 @@ def make_player(name, colour):
                        return HumanPlayer(name, colour)
                s = name[1:].split(":")
                if s[0] == "network":
-                       address = None
+                       ip = None
+                       port = 4562
+                       #print str(s)
                        if len(s) > 1:
-                               address = s[1]
-                       return NetworkReceiver(colour, address)
+                               if s[1] != "":
+                                       ip = s[1]
+                       if len(s) > 2:
+                               port = int(s[2])
+                               
+                       if ip == None:
+                               if colour == "black":
+                                       port += 1
+                       elif colour == "white":
+                               port += 1
+                                               
+                       return NetworkPlayer(colour, Network((ip, port)), None)
                if s[0] == "internal":
 
                        import inspect
@@ -2357,7 +2686,11 @@ def make_player(name, colour):
                        sys.stderr.write(sys.argv[0] + " : Can't find an internal agent matching \"" + s[1] + "\"\n")
                        sys.stderr.write(sys.argv[0] + " : Choices are: " + str(map(lambda e : e[0], internal_agents)) + "\n")
                        return None
-                       
+               if s[0] == "fifo":
+                       if len(s) > 1:
+                               return FifoPlayer(s[1], colour)
+                       else:
+                               return FifoPlayer(str(os.getpid())+"."+colour, colour)
 
        else:
                return ExternalAgent(name, colour)
@@ -2378,6 +2711,11 @@ def main(argv):
        global src_file
        global graphics_enabled
        global always_reveal_states
+       global sleep_timeout
+
+
+       retry_illegal = False
+       server_addr = None
 
        max_moves = None
        src_file = None
@@ -2435,17 +2773,26 @@ def main(argv):
 
                                        if len(f.split(":")) == 2:
                                                max_moves = int(f.split(":")[1])
-
+                                               
+               elif (arg[1] == '-' and arg[2:].split("=")[0] == "server"):
+                       #debug("Server: " + str(arg[2:]))
+                       if len(arg[2:].split("=")) <= 1:
+                               server_addr = True
+                       else:
+                               server_addr = arg[2:].split("=")[1]
+                       
                elif (arg[1] == '-' and arg[2:].split("=")[0] == "log"):
                        # Log file
                        if len(arg[2:].split("=")) == 1:
-                               log_files.append(LogFile(sys.stdout))
+                               log_files.append(LogFile(sys.stdout,""))
                        else:
                                f = arg[2:].split("=")[1]
-                               if f[0] == '@':
+                               if f == "":
+                                       log_files.append(LogFile(sys.stdout, ""))
+                               elif f[0] == '@':
                                        log_files.append(ShortLog(f[1:]))
                                else:
-                                       log_files.append(LogFile(open(f, "w", 0)))
+                                       log_files.append(LogFile(open(f, "w", 0), f))
                elif (arg[1] == '-' and arg[2:].split("=")[0] == "delay"):
                        # Delay
                        if len(arg[2:].split("=")) == 1:
@@ -2459,12 +2806,35 @@ def main(argv):
                                agent_timeout = -1
                        else:
                                agent_timeout = float(arg[2:].split("=")[1])
-                               
+               elif (arg[1] == '-' and arg[2:].split("=")[0] == "blackout"):
+                       # Screen saver delay
+                       if len(arg[2:].split("=")) == 1:
+                               sleep_timeout = -1
+                       else:
+                               sleep_timeout = float(arg[2:].split("=")[1])
+               elif (arg[1] == '-' and arg[2:] == "retry-illegal"):
+                       retry_illegal = not retry_illegal
                elif (arg[1] == '-' and arg[2:] == "help"):
                        # Help
                        os.system("less data/help.txt") # The best help function
                        return 0
-
+               
+       # Dedicated server?
+       
+       #debug("server_addr = " + str(server_addr))
+       
+       if server_addr != None:
+               if server_addr == True:
+                       return dedicated_server()
+               else:
+                       if len(players) > 1:
+                               sys.stderr.write("Only a single player may be provided when --server is used\n")
+                               return 1
+                       if len(players) == 1:
+                               return client(server_addr, players[0].name)
+                       else:
+                               return client(server_addr)
+               
 
        # Create the board
        
@@ -2490,6 +2860,7 @@ def main(argv):
                board = Board(style)
                board.max_moves = max_moves
                game = GameThread(board, players) 
+               game.retry_illegal = retry_illegal
 
 
 
@@ -2498,6 +2869,8 @@ def main(argv):
        if graphics_enabled == True:
                try:
                        graphics = GraphicsThread(game.board, grid_sz = [64,64]) # Construct a GraphicsThread!
+                       
+                       graphics.sleep_timeout = sleep_timeout
 
                except Exception,e:
                        graphics = None
@@ -2507,6 +2880,15 @@ def main(argv):
        # If there are no players listed, display a nice pretty menu
        if len(players) != 2:
                if graphics != None:
+                       
+                       server_addr = graphics.SelectServer()
+                       if server_addr != None:
+                               pygame.quit() # Time to say goodbye
+                               if server_addr == True:
+                                       return dedicated_server()
+                               else:
+                                       return client(server_addr)      
+                       
                        players = graphics.SelectPlayers(players)
                else:
                        sys.stderr.write(sys.argv[0] + " : Usage " + sys.argv[0] + " white black\n")
@@ -2517,27 +2899,23 @@ def main(argv):
                sys.stderr.write(sys.argv[0] + " : Graphics window closed before players chosen\n")
                return 45
 
-
-       # Wrap NetworkSender players around original players if necessary
-       for i in range(len(players)):
-               if isinstance(players[i], NetworkReceiver):
-                       players[i].board = board # Network players need direct access to the board
-                       for j in range(len(players)):
-                               if j == i:
-                                       continue
-                               if isinstance(players[j], NetworkSender) or isinstance(players[j], NetworkReceiver):
+       old = players[:]
+       for p in old:
+               if isinstance(p, NetworkPlayer):
+                       for i in range(len(old)):
+                               if old[i] == p or isinstance(old[i], NetworkPlayer):
                                        continue
-                               players[j] = NetworkSender(players[j], players[i].address)
-                               players[j].board = board
-
-       # Connect the networked players
+                               players[i] = NetworkPlayer(old[i].colour, p.network, old[i])
+               
        for p in players:
-               if isinstance(p, NetworkSender) or isinstance(p, NetworkReceiver):
-                       if graphics != None:
-                               graphics.board.display_grid(graphics.window, graphics.grid_sz)
-                               graphics.message("Connecting to " + p.colour + " player...")
-                       p.connect()
-
+               #debug(str(p))
+               if isinstance(p, NetworkPlayer):
+                       p.board = game.board
+                       if not p.network.connected:
+                               if not p.network.server:
+                                       time.sleep(0.2)
+                               p.network.connect()
+                               
        
        # If using windows, select won't work; use horrible TimeoutPlayer hack
        if agent_timeout > 0:
@@ -2585,11 +2963,19 @@ def main(argv):
        sys.stdout.write(game.final_result + "\n")
 
        return error
+               
+               
+       
+               
+       
+               
+               
 
 # This is how python does a main() function...
 if __name__ == "__main__":
+       retcode = 0
        try:
-               sys.exit(main(sys.argv))
+               retcode = main(sys.argv)
        except KeyboardInterrupt:
                sys.stderr.write(sys.argv[0] + " : Got KeyboardInterrupt. Stopping everything\n")
                if isinstance(graphics, StoppableThread):
@@ -2600,8 +2986,21 @@ if __name__ == "__main__":
                        game.stop()
                        if game.is_alive():
                                game.join()
-
-               sys.exit(102)
+               retcode = 102
+       #except Exception, e:
+       #       sys.stderr.write(sys.argv[0] + " : " + e.message + "\n")
+       #       retcode = 103   
+               
+       try:
+               sys.stdout.close()
+       except:
+               pass
+       try:
+               sys.stderr.close()
+       except:
+               pass
+       sys.exit(retcode)
+               
 
 # --- main.py --- #
-# EOF - created from make on Thu Feb 28 18:12:37 WST 2013
+# EOF - created from make on Friday 21 June  18:15:14 WST 2013

UCC git Repository :: git.ucc.asn.au