X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fserver%2Frun.c;h=414549227f963db1d3c21135cdfe51891cfb24de;hb=7433f56ec2c6cc51bc497e3c0c67d2fe3e6ab64a;hp=82e0aaefb866ce80fd3f5d4f63a7f281c598ac19;hpb=0cc6c4ad7e0b01e2a89ced908f410eadf3f22b1f;p=plomrogue
diff --git a/src/server/run.c b/src/server/run.c
index 82e0aae..4145492 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -3,16 +3,17 @@
#include "run.h"
#include /* NULL */
#include /* uint8_t, uint16_t, uint32_t */
-#include /* FILE, sprintf() */
+#include /* FILE, sprintf(), fflush() */
#include /* free() */
-#include /* strlen(), strncmp(), atoi() */
+#include /* strlen(), strcmp() strncmp(), atoi() */
#include /* access() */
#include "../common/readwrite.h" /* try_fopen(), try_fcose(), try_fwrite(),
* try_fgets(), try_fclose_unlink_rename(),
* textfile_width(), try_fputc()
*/
-#include "../common/rexit.h" /* exit_trouble() */
+#include "../common/rexit.h" /* exit_trouble(), exit_err() */
#include "ai.h" /* ai() */
+#include "cleanup.h" /* unset_cleanup_flag() */
#include "init.h" /* remake_world() */
#include "io.h" /* io_round() */
#include "map_object_actions.h" /* get_moa_id_by_name() */
@@ -26,17 +27,6 @@
*/
static void turn_over();
-/* Helper to turn_over() to determine whether a map object's action effort has
- * reached its end. The simplicity of just comparing map_object->progress to
- * moa->effort is suspended for actor movement, for in this case the effort
- * depends on the diagonal movement penalty expressed in the ratio of
- * world.map.dist_diagonal / world.map.dist_orthogonal. (Movement being diagonal
- * or orthogonal is determined by the ->arg char encoding an even or un-even
- * number digit).
- */
-static uint8_t is_effort_finished(struct MapObjAct * moa,
- struct MapObj * map_object);
-
/* If "msg"'s first part matches "command_name", set player's MapObj's .command
* to the command's id and its .arg to a numerical value following in the latter
* part of "msg" (if no digits are found, use 0); then finish player's turn and
@@ -44,6 +34,13 @@ static uint8_t is_effort_finished(struct MapObjAct * moa,
*/
static uint8_t apply_player_command(char * msg, char * command_name);
+/* Compares first line of file at world.path_out to world.server_test, aborts if
+ * they don't match, but not before unsetting the flags deleting files in the
+ * server directory, for in that case those must be assumed to belong to another
+ * server process.
+ */
+static void server_test();
+
static void turn_over()
@@ -75,7 +72,7 @@ static void turn_over()
{
moa = moa->next;
}
- if (is_effort_finished(moa, map_object))
+ if (map_object->progress == moa->effort)
{
moa->func(map_object);
map_object->command = 0;
@@ -88,37 +85,6 @@ static void turn_over()
-static uint8_t is_effort_finished(struct MapObjAct * moa,
- struct MapObj * map_object)
-{
- if (moa->func != actor_move)
- {
- if (map_object->progress == moa->effort)
- {
- return 1;
- }
- }
- else if (strchr("8624", map_object->arg))
- {
- if (map_object->progress == moa->effort)
- {
- return 1;
- }
- }
- else if (strchr("1379", map_object->arg))
- {
- uint16_t diagonal_effort = (moa->effort * world.map.dist_diagonal)
- / world.map.dist_orthogonal;
- if (map_object->progress == diagonal_effort)
- {
- return 1;
- }
- }
- return 0;
-}
-
-
-
static uint8_t apply_player_command(char * msg, char * command_name)
{
if (!strncmp(msg, command_name, strlen(command_name)))
@@ -134,6 +100,27 @@ static uint8_t apply_player_command(char * msg, char * command_name)
+static void server_test()
+{
+ char * f_name = "server_test()";
+ char test[10 + 1 + 10 + 1 + 1];
+ FILE * file = try_fopen(world.path_out, "r", f_name);
+ try_fgets(test, 10 + 10 + 1 + 1, file, f_name);
+ try_fclose(file, f_name);
+ if (strcmp(test, world.server_test))
+ {
+ unset_cleanup_flag(CLEANUP_WORLDSTATE);
+ unset_cleanup_flag(CLEANUP_OUT);
+ unset_cleanup_flag(CLEANUP_IN);
+ char * msg = "Server test string in server output file does not match. "
+ "This indicates that the current server process has been "
+ "superseded by another one.";
+ exit_err(1, msg);
+ }
+}
+
+
+
extern void obey_msg(char * msg, uint8_t do_record)
{
char * f_name = "obey_msg()";
@@ -179,6 +166,7 @@ extern uint8_t io_loop()
char * f_name = "io_loop()";
while (1)
{
+ server_test();
char * msg = io_round();
if (NULL == msg)
{
@@ -193,6 +181,14 @@ extern uint8_t io_loop()
free(msg);
return 1;
}
+ if (!strcmp("PING", msg))
+ {
+ free(msg);
+ char * pong = "PONG\n";
+ try_fwrite(pong, strlen(pong), 1, world.file_out, f_name);
+ fflush(world.file_out);
+ continue;
+ }
if (world.replay)
{
free(msg);