Re-wrote large parts of the server client architecture. No more fifo.

[plomrogue] / src / server / main.c

diff --git a/src/server/main.c b/src/server/main.c
index 64d4434943867fb7a36d7b60da2759dae675dd41..769d47c07f49c532be4016befc60087480f5686b 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -1,12 +1,17 @@
 /* src/server/main.c */
 
 #include <errno.h> /* global errno */
-#include <stdio.h> /* printf() */
+#include <stdio.h> /* printf(), fflush() */
 #include <stdlib.h> /* exit() */
+#include <string.h> /* strlen() */
 #include <sys/stat.h> /* mkfifo(), mkdir() */
-#include <unistd.h> /* access() */
+#include <sys/types.h> /* defines pid_t, time_t */
+#include <time.h> /* #time() */
+#include <unistd.h> /* access(), getpid(), unlink() */
 #include "../common/err_try_fgets.h" /* set_err_try_fgets_delim() */
-#include "../common/rexit.h" /* exit_err, exit_trouble(), set_cleanup_func() */
+#include "../common/readwrite.h" /* try_fopen(), try_fwrite(), try_fclose() */
+#include "../common/rexit.h" /* exit_err, set_cleanup_func() */
+#include "../common/try_malloc.h" /* try_malloc() */
 #include "cleanup.h" /* set_cleanup_flag(), cleanup() */
 #include "init.h" /* run_game(), obey_argv() */
 #include "map_object_actions.h" /* init_map_object_actions() */
@@ -43,10 +48,11 @@ int main(int argc, char ** argv)
     }
     world.path_map_obj_defs = "confserver/defs";
     world.path_map_obj_acts = "confserver/map_object_actions";
-    world.path_in     = "server/in";
-    world.path_out    = "server/out";
-    world.path_record = "record";
-    world.tmp_suffix  = "_tmp";
+    world.path_worldstate   = "server/worldstate";
+    world.path_out          = "server/out";
+    world.path_in           = "server/in";
+    world.path_record       = "record";
+    world.tmp_suffix        = "_tmp";
     set_err_try_fgets_delim("%%\n");
 
     /* Set map geometry. */
@@ -61,19 +67,33 @@ int main(int argc, char ** argv)
     exit_err(access(world.path_map_obj_defs, F_OK), err_mod);
     exit_err(access(world.path_map_obj_acts, F_OK), err_moa);
 
-    /* Treat world.path_in file as server process lock file. */
-    char * err = "Found pre-existing input fifo file. This indicates another "
-                 "roguelike-server may be running. It should be killed first.";
-    exit_err(!access(world.path_in, F_OK), err);
-    int test = mkdir("server", 0700);
-    exit_trouble(test && EEXIST != errno, f_name, "mkdir()");
-    exit_trouble(mkfifo(world.path_in, 0600), f_name, "mkfifo()");
-    set_cleanup_flag(CLEANUP_FIFO);
-
     /* Init from config files map object (action) definitions. */
     init_map_object_defs();
     init_map_object_actions();
 
+    /* Create server directory if it does not exist yet. */
+    int test = mkdir("server", 0700);
+    exit_trouble(test && EEXIST != errno, f_name, "mkdir()");
+
+    /* Create server out file and start it with server process test string. */
+    world.file_out = try_fopen(world.path_out, "w", f_name);
+    world.server_test = try_malloc(10 + 1 + 10 + 1 + 1, f_name);
+    sprintf(world.server_test, "%d %d\n", getpid(), (int) time(0));
+    try_fwrite(world.server_test, strlen(world.server_test), 1,
+               world.file_out, f_name);
+    fflush(world.file_out);
+    set_cleanup_flag(CLEANUP_OUT);
+
+    /* Create server in file, switch to reading it. */
+    if (!access(world.path_in, F_OK))  /* This keeps out input from old input */
+    {                                  /* file streams of clients             */
+        unlink(world.path_in);         /* communicating with server processes */
+    }                                  /* superseded by this current one.     */
+    world.file_in = try_fopen(world.path_in, "w", f_name);
+    try_fclose(world.file_in, f_name);
+    world.file_in = try_fopen(world.path_in, "r", f_name);
+    set_cleanup_flag(CLEANUP_IN);
+
     /* Enter play or replay mode loops, then leave properly. */
     run_game();
     cleanup();