X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Fio.c;h=f6d6928a2f9e4b9ff1dfeb89f58049c31877427c;hb=fa0c416ccad4c4278813909ca1b799cd0600840c;hp=bc9d8773feab3b68cb9c4705aa20a80afb9bbac9;hpb=483f25751ae49c810456faf0bb7a375bc437df10;p=plomrogue
diff --git a/src/server/io.c b/src/server/io.c
index bc9d877..f6d6928 100644
--- a/src/server/io.c
+++ b/src/server/io.c
@@ -6,12 +6,12 @@
#include /* PIPE_BUF */
#include /* size_t, NULL */
#include /* uint8_t, uint16_t, uint32_t */
-#include /* defines EOF, FILE, sprintf() */
+#include /* defines EOF, FILE, sprintf(), fprintf() */
#include /* free() */
-#include /* strlen(), memcpy(), memset() */
+#include /* strlen(), memcpy(), memset(), strchr() */
#include /* time_t */
#include /* time(), nanosleep() */
-#include "../common/readwrite.h" /* try_fopen(), try_fclose_unlink_rename(),
+#include "../common/readwrite.h" /* atomic_write_start(), atomic_write_finish(),
* try_fwrite(), try_fputc(), try_fgetc()
*/
#include "../common/rexit.h" /* exit_trouble() */
@@ -19,14 +19,16 @@
#include "cleanup.h" /* set_cleanup_flag() */
#include "field_of_view.h" /* VISIBLE */
#include "hardcoded_strings.h" /* s */
-#include "map.h" /* yx_to_map_pos() */
-#include "things.h" /* Thing, ThingType, get_thing_type(), get_player() */
+#include "things.h" /* Thing, ThingType, ThingAction, get_thing_type(),
+ * get_player()
+ */
#include "world.h" /* global world */
/* Write to "file" god commands (one per line) to recreate thing "t". */
static void write_key_value(FILE * file, char * key, uint32_t value);
+static void write_key_string(FILE * file, char * key, char * string);
/* Write to "file" \n-delimited line of "key" + space + "value" as string. */
static void write_thing(FILE * file, struct Thing * t);
@@ -68,46 +70,62 @@ static void write_map(struct Thing * player, FILE * file);
static void write_key_value(FILE * file, char * key, uint32_t value)
{
- char * f_name = "write_key_value()";
- try_fwrite(key, strlen(key), 1, file, f_name);
- try_fputc(' ', file, f_name);
- char * line = try_malloc(11, f_name);
- exit_trouble(-1 == sprintf(line, "%u", value), f_name, "sprintf()");
- try_fwrite(line, strlen(line), 1, file, f_name);
+ try_fwrite(key, strlen(key), 1, file, __func__);
+ try_fputc(' ', file, __func__);
+ char * line = try_malloc(11, __func__);
+ exit_trouble(-1 == sprintf(line, "%u", value), __func__, s[S_FCN_SPRINTF]);
+ try_fwrite(line, strlen(line), 1, file, __func__);
free(line);
- try_fputc('\n', file, f_name);
+ try_fputc('\n', file, __func__);
+}
+
+
+
+static void write_key_string(FILE * file, char * key, char * string)
+{
+ try_fwrite(key, strlen(key), 1, file, __func__);
+ try_fputc(' ', file, __func__);
+ uint8_t contains_space = NULL != strchr(string, ' ');
+ if (contains_space)
+ {
+ try_fputc('\'', file, __func__);
+ }
+ try_fwrite(string, strlen(string), 1, file, __func__);
+ if (contains_space)
+ {
+ try_fputc('\'', file, __func__);
+ }
+ try_fputc('\n', file, __func__);
}
static void write_thing(FILE * file, struct Thing * t)
{
- char * f_name = "write_thing()";
struct Thing * o;
for (o = t->owns; o; o = o->next)
{
write_thing(file, o);
}
- write_key_value(file, s[CMD_THING], t->id);
- write_key_value(file, s[CMD_TYPE], t->type);
- write_key_value(file, s[CMD_POS_Y], t->pos.y);
- write_key_value(file, s[CMD_POS_X], t->pos.x);
- write_key_value(file, s[CMD_COMMAND], t->command);
- write_key_value(file, s[CMD_ARGUMENT], t->arg);
- write_key_value(file, s[CMD_PROGRESS], t->progress);
- write_key_value(file, s[CMD_LIFEPOINTS], t->lifepoints);
+ write_key_value(file, s[S_CMD_T_ID], t->id);
+ write_key_value(file, s[S_CMD_T_TYPE], t->type);
+ write_key_value(file, s[S_CMD_T_POSY], t->pos.y);
+ write_key_value(file, s[S_CMD_T_POSX], t->pos.x);
+ write_key_value(file, s[S_CMD_T_COMMAND], t->command);
+ write_key_value(file, s[S_CMD_T_ARGUMENT], t->arg);
+ write_key_value(file, s[S_CMD_T_PROGRESS], t->progress);
+ write_key_value(file, s[S_CMD_T_HP], t->lifepoints);
for (o = t->owns; o; o = o->next)
{
- write_key_value(file, s[CMD_CARRIES], o->id);
+ write_key_value(file, s[S_CMD_T_CARRIES], o->id);
}
- try_fputc('\n', file, f_name);
+ try_fputc('\n', file, __func__);
}
static char * get_message_from_queue()
{
- char * f_name = "get_message_from_queue()";
char * message = NULL;
if (world.queue_size)
{
@@ -115,7 +133,7 @@ static char * get_message_from_queue()
if (0 < cutout_len)
{
cutout_len++;
- message = try_malloc(cutout_len, f_name);
+ message = try_malloc(cutout_len, __func__);
memcpy(message, world.queue, cutout_len);
}
for (;
@@ -129,7 +147,7 @@ static char * get_message_from_queue()
} /* un-allocated first. */
else
{
- char * new_queue = try_malloc(world.queue_size, f_name);
+ char * new_queue = try_malloc(world.queue_size, __func__);
memcpy(new_queue, &(world.queue[cutout_len]), world.queue_size);
free(world.queue);
world.queue = new_queue;
@@ -142,14 +160,13 @@ static char * get_message_from_queue()
static void read_file_into_queue()
{
- char * f_name = "read_file_into_queue()";
uint8_t wait_seconds = 5;
time_t now = time(0);
struct timespec dur;
dur.tv_sec = 0;
dur.tv_nsec = 33333333;
int test;
- while (EOF == (test = try_fgetc(world.file_in, f_name)))
+ while (EOF == (test = try_fgetc(world.file_in, __func__)))
{
nanosleep(&dur, NULL);
if (time(0) > now + wait_seconds)
@@ -164,7 +181,7 @@ static void read_file_into_queue()
{
c = '\0';
}
- char * new_queue = try_malloc(world.queue_size + 1, f_name);
+ char * new_queue = try_malloc(world.queue_size + 1, __func__);
memcpy(new_queue, world.queue, world.queue_size);
char * new_pos = new_queue + world.queue_size;
* new_pos = c;
@@ -172,18 +189,15 @@ static void read_file_into_queue()
free(world.queue);
world.queue = new_queue;
}
- while (EOF != (test = try_fgetc(world.file_in, f_name)));
+ while (EOF != (test = try_fgetc(world.file_in, __func__)));
}
static void update_worldstate_file()
{
- char * f_name = "update_worldstate_file()";
- uint16_t size = strlen(s[PATH_WORLDSTATE]) + strlen(s[PATH_SUFFIX_TMP]) + 1;
- char * path_tmp = try_malloc(size, f_name);
- sprintf(path_tmp, "%s%s", s[PATH_WORLDSTATE], s[PATH_SUFFIX_TMP]);
- FILE * file = try_fopen(path_tmp, "w", f_name);
+ char * path_tmp;
+ FILE * file = atomic_write_start(s[S_PATH_WORLDSTATE], &path_tmp);
struct Thing * player = get_player();
write_value_as_line(world.turn, file);
write_value_as_line(player->lifepoints, file);
@@ -194,13 +208,12 @@ static void update_worldstate_file()
write_map(player, file);
if (world.log)
{
- try_fwrite(world.log, strlen(world.log), 1, file, f_name);
+ try_fwrite(world.log, strlen(world.log), 1, file, __func__);
}
- try_fclose_unlink_rename(file, path_tmp, s[PATH_WORLDSTATE], f_name);
- free(path_tmp);
+ atomic_write_finish(file, s[S_PATH_WORLDSTATE], path_tmp);
set_cleanup_flag(CLEANUP_WORLDSTATE);
- char * dot = ".\n";;
- try_fwrite(dot, strlen(dot), 1, world.file_out, f_name);
+ char * dot = ".\n";
+ try_fwrite(dot, strlen(dot), 1, world.file_out, __func__);
fflush(world.file_out);
}
@@ -208,22 +221,20 @@ static void update_worldstate_file()
static void write_value_as_line(uint32_t value, FILE * file)
{
- char * f_name = "write_value_as_line()";
char write_buf[12]; /* Holds 10 digits of uint32_t maximum + \n + \0. */
- sprintf(write_buf, "%u\n", value);
- try_fwrite(write_buf, strlen(write_buf), 1, file, f_name);
+ exit_trouble(sprintf(write_buf,"%u\n",value) < 0,__func__,s[S_FCN_SPRINTF]);
+ try_fwrite(write_buf, strlen(write_buf), 1, file, __func__);
}
static void write_inventory(struct Thing * player, FILE * file)
{
- char * f_name = "write_inventory()";
struct Thing * owned = player->owns;
if (NULL == owned)
{
char * empty = "(none)\n";
- try_fwrite(empty, strlen(empty), 1, file, f_name);
+ try_fwrite(empty, strlen(empty), 1, file, __func__);
}
else
{
@@ -231,22 +242,21 @@ static void write_inventory(struct Thing * player, FILE * file)
for (q = 0; NULL != owned; q++)
{
struct ThingType * tt = get_thing_type(owned->type);
- try_fwrite(tt->name, strlen(tt->name), 1, file, f_name);
- try_fputc('\n', file, f_name);
+ try_fwrite(tt->name, strlen(tt->name), 1, file, __func__);
+ try_fputc('\n', file, __func__);
owned = owned->next;
}
}
- try_fputc('%', file, f_name);
- try_fputc('\n', file, f_name);
+ try_fputc('%', file, __func__);
+ try_fputc('\n', file, __func__);
}
static char * build_visible_map(struct Thing * player)
{
- char * f_name = "build_visible_map()";
uint32_t map_size = world.map.length * world.map.length;
- char * visible_map = try_malloc(map_size, f_name);
+ char * visible_map = try_malloc(map_size, __func__);
memset(visible_map, ' ', map_size);
if (player->fov_map) /* May fail if player thing was created / positioned */
{ /* by god command after turning off FOV building. */
@@ -266,13 +276,14 @@ static char * build_visible_map(struct Thing * player)
{
for (t = world.things; t != 0; t = t->next)
{
- if ( player->fov_map[yx_to_map_pos(&t->pos)] & VISIBLE
+ if ( ( player->fov_map[t->pos.y * world.map.length +t->pos.x]
+ & VISIBLE)
&& ( (0 == i && 0 == t->lifepoints)
|| (1 == i && 0 < t->lifepoints)))
{
tt = get_thing_type(t->type);
c = tt->char_on_map;
- visible_map[yx_to_map_pos(&t->pos)] = c;
+ visible_map[t->pos.y * world.map.length + t->pos.x] = c;
}
}
}
@@ -284,16 +295,15 @@ static char * build_visible_map(struct Thing * player)
static void write_map(struct Thing * player, FILE * file)
{
- char * f_name = "write_map()";
char * visible_map = build_visible_map(player);
uint16_t x, y;
for (y = 0; y < world.map.length; y++)
{
for (x = 0; x < world.map.length; x++)
{
- try_fputc(visible_map[(y * world.map.length) + x], file, f_name);
+ try_fputc(visible_map[(y * world.map.length) + x], file, __func__);
}
- try_fputc('\n', file, f_name);
+ try_fputc('\n', file, __func__);
}
free(visible_map);
}
@@ -302,20 +312,19 @@ static void write_map(struct Thing * player, FILE * file)
extern char * io_round()
{
- char * f_name = "io_round()";
if (0 < world.queue_size)
{
return get_message_from_queue();
}
- if (world.turn != world.last_update_turn)
+ if (world.do_update)
{
update_worldstate_file();
- world.last_update_turn = world.turn;
+ world.do_update = 0;
}
read_file_into_queue();
if (world.queue_size && '\0' != world.queue[world.queue_size - 1])
{
- char * new_queue = try_malloc(world.queue_size + 1, f_name);
+ char * new_queue = try_malloc(world.queue_size + 1, __func__);
memcpy(new_queue, world.queue, world.queue_size);
new_queue[world.queue_size] = '\0';
world.queue_size++;
@@ -329,20 +338,46 @@ extern char * io_round()
extern void save_world()
{
- char * f_name = "save_world()";
- char * path = s[PATH_SAVE];
- FILE * file = try_fopen(path, "w", f_name);
- write_key_value(file, s[CMD_DO_FOV], 0);
- try_fputc('\n', file, f_name);
- write_key_value(file, s[CMD_SEED_MAP], world.seed_map);
- write_key_value(file, s[CMD_SEED_RAND], world.seed);
- write_key_value(file, s[CMD_TURN], world.turn);
- try_fputc('\n', file, f_name);
+ char * path_tmp;
+ FILE * file = atomic_write_start(s[S_PATH_SAVE], &path_tmp);
+ write_key_value(file, s[S_CMD_MAPLENGTH], world.map.length);
+ write_key_value(file, s[S_CMD_PLAYTYPE], world.player_type);
+ try_fputc('\n', file, __func__);
+ struct ThingAction * ta;
+ for (ta = world.thing_actions; ta; ta = ta->next)
+ {
+ write_key_value(file, s[S_CMD_TA_ID], ta->id);
+ write_key_value(file, s[S_CMD_TA_EFFORT], ta->effort);
+ write_key_string(file, s[S_CMD_TA_NAME], ta->name);
+ try_fputc('\n', file, __func__);
+ }
+ struct ThingType * tt;
+ for (tt = world.thing_types; tt; tt = tt->next)
+ {
+ write_key_value(file, s[S_CMD_TT_ID], tt->id);
+ write_key_value(file, s[S_CMD_TT_STARTN], tt->start_n);
+ write_key_value(file, s[S_CMD_TT_HP], tt->lifepoints);
+ int test = fprintf(file, "%s %c\n", s[S_CMD_TT_SYMB], tt->char_on_map);
+ exit_trouble(test < 0, __func__, "fprintf");
+ write_key_string(file, s[S_CMD_TT_NAME], tt->name);
+ write_key_value(file, s[S_CMD_TT_CONSUM], tt->consumable);
+ try_fputc('\n', file, __func__);
+ }
+ for (tt = world.thing_types; tt; tt = tt->next)
+ {
+ write_key_value(file, s[S_CMD_TT_ID], tt->id);
+ write_key_value(file, s[S_CMD_TT_CORPS], tt->corpse_id);
+ }
+ try_fputc('\n', file, __func__);
+ write_key_value(file, s[S_CMD_SEED_MAP], world.seed_map);
+ write_key_value(file, s[S_CMD_SEED_RAND], world.seed);
+ write_key_value(file, s[S_CMD_TURN], world.turn);
+ try_fputc('\n', file, __func__);
struct Thing * t;
for (t = world.things; t; t = t->next)
{
write_thing(file, t);
}
- write_key_value(file, s[CMD_DO_FOV], 1);
- try_fclose(file, f_name);
+ write_key_value(file, s[S_CMD_WORLD_ACTIVE], 1);
+ atomic_write_finish(file, s[S_PATH_SAVE], path_tmp);
}