X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue-server.py;h=77c19acd498326b49f9796c43b7a7b9ad7fc215e;hb=7f2634d484715caba2974faac0871db927b9cbd0;hp=67210ca61acc5e403e2b5577d1d6d3da04cf6c05;hpb=8dba2bfb8817be40c45a36b1842c728aa66716e9;p=plomrogue
diff --git a/plomrogue-server.py b/plomrogue-server.py
index 67210ca..77c19ac 100755
--- a/plomrogue-server.py
+++ b/plomrogue-server.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python3
import argparse
import errno
import os
@@ -26,7 +27,8 @@ def prep_library():
"""Prepare ctypes library at ./libplomrogue.so"""
libpath = ("./libplomrogue.so")
if not os.access(libpath, os.F_OK):
- raise SystemExit("No library " + libpath + ", run ./compile.sh first?")
+ raise SystemExit("No library " + libpath +
+ ", run ./compile-server.sh first?")
libpr = ctypes.cdll.LoadLibrary(libpath)
libpr.seed_rrand.argtypes = [ctypes.c_uint8, ctypes.c_uint32]
libpr.seed_rrand.restype = ctypes.c_uint32
@@ -56,10 +58,9 @@ def prep_library():
def strong_write(file, string):
- """Apply write(string), flush(), and os.fsync() to file."""
+ """Apply write(string), then flush()."""
file.write(string)
file.flush()
- os.fsync(file)
def setup_server_io():
@@ -80,6 +81,8 @@ def setup_server_io():
raise SystemExit(msg)
io_db["teststring"] = str(os.getpid()) + " " + str(time.time())
io_db["save_wait"] = 0
+ io_db["verbose"] = False
+ io_db["record_chunk"] = ""
os.makedirs(io_db["path_server"], exist_ok=True)
io_db["file_out"] = open(io_db["path_out"], "w")
strong_write(io_db["file_out"], io_db["teststring"] + "\n")
@@ -97,11 +100,11 @@ def cleanup_server_io():
def helper(file_key, path_key):
if file_key in io_db:
io_db[file_key].close()
- if not io_db["kicked_by_rival"] \
- and os.access(io_db[path_key], os.F_OK):
- os.remove(io_db[path_key])
- helper("file_out", "path_out")
+ if not io_db["kicked_by_rival"] \
+ and os.access(io_db[path_key], os.F_OK):
+ os.remove(io_db[path_key])
helper("file_in", "path_in")
+ helper("file_out", "path_out")
helper("file_worldstate", "path_worldstate")
if "file_record" in io_db:
io_db["file_record"].close()
@@ -114,13 +117,15 @@ def obey(command, prefix, replay=False, do_record=False):
a non-meta command from the commands_db merely triggers obey() on the next
command from the records file. If not, non-meta commands set
io_db["worldstate_updateable"] to world_db["WORLD_EXISTS"], and, if
- do_record is set, are recorded via record(), and save_world() is called if
- 15 seconds have passed since the last time it was called. The prefix string
- is inserted into the server's input message between its beginning 'input '
- & ':'. All activity is preceded by a server_test() call.
+ do_record is set, are recorded to io_db["record_chunk"], and save_world()
+ is called (and io_db["record_chunk"] written) if 15 seconds have passed
+ since the last time it was called. The prefix string is inserted into the
+ server's input message between its beginning 'input ' and ':'. All activity
+ is preceded by a server_test() call.
"""
server_test()
- print("input " + prefix + ": " + command)
+ if io_db["verbose"]:
+ print("input " + prefix + ": " + command)
try:
tokens = shlex.split(command, comments=True)
except ValueError as err:
@@ -142,9 +147,12 @@ def obey(command, prefix, replay=False, do_record=False):
else:
commands_db[tokens[0]][2](*tokens[1:])
if do_record:
- record(command)
+ io_db["record_chunk"] += command + "\n"
if time.time() > io_db["save_wait"] + 15:
+ atomic_write(io_db["path_record"], io_db["record_chunk"],
+ do_append=True)
save_world()
+ io_db["record_chunk"] = ""
io_db["save_wait"] = time.time()
io_db["worldstate_updateable"] = world_db["WORLD_ACTIVE"]
elif 0 != len(tokens):
@@ -167,17 +175,8 @@ def atomic_write(path, text, do_append=False):
os.rename(path_tmp, path)
-def record(command):
- """Append command string plus newline to record file. (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.
- atomic_write(io_db["path_record"], command + "\n", do_append=True)
-
-
def save_world():
"""Save all commands needed to reconstruct current world state."""
- # TODO: Misses same optimizations as record() from the original record().
def quote(string):
string = string.replace("\u005C", '\u005C\u005C')
@@ -258,6 +257,9 @@ def parse_command_line_arguments():
parser = argparse.ArgumentParser()
parser.add_argument('-s', nargs='?', type=int, dest='replay', const=1,
action='store')
+ parser.add_argument('-l', nargs="?", const="save", dest='savefile',
+ action="store")
+ parser.add_argument('-v', dest='verbose', action='store_true')
opts, unknown = parser.parse_known_args()
return opts
@@ -1100,6 +1102,7 @@ def command_ping():
def command_quit():
"""Abort server process."""
save_world()
+ atomic_write(io_db["path_record"], io_db["record_chunk"], do_append=True)
raise SystemExit("received QUIT command")
@@ -1599,7 +1602,7 @@ directions_db = {"east": "d", "south-east": "c", "south-west": "x",
"""File IO database."""
io_db = {
"path_save": "save",
- "path_record": "record",
+ "path_record": "record_save",
"path_worldconf": "confserver/world",
"path_server": "server/",
"path_in": "server/in",
@@ -1615,7 +1618,12 @@ try:
libpr = prep_library()
rand = RandomnessIO()
opts = parse_command_line_arguments()
+ if opts.savefile:
+ io_db["path_save"] = opts.savefile
+ io_db["path_record"] = "record_" + opts.savefile
setup_server_io()
+ if opts.verbose:
+ io_db["verbose"] = True
if None != opts.replay:
replay_game()
else: