X-Git-Url: https://git.ucc.asn.au/?p=progcomp2013.git;a=blobdiff_plain;f=qchess%2Fqchess.py;h=092a121dedd871abede9903298d324cdf4f247fd;hp=f3d57931bc1ac6e84e6235714a36ed6d86ccf958;hb=e9e685cd5fa0c4f068df2431232b7c2250ffd0ed;hpb=64978647120812a13948e2146de81281b38a54d5 diff --git a/qchess/qchess.py b/qchess/qchess.py index f3d5793..092a121 100755 --- a/qchess/qchess.py +++ b/qchess/qchess.py @@ -257,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: @@ -273,7 +273,7 @@ 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, sanity=True, deselect=True): - debug(str(self) + " update_select called") + #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() and sanity == True: @@ -293,7 +293,7 @@ class Board(): # Update the board when a piece has been moved def update_move(self, x, y, x2, y2, sanity=True): - debug(str(self) + " update_move called \""+str(x)+ " " + str(y) + " -> " + str(x2) + " " + str(y2) + "\"") + #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)) @@ -333,7 +333,7 @@ class Board(): # Update the board from a string # Guesses what to do based on the format of the string def update(self, result, sanity=True, deselect=True): - debug(str(self) + " update called \""+str(result)+"\"") + #debug(str(self) + " update called \""+str(result)+"\"") # String always starts with 'x y' try: s = result.split(" ") @@ -432,6 +432,12 @@ class Board(): 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)): @@ -587,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] @@ -612,7 +620,7 @@ 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 @@ -643,6 +651,136 @@ class Player(): 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") + + + + + + 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): @@ -886,10 +1024,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 @@ -1084,8 +1221,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 @@ -1106,7 +1246,7 @@ def TimeoutFunction(function, args, timeout): w.terminate() s.join() raise Exception("TIMEOUT") - + time.sleep(0.1) @@ -1148,7 +1288,7 @@ class NetworkPlayer(Player): return "NetworkPlayer<"+str(self.colour)+","+str(self.player)+">" def select(self): - debug(str(self) + " select called") + #debug(str(self) + " select called") if self.player != None: s = self.player.select() self.send_message(str(s[0]) + " " + str(s[1])) @@ -1157,21 +1297,24 @@ class NetworkPlayer(Player): 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") + #debug(str(self) + " send_message(\""+str(message)+"\") called") self.network.send_message(message) def get_response(self): - debug(str(self) + " get_response() called") + #debug(str(self) + " get_response() called") s = self.network.get_response() - debug(str(self) + " get_response() returns \""+str(s)+"\"") + #debug(str(self) + " get_response() returns \""+str(s)+"\"") return s def get_move(self): - debug(str(self) + " get_move called") + #debug(str(self) + " get_move called") if self.player != None: s = self.player.get_move() self.send_message(str(s[0]) + " " + str(s[1])) @@ -1180,15 +1323,23 @@ class NetworkPlayer(Player): 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") + #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) @@ -1207,7 +1358,10 @@ class NetworkPlayer(Player): return self.player.base_player() def quit(self, result): - pass + try: + self.send_message("-1 -1") + except: + pass class Network(): def __init__(self, address = (None,4562)): @@ -1221,7 +1375,7 @@ class Network(): self.connected = False def connect(self): - debug(str(self) + "Tries to connect") + #debug(str(self) + "Tries to connect") self.connected = True if self.address[0] == None: self.host = "0.0.0.0" #socket.gethostname() # Breaks things??? @@ -1317,15 +1471,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") @@ -1359,7 +1512,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 @@ -1534,10 +1687,11 @@ class GameThread(StoppableThread): for p in self.players: with self.lock: self.state["turn"] = p.base_player() - #try: - if True: + try: + #if True: [x,y] = p.select() # Player selects a square if self.stopped(): + #debug("Quitting in select") break if isinstance(p, NetworkPlayer): @@ -1549,10 +1703,18 @@ class GameThread(StoppableThread): else: result = self.board.select(x, y, colour = p.colour) - result = p.update(result) + result = p.update(result) + if self.stopped(): + break for p2 in self.players: - if p2 != p: - p2.update(result) # Inform players of what happened + if p2 == p: + continue + p2.update(result) # Inform players of what happened + if self.stopped(): + break + + if self.stopped(): + break log(result) @@ -1576,12 +1738,13 @@ 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 if isinstance(p, NetworkPlayer): @@ -1595,10 +1758,20 @@ class GameThread(StoppableThread): result = str(x) + " " + str(y) + " -> " + str(x2) + " " + str(y2) self.board.update_move(x, y, x2, y2) - result = p.update(result) + result = p.update(result) + if self.stopped(): + break for p2 in self.players: - if p2 != p: - p2.update(result) # Inform players of what happened + if p2 == p: + continue + p2.update(result) # Inform players of what happened + if self.stopped(): + break + + if self.stopped(): + break + + log(result) @@ -1617,28 +1790,31 @@ 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(): + if self.stopped(): + break + except Exception,e: + #if False: + result = e.message + 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: p2.quit(self.final_result) @@ -2253,7 +2429,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 = []): @@ -2344,63 +2531,86 @@ class GraphicsThread(StoppableThread): # --- graphics.py --- # def dedicated_server(): - max_games = 4 + 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() - debug("Got white player") + log("Got white player") - g = subprocess.Popen(["python", "qchess.py", "@network::"+str(4700+len(games)), "@network::"+str(4700+len(games)), "--log="+"_".join(str(datetime.datetime.now()).split(" ")) + ".log"], stdout=subprocess.PIPE) + 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) - ss[0].send("white " + str(4700 + len(games)-1)) - ss[0].shutdown(socket.SHUT_RDWR) + 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() - debug("Got black player") + log("Got black player") - ss[0].send("black " + str(4700 + len(games)-1)) - ss[0].shutdown(socket.SHUT_RDWR) + 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: - ready = select.select(map(lambda e : e.stdout, games),[], [], None) - for r in ready: + #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"): + -def client(addr): s = socket.socket() s.connect((addr, 4562)) [colour,port] = s.recv(1024).strip(" \r\n").split(" ") - debug("Colour: " + colour + ", port: " + port) + #debug("Colour: " + colour + ", port: " + port) s.shutdown(socket.SHUT_RDWR) s.close() if colour == "white": - p = subprocess.Popen(["python", "qchess.py", "@human", "@network:"+addr+":"+port]) + p = subprocess.Popen(["python", "qchess.py", player, "@network:"+addr+":"+port]) else: - p = subprocess.Popen(["python", "qchess.py", "@network:"+addr+":"+port, "@human"]) + p = subprocess.Popen(["python", "qchess.py", "@network:"+addr+":"+port, player]) p.wait() - sys.exit(0)# --- server.py --- # + return 0# --- server.py --- # #!/usr/bin/python -u # Do you know what the -u does? It unbuffers stdin and stdout @@ -2463,7 +2673,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) @@ -2486,6 +2700,9 @@ def main(argv): global always_reveal_states global sleep_timeout + + server_addr = None + max_moves = None src_file = None @@ -2543,22 +2760,25 @@ def main(argv): if len(f.split(":")) == 2: max_moves = int(f.split(":")[1]) - elif (arg[1] == '-' and arg[2:] == "server"): - if len(arg[2:].split("=") <= 1): - dedicated_server() + elif (arg[1] == '-' and arg[2:].split("=")[0] == "server"): + #debug("Server: " + str(arg[2:])) + if len(arg[2:].split("=")) <= 1: + server_addr = True else: - client(arg[2:].split("=")[1]) - sys.exit(0) + 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: @@ -2583,7 +2803,23 @@ def main(argv): # 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 @@ -2628,6 +2864,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") @@ -2647,7 +2892,7 @@ def main(argv): players[i] = NetworkPlayer(old[i].colour, p.network, old[i]) for p in players: - debug(str(p)) + #debug(str(p)) if isinstance(p, NetworkPlayer): p.board = game.board if not p.network.connected: @@ -2712,8 +2957,9 @@ def main(argv): # 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): @@ -2724,8 +2970,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 Sat Apr 20 10:20:13 WST 2013 +# EOF - created from make on Sun May 19 12:36:10 WST 2013