X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=plomrogue-server.py;h=eb6ace2696c0d386b1fbab7aa681056ad1af058d;hb=774bf6e5e1e506dd8eca699098babaf56c1a8538;hp=c9cc20e78bb4d560a34fc180e6da488c8adeeb3c;hpb=1b641d2c660fa003e73db970cbbbc935345a495d;p=plomrogue diff --git a/plomrogue-server.py b/plomrogue-server.py index c9cc20e..eb6ace2 100755 --- a/plomrogue-server.py +++ b/plomrogue-server.py @@ -9,13 +9,16 @@ import time def setup_server_io(io_db): """Fill IO files DB with proper file( path)s. Write process IO test string. - Decide file paths. Ensure IO files directory at server/. Remove any old in - file if found. Set up new in file (io_db["file_in"]) for reading at - io_db["path_in"], and new out file (io_db["file_out"]) for writing at - io_db["path_out"]. Start out file with process hash line of format PID + - " " + floated UNIX time (io_db["teststring"]). + Set io_db["kicked_by_rival"] to False. Decide file paths. Ensure IO files + directory at server/. Remove any old in file if found. Set up new in file + (io_db["file_in"]) for reading at io_db["path_in"], and new out file + (io_db["file_out"]) for writing at io_db["path_out"]. Start out file with + process hash line of format PID + " " + floated UNIX time + (io_db["teststring"]). Run detect_atomic_leftover on io_db["path_record"] + and io_db["path_save"]. """ io_dir = "server/" + io_db["kicked_by_rival"] = False io_db["path_in"] = io_dir + "in" io_db["path_out"] = io_dir + "out" io_db["path_worldstate"] = io_dir + "worldstate" @@ -27,19 +30,23 @@ def setup_server_io(io_db): os.makedirs(io_dir, exist_ok=True) io_db["file_out"] = open(io_db["path_out"], "w") io_db["file_out"].write(io_db["teststring"] + "\n") + io_db["file_out"].flush() if os.access(io_db["path_in"], os.F_OK): os.remove(io_db["path_in"]) io_db["file_in"] = open(io_db["path_in"], "w") io_db["file_in"].close() io_db["file_in"] = open(io_db["path_in"], "r") + detect_atomic_leftover(io_db["path_save"], io_db["tmp_suffix"]) + detect_atomic_leftover(io_db["path_record"], io_db["tmp_suffix"]) def cleanup_server_io(io_db): - """Close and remove all files open in IO files DB.""" + """Close and (if io_db["kicked_by_rival"] false) remove files in io_db.""" def helper(file_key, path_key): if file_key in io_db: io_db[file_key].close() - os.remove(io_db[path_key]) + if not io_db["kicked_by_rival"]: + os.remove(io_db[path_key]) helper("file_out", "path_out") helper("file_in", "path_in") helper("file_worldstate", "path_worldstate") @@ -80,8 +87,8 @@ def obey(cmd, io_db, prefix): def record(cmd, io_db): """Append cmd string plus newline to file at path_recordfile. (Atomic.)""" # This misses some optimizations from the original record(), namely only - # finishing the atomic write with flush() and fsync() every 15 seconds - # unless explicitely forced. Implement as needed. + # finishing the atomic write with expensive flush() and fsync() every 15 + # seconds unless explicitely forced. Implement as needed. path_tmp = io_db["path_record"] + io_db["tmp_suffix"] if os.access(io_db["path_record"], os.F_OK): shutil.copyfile(io_db["path_record"], path_tmp) @@ -97,7 +104,7 @@ def record(cmd, io_db): def obey_lines_in_file(path, name): """Call obey() on each line of path's file, use name in input prefix.""" - file = open(io_db["path_worldconf"], "r") + file = open(path, "r") line_n = 1 for line in file.readlines(): obey(line.rstrip(), io_db, name + "file line " + str(line_n)) @@ -105,16 +112,43 @@ def obey_lines_in_file(path, name): file.close() -io_db = {} -try: +def parse_command_line_arguments(): + """Return settings values read from command line arguments.""" parser = argparse.ArgumentParser() parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1, action='store') + opts, unknown = parser.parse_known_args() + return opts + + +def server_test(io_db): + """Ensure valid server out file belonging to current process. + + On failure, set io_db["kicked_by_rival"] and raise SystemExit. + """ + if not os.access(io_db["path_out"], os.F_OK): + raise SystemExit("Server output file has disappeared.") + file = open(io_db["path_out"], "r") + test = file.readline().rstrip("\n") + file.close() + if test != io_db["teststring"]: + io_db["kicked_by_rival"] = True + msg = "Server test string in server output file does not match. This" \ + " indicates that the current server process has been " \ + "superseded by another one." + raise SystemExit(msg) + + +def io_loop (): + return False + + +io_db = {} +world_db = {} +try: + opts = parse_command_line_arguments() setup_server_io(io_db) # print("DUMMY: Run game.") - detect_atomic_leftover(io_db["path_save"], io_db["tmp_suffix"]) - detect_atomic_leftover(io_db["path_record"], io_db["tmp_suffix"]) - opts, unknown = parser.parse_known_args() if None != opts.replay: if opts.replay < 1: opts.replay = 1 @@ -122,6 +156,19 @@ try: " (if so late a turn is to be found).") if not os.access(io_db["path_record"], os.F_OK): raise SystemExit("No record file found to replay.") + world_db["turn"] = 0 + file = open(io_db["path_record"], "r") + prefix = "record file line " + line_n = 1 + while world_db["turn"] < opts.replay: + server_test(io_db) + obey(file.readline().rstrip(), io_db, prefix + str(line_n)) + line_n = line_n + 1 + while io_loop(): + server_test(io_db) + obey(file.readline().rstrip(), io_db, prefix + str(line_n)) + line_n = line_n + 1 + file.close() else: if os.access(io_db["path_save"], os.F_OK): obey_lines_in_file(io_db["path_save"], "save") @@ -131,7 +178,9 @@ try: raise SystemExit(msg) obey_lines_in_file(io_db["path_worldconf"], "world config ") obey("MAKE_WORLD " + str(int(time.time())), io_db, "in file") - # print("DUMMY: Run io_loop().") + while io_loop(): + server_test(io_db) + # more? except SystemExit as exit: print("ABORTING: " + exit.args[0]) except: