X-Git-Url: https://plomlompom.com/repos/index.html?a=blobdiff_plain;ds=inline;f=plomrogue-server.py;h=34009382f77b3eac39ec03eb147288691b553510;hb=fdaa068476e6069d8aa3974a73337f055a41e385;hp=d9593f854f166196ee4f039c3692e24bff827fc7;hpb=0891d236075c217eb7e32a38c8da354a6419a1c3;p=plomrogue
diff --git a/plomrogue-server.py b/plomrogue-server.py
index d9593f8..3400938 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -2,6 +2,7 @@ import argparse
import errno
import os
import shlex
+import shutil
import time
@@ -12,7 +13,8 @@ def setup_server_io(io_db):
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"]).
+ " " + 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["path_in"] = io_dir + "in"
@@ -21,6 +23,7 @@ def setup_server_io(io_db):
io_db["path_record"] = "record"
io_db["path_save"] = "save"
io_db["path_worldconf"] = "confserver/world"
+ io_db["tmp_suffix"] = "_tmp"
io_db["teststring"] = str(os.getpid()) + " " + str(time.time())
os.makedirs(io_dir, exist_ok=True)
io_db["file_out"] = open(io_db["path_out"], "w")
@@ -30,6 +33,8 @@ def setup_server_io(io_db):
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):
@@ -43,9 +48,9 @@ def cleanup_server_io(io_db):
helper("file_worldstate", "path_worldstate")
-def detect_atomic_leftover(path):
- """Raise explained SystemExit if file is found at path + "_tmp"."""
- path_tmp = path + "_tmp"
+def detect_atomic_leftover(path, tmp_suffix):
+ """Raise explained SystemExit if file is found at path + tmp_suffix."""
+ path_tmp = path + tmp_suffix
msg = "Found file '" + path_tmp + "' that may be a leftover from an " \
"aborted previous attempt to write '" + path + "'. Aborting until " \
"the matter is resolved by removing it from its current path."
@@ -70,28 +75,59 @@ def obey(cmd, io_db, prefix):
raise SystemExit("received QUIT command")
elif "MAKE_WORLD" == tokens[0] and 2 == len(tokens):
print("I would generate a new world now, if only I knew how.")
- record(cmd, io_db["path_record"])
+ record(cmd, io_db)
else:
print("Invalid command/argument, or bad number of tokens.")
-def record(cmd, path_recordfile):
- """Append cmd string plus newline to file at path_recordfile."""
- # Doesn't yet replace old record() fully.
- file = open(path_recordfile, "a")
+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 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)
+ file = open(path_tmp, "a")
file.write(cmd + "\n")
+ file.flush()
+ os.fsync(file.fileno())
file.close()
+ if os.access(io_db["path_record"], os.F_OK):
+ os.remove(io_db["path_record"])
+ os.rename(path_tmp, io_db["path_record"])
+
+
+def obey_lines_in_file(path, name, break_test = None):
+ """Call obey() on each line of path's file, use name in input prefix.
+
+ If break_test function is set, only read the file until it returns True.
+ """
+ file = open(path, "r")
+ line_n = 1
+ for line in file.readlines():
+ if None != break_test and break_test():
+ break
+ obey(line.rstrip(), io_db, name + "file line " + str(line_n))
+ line_n = line_n + 1
+ file.close()
+
+
+def make_turn_tester(turn_to_compare, world_db):
+ """Return tester whether world_db["turn"] greater/equal turn_to_compare."""
+ def turn_tester():
+ return world_db["turn"] >= turn_to_compare
+ return turn_tester
io_db = {}
+world_db = {}
try:
parser = argparse.ArgumentParser()
parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1,
action='store')
setup_server_io(io_db)
# print("DUMMY: Run game.")
- detect_atomic_leftover(io_db["path_save"])
- detect_atomic_leftover(io_db["path_record"])
opts, unknown = parser.parse_known_args()
if None != opts.replay:
if opts.replay < 1:
@@ -100,19 +136,17 @@ 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
+ break_tester = make_turn_tester(opts.replay, world_db)
+ obey_lines_in_file(io_db["path_record"], "record ", break_tester)
else:
if os.access(io_db["path_save"], os.F_OK):
- print(open(io_db["path_save"], "r").read())
+ obey_lines_in_file(io_db["path_save"], "save")
else:
if not os.access(io_db["path_worldconf"], os.F_OK):
msg = "No world config file from which to start a new world."
raise SystemExit(msg)
- file = open(io_db["path_worldconf"])
- line_n = 1
- for line in file.readlines():
- obey(line.rstrip(), io_db, "worldconfig line " + str(line_n))
- line_n = line_n + 1
- file.close()
+ 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().")
except SystemExit as exit: