X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=inline;f=src%2Fserver%2Frun.c;h=301a0bae48987c375851a5133aacf35aa0a05557;hb=ca22fd77389df670bc483c43ae03f4d76023816f;hp=83bb724cb67cabbabdb1dfbff2615fc592a22dae;hpb=e03020342a74aef143b1ec38c18966dac64181b5;p=plomrogue
diff --git a/src/server/run.c b/src/server/run.c
index 83bb724..301a0ba 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -1,204 +1,347 @@
/* src/server/run.c */
+#define _POSIX_C_SOURCE 200809L
#include "run.h"
#include /* NULL */
#include /* uint8_t, uint16_t, uint32_t */
-#include /* FILE, sprintf() */
+#include /* FILE, printf(), fflush() */
#include /* free() */
-#include /* strlen(), strncmp(), atoi() */
+#include /* strlen(), strcmp(), strncmp(), strdup() */
+#include /* time_t, time() */
#include /* access() */
+#include "../common/parse_file.h" /* set_err_line_options(), token_from_line(),
+ * err_line(), err_line_inc(), parse_val()
+ */
#include "../common/readwrite.h" /* try_fopen(), try_fcose(), try_fwrite(),
- * try_fgets(), try_fclose_unlink_rename(),
- * textfile_sizes(), try_fputc()
+ * try_fgets(), textfile_width(), try_fputc(),
+ * atomic_write_finish(), build_temp_path()
*/
-#include "../common/rexit.h" /* exit_trouble() */
+#include "../common/rexit.h" /* exit_trouble(), exit_err() */
+#include "../common/try_malloc.h" /* try_malloc() */
#include "ai.h" /* ai() */
-#include "init.h" /* remake_world() */
-#include "io.h" /* io_round() */
-#include "map_object_actions.h" /* get_moa_id_by_name() */
-#include "map_objects.h" /* struct MapObj, get_player() */
-#include "world.h" /* global world */
+#include "cleanup.h" /* unset_cleanup_flag() */
+#include "god_commands.h" /* parse_god_command_(1|2|3)arg() */
+#include "hardcoded_strings.h" /* s */
+#include "io.h" /* io_round(), save_world() */
+#include "things.h" /* Thing, get_thing_action_id_by_name(), get_player() */
+#include "world.h" /* world */
+/* If "string" and "comparand" match in string, set "c_to_set" to value." */
+static uint8_t set_char_by_string_comparison(char * string, char * comparand,
+ char * c_to_set, char value);
+
+/* Return 1 on world.exists, else 0 and err_line() appropriate error message. */
+static uint8_t player_commands_allowed();
+
+/* Parse player command "tok0" with no argument to player action. */
+static uint8_t parse_player_command_0arg(char * tok0);
+
+/* Parse player command "tok0" with one argument "tok1" to player action. */
+static uint8_t parse_player_command_1arg(char * tok0, char * tok1);
+
+/* Parse/apply command "tok0" (read further tokens as necessary). */
+static uint8_t parse_command(char * tok0);
+
+/* Compares first line of server out file 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();
+
/* Run the game world and its inhabitants (and their actions) until the player
* avatar is free to receive new commands (or is dead).
*/
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
- * turn game over to the NPCs via turn_over(); then return 1. Else, return 0.
- */
-static uint8_t apply_player_command(char * msg, char * command_name);
+
+static uint8_t set_char_by_string_comparison(char * string, char * comparand,
+ char * c_to_set, char value)
+{
+ if (!strcmp(string, comparand))
+ {
+ * c_to_set = value;
+ return 1;
+ }
+ return 0;
+}
-static void turn_over()
+static uint8_t player_commands_allowed()
{
- struct MapObj * player = get_player();
- struct MapObj * map_object = player;
- uint16_t start_turn = world.turn;
- while ( 0 < player->lifepoints
- || (0 == player->lifepoints && start_turn == world.turn))
+ if (!world.exists)
{
- if (NULL == map_object)
- {
- world.turn++;
- map_object = world.map_objs;
- }
- if (0 < map_object->lifepoints)
+ return !err_line(1, "No world exists in which to run player commands.");
+ }
+ return 1;
+}
+
+
+
+static uint8_t parse_player_command_0arg(char * tok0)
+{
+ struct Thing * player = get_player();
+ if ( !strcmp(tok0, s[S_CMD_WAIT]) || !strcmp(tok0, s[S_CMD_PICKUP])
+ || !strcmp(tok0, s[S_CMD_AI]))
+ {
+ if (player_commands_allowed())
{
- if (0 == map_object->command)
- {
- if (map_object == player)
- {
- break;
- }
- ai(map_object);
- }
- map_object->progress++;
- struct MapObjAct * moa = world.map_obj_acts;
- while (moa->id != map_object->command)
+ if (!strcmp(tok0, s[S_CMD_AI]))
{
- moa = moa->next;
+ ai(player);
}
- if (is_effort_finished(moa, map_object))
+ else
{
- moa->func(map_object);
- map_object->command = 0;
- map_object->progress = 0;
+ player->command = get_thing_action_id_by_name(tok0);
+ player->arg = 0;
}
+ turn_over();
}
- map_object = map_object->next;
+ return 1;
}
+ return 0;
}
-static uint8_t is_effort_finished(struct MapObjAct * moa,
- struct MapObj * map_object)
+static uint8_t parse_player_command_1arg(char * tok0, char * tok1)
{
- if (moa->func != actor_move)
+ struct Thing * player = get_player();
+ if ( ( parse_val(tok0, tok1, s[S_CMD_DROP], '8', (char *) &player->arg)
+ || parse_val(tok0, tok1, s[S_CMD_USE], '8', (char *) &player->arg))
+ && player_commands_allowed())
{
- if (map_object->progress == moa->effort)
- {
- return 1;
- }
+ player->command = get_thing_action_id_by_name(tok0);
+ turn_over();
}
- else if (strchr("8624", map_object->arg))
+ else if (!strcmp(tok0, s[S_CMD_MOVE]) && player_commands_allowed())
{
- if (map_object->progress == moa->effort)
+ char dir = '\0';
+ if (!( set_char_by_string_comparison(tok1, "east", &dir, 'd')
+ || set_char_by_string_comparison(tok1, "south-east", &dir, 'c')
+ || set_char_by_string_comparison(tok1, "south-west", &dir, 'x')
+ || set_char_by_string_comparison(tok1, "west", &dir, 's')
+ || set_char_by_string_comparison(tok1, "north-west", &dir, 'w')
+ || set_char_by_string_comparison(tok1, "north-east", &dir, 'e')))
{
- return 1;
+ return 0;
}
+ player->arg = dir;
+ player->command = get_thing_action_id_by_name(tok0);
+ turn_over();
+ }
+ else
+ {
+ return 0;
+ }
+ return 1;
+}
+
+
+
+static uint8_t parse_command(char * tok0)
+{
+ if (parse_player_command_0arg(tok0))
+ {
+ return 1;
}
- else if (strchr("1379", map_object->arg))
+ else
{
- uint16_t diagonal_effort = (moa->effort * world.map.dist_diagonal)
- / world.map.dist_orthogonal;
- if (map_object->progress == diagonal_effort)
+ char * tok1 = token_from_line(NULL);
+ if (tok1 && ( parse_player_command_1arg(tok0, tok1)
+ || parse_god_command_1arg(tok0, tok1)))
{
return 1;
}
+ else
+ {
+ char * tok2 = token_from_line(NULL);
+ if (tok2 && parse_god_command_2arg(tok0, tok1, tok2))
+ {
+ return 1;
+ }
+ else
+ {
+ char * tok3 = token_from_line(NULL);
+ if (tok2 && parse_god_command_3arg(tok0, tok1, tok2, tok3))
+ {
+ return 1;
+ }
+ }
+ }
}
return 0;
}
-static uint8_t apply_player_command(char * msg, char * command_name)
+static void server_test()
{
- if (!strncmp(msg, command_name, strlen(command_name)))
+ char test[10 + 1 + 10 + 1 + 1];
+ FILE * file = try_fopen(s[S_PATH_OUT], "r", __func__);
+ try_fgets(test, 10 + 10 + 1 + 1, file, __func__);
+ try_fclose(file, __func__);
+ if (strcmp(test, world.server_test))
{
- struct MapObj * player = get_player();
- player->arg = atoi(&(msg[strlen(command_name)]));
- player->command = get_moa_id_by_name(command_name);
- turn_over();
- return 1;
+ 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);
}
- return 0;
}
-extern void obey_msg(char * msg, uint8_t do_record)
+static void turn_over()
{
- char * f_name = "obey_msg()";
- if ( apply_player_command(msg, "wait") /* TODO: Check for non-error */
- || apply_player_command(msg, "move") /* return value of a modified */
- || apply_player_command(msg, "pick_up")/* get_moa_id_by_name(); if id */
- || apply_player_command(msg, "drop") /* found, execute on it what's */
- || apply_player_command(msg, "use")); /* in apply_player_command(). */
- else
+ struct Thing * player = get_player();
+ struct Thing * thing = player;
+ uint16_t start_turn = world.turn;
+ while ( 0 < player->lifepoints
+ || (0 == player->lifepoints && start_turn == world.turn))
{
- char * seed_command = "seed";
- if (!strncmp(msg, seed_command, strlen(seed_command)))
+ if (!thing)
{
- remake_world(atoi(&(msg[strlen(seed_command)])));
+ world.turn++;
+ thing = world.things;
+ }
+ if (0 < thing->lifepoints)
+ {
+ if (0 == thing->command)
+ {
+ if (thing == player)
+ {
+ break;
+ }
+ ai(thing);
+ }
+ thing->progress++;
+ struct ThingAction * ta = get_thing_action(thing->command);
+ if (thing->progress == ta->effort)
+ {
+ ta->func(thing);
+ thing->command = 0;
+ thing->progress = 0;
+ }
}
+ thing = thing->next;
}
- if (do_record)
+}
+
+
+
+extern void record(char * msg, uint8_t force)
+{
+ static FILE * file_tmp = NULL;
+ static time_t save_wait = 0;
+ static char * path_tmp;
+ if (!file_tmp)
{
- char path_tmp[strlen(world.path_record) + strlen(world.tmp_suffix) + 1];
- sprintf(path_tmp, "%s%s", world.path_record, world.tmp_suffix);
- FILE * file_tmp = try_fopen(path_tmp, "w", f_name);
- if (!access(world.path_record, F_OK))
+ path_tmp = build_temp_path(s[S_PATH_RECORD]);
+ file_tmp = try_fopen(path_tmp, "w", __func__);
+ if (!access(s[S_PATH_RECORD], F_OK))
{
- FILE * file_read = try_fopen(world.path_record, "r", f_name);
- uint32_t linemax = textfile_sizes(file_read, NULL);
- char line[linemax + 1];
- while (try_fgets(line, linemax + 1, file_read, f_name))
+ FILE * file_read = try_fopen(s[S_PATH_RECORD], "r", __func__);
+ uint32_t linemax = textfile_width(file_read);
+ char * line = try_malloc(linemax + 1, __func__);
+ while (try_fgets(line, linemax + 1, file_read, __func__))
{
- try_fwrite(line, strlen(line), 1, file_tmp, f_name);
+ try_fwrite(line, strlen(line), 1, file_tmp, __func__);
}
- try_fclose(file_read, f_name);
+ free(line);
+ try_fclose(file_read, __func__);
}
- try_fwrite(msg, strlen(msg), 1, file_tmp, f_name);
- try_fputc('\n', file_tmp, f_name);
- try_fclose_unlink_rename(file_tmp, path_tmp, world.path_record, f_name);
+ }
+ if (msg)
+ {
+ try_fwrite(msg, strlen(msg), 1, file_tmp, __func__);
+ try_fputc('\n', file_tmp, __func__);
+ }
+ if (force || time(NULL) > save_wait + 15)
+ {
+ save_wait = time(NULL);
+ save_world();
+ atomic_write_finish(file_tmp, s[S_PATH_RECORD], path_tmp);
+ file_tmp = NULL;
}
}
+extern void obey_msg(char * msg, uint8_t do_record, uint8_t do_verbose)
+{
+ if (world.is_verbose && do_verbose)
+ {
+ exit_trouble(-1 == printf("Input: %s\n", msg), __func__, "printf");
+ }
+ set_err_line_options("Trouble with message: ", msg, 0);
+ char * msg_copy = strdup(msg);
+ char * tok0 = token_from_line(msg_copy);
+ if (tok0)
+ {
+
+ if (parse_command(tok0))
+ {
+ if (world.exists)
+ {
+ world.do_update = 1;
+ }
+ if (do_record)
+ {
+ record(msg, 0);
+ }
+ char * tokplus = token_from_line(NULL);
+ err_line(!(!tokplus), "Too many arguments, ignoring overflow.");
+ free(msg_copy);
+ return;
+ }
+ }
+ err_line(1, "Unknown command/argument or bad number of tokens.");
+ free(msg_copy);
+}
+
+
+
extern uint8_t io_loop()
{
- char * f_name = "io_loop()";
while (1)
{
char * msg = io_round();
- if (NULL == msg)
+ server_test();
+ if (!msg)
{
continue;
}
if (world.is_verbose)
{
- exit_trouble(-1 == printf("Input: %s\n", msg), f_name, "printf()");
+ exit_trouble(-1 == printf("Input: %s\n", msg), __func__, "printf");
}
if (!strcmp("QUIT", msg))
{
free(msg);
return 1;
}
+ if (!strcmp("PING", msg))
+ {
+ free(msg);
+ char * pong = "PONG\n";
+ try_fwrite(pong, strlen(pong), 1, world.file_out, __func__);
+ fflush(world.file_out);
+ continue;
+ }
if (world.replay)
{
free(msg);
return 0;
}
- obey_msg(msg, 1);
+ obey_msg(msg, 1, 0);
free(msg);
}
}