+#!/usr/bin/python3
import argparse
import errno
import os
"""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
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():
if os.access(path_tmp, os.F_OK):
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")
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()
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.
- 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:
else:
commands_db[tokens[0]][2](*tokens[1:])
if do_record:
- record(command)
- save_world()
+ 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):
print("Invalid command/argument, or bad number of tokens.")
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')
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
if "a" == filter:
for id in world_db["Things"]:
Thing = world_db["Things"][id]
- pos = Thing["T_POSY"] * world_db["MAP_LENGTH"] + Thing["T_POSX"]
+ pos = Thing["T_POSY"] * world_db["MAP_LENGTH"] \
+ + Thing["T_POSX"]
if t != Thing and Thing["T_LIFEPOINTS"] and \
t["T_TYPE"] != Thing["T_TYPE"] and \
'v' == chr(t["fovmap"][pos]) and \
t["T_LIFEPOINTS"] > \
- world_db["ThingTypes"][Thing["T_TYPE"]]["TT_LIFEPOINTS"]:
+ world_db["ThingTypes"][Thing["T_TYPE"]]["TT_LIFEPOINTS"]:
set_map_score(pos, 0)
elif t["T_TYPE"] == Thing["T_TYPE"]:
set_map_score(pos, 65535)
for id in [id for id in world_db["Things"]
if world_db["Things"][id]["T_LIFEPOINTS"]]:
Thing = world_db["Things"][id]
- pos = Thing["T_POSY"] * world_db["MAP_LENGTH"] + Thing["T_POSX"]
+ pos = Thing["T_POSY"] * world_db["MAP_LENGTH"] \
+ + Thing["T_POSX"]
if t["T_TYPE"] != Thing["T_TYPE"] and \
'v' == chr(t["fovmap"][pos]) and \
t["T_LIFEPOINTS"] <= \
- world_db["ThingTypes"][Thing["T_TYPE"]]["TT_LIFEPOINTS"]:
+ world_db["ThingTypes"][Thing["T_TYPE"]]["TT_LIFEPOINTS"]:
set_map_score(pos, 0)
elif "c" == filter:
for mt in [mt for mt in t["T_MEMTHING"]
for i in [i for i in range(world_db["MAP_LENGTH"] ** 2)
if t["T_MEMDEPTHMAP"][i] == mem_depth_c[0]]:
set_map_score(i, 0)
-
+
def rand_target_dir(neighbors, cmp, dirs):
candidates = []
n_candidates = 0
dir_to_target = rand_target_dir(neighbors, 0, dirs)
elif 3 >= get_map_score(eye_pos):
t["T_COMMAND"] = [id for id in world_db["ThingActions"]
- if world_db["ThingActions"][id]["TA_NAME"]
+ if
+ world_db["ThingActions"][id]["TA_NAME"]
== "wait"][0]
- return 1;
+ return 1
elif dir_to_target and 3 < get_map_score(eye_pos):
dir_to_target = 0
elif "a" == filter and 10 <= get_map_score(eye_pos):
id = 0
whilebreaker = False
while world_db["Things"][0]["T_LIFEPOINTS"]:
- for id in [id for id in world_db["Things"]]: # Only what is from start!
+ for id in [id for id in world_db["Things"]]: # Only what's from start!
if not id in world_db["Things"] or \
- world_db["Things"][id]["carried"]:# Thing may have been consumed
- continue # or picked up during turn …
+ world_db["Things"][id]["carried"]: # May have been consumed or
+ continue # picked up during turn …
Thing = world_db["Things"][id]
if Thing["T_LIFEPOINTS"]:
if not Thing["T_COMMAND"]:
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")
"""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",
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:
projects / plomrogue / blobdiff