X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fio.c;h=995ffb56578ff02c3a61c2ab392f47d354ada16b;hb=bc7c3a7ee20d49d725c76d14705b9ef56c096c42;hp=527cda90457bf7cc7cf3f1b9bb5e37708b3d0ac3;hpb=cdd22bc79aafb8261af4785f58425d8535e57a5b;p=plomrogue diff --git a/src/client/io.c b/src/client/io.c index 527cda9..995ffb5 100644 --- a/src/client/io.c +++ b/src/client/io.c @@ -10,7 +10,7 @@ #include /* PIPE_BUF */ #include /* halfdelay(), getch() */ #include /* NULL */ -#include /* uint8_t, uint16_t, uint32_t */ +#include /* uint8_t, uint16_t, uint32_t, UINT32_MAX */ #include /* FILE, sprintf(), fseek(), fflush() */ #include /* strcmp(), strlen(), memcpy() */ #include /* free(), atoi() */ @@ -21,7 +21,9 @@ #include "../common/try_malloc.h" /* try_malloc() */ #include "../common/rexit.h" /* exit_trouble(), exit_err() */ #include "../common/readwrite.h" /* try_fopen(), try_fclose(), try_fgets(), - * try_fgetc(), textfile_width(), try_fputc() + * try_fgetc(), textfile_width(), try_fputc(), + * read_file_into_queue(), + * get_message_from_queue(), */ #include "control.h" /* try_key() */ #include "map.h" /* map_center() */ @@ -41,11 +43,6 @@ static void read_inventory(char * read_buf, uint32_t linemax, FILE * file); */ static void read_map_cells(FILE * file, char ** map); -/* Repeatedly use try_fgets() with given arguments to read the remaining lines - * of "file" into the world.log string. - */ -static void read_log(char * read_buf, uint32_t linemax, FILE * file); - /* Return value seen by atoi() in next line of "file" when passed to try_fgets() * with the given arguments. */ @@ -78,15 +75,16 @@ static FILE * changed_worldstate_file(char * path); */ static uint8_t read_worldstate(); -/* If "last_server_answer_time" is too old, send a PING to the server; or, if a - * previous PING has not sparked any answer after a while, abort the client. +/* Poll server for queue input. If no new input, send ping, or, if ping already + * sent but unanswered for some time, abort. */ -static void ping_pong_test(time_t last_server_answer_time); +static void test_and_poll_server(); -/* Update "last_server_answer_time" if new stuff has been written to the - * server's out file. - */ -static void server_activity_test(time_t * last_server_answer_time); +/* If "string", append \n-prefixed "append", else write "append" as "string". */ +static void nl_append_string(char * append, char ** string); + +/* Read messages from queue, act on them. */ +static uint8_t read_queue(); @@ -144,29 +142,6 @@ static void read_map_cells(FILE * file, char ** map) -static void read_log(char * read_buf, uint32_t linemax, FILE * file) -{ - free(world.log); - world.log = NULL; - while (try_fgets(read_buf, linemax + 1, file, __func__)) - { - int old_size = 0; - if (world.log) - { - old_size = strlen(world.log); - } - int new_size = strlen(read_buf); - char * new_log = try_malloc(old_size + new_size + 1, __func__); - memcpy(new_log, world.log, old_size); - int test = sprintf(new_log + old_size, "%s", read_buf); - exit_trouble(test < 0, __func__, "sprintf"); - free(world.log); - world.log = new_log; - } -} - - - static uint16_t read_value_from_line(char * read_buf, uint32_t linemax, FILE * file) { @@ -225,7 +200,6 @@ static uint8_t read_worldstate() world.map.length = read_value_from_line(read_buf, linemax, file); read_map_cells(file, &world.map.cells); read_map_cells(file, &world.mem_map); - read_log(read_buf, linemax, file); free(read_buf); try_fclose(file, __func__); return 1; @@ -233,9 +207,15 @@ static uint8_t read_worldstate() -static void ping_pong_test(time_t last_server_answer_time) +static void test_and_poll_server() { + static time_t last_server_answer_time = 0; static uint8_t ping_sent = 0; + if (read_file_into_queue(world.file_server_out, &world.queue)) + { + last_server_answer_time = time(0); + return; + } time_t now = time(0); if (ping_sent && last_server_answer_time > now - 3) /* Re-set if last */ { /* ping was answered */ @@ -253,19 +233,72 @@ static void ping_pong_test(time_t last_server_answer_time) -static void server_activity_test(time_t * last_server_answer_time) +static void nl_append_string(char * append, char ** string) { - int test = try_fgetc(world.file_server_out, __func__); - if (EOF == test) + char * err = "too large sizes"; + exit_trouble(UINT32_MAX < strlen(append), __func__, err); + uint32_t new_size = strlen(append); + uint32_t old_size = 0; + uint8_t add_nl = 0; + if (*string) { - return; + exit_trouble(UINT32_MAX < new_size + strlen(*string), __func__, err); + old_size = strlen(*string); + add_nl = 1; } - do + char * new_string = try_malloc(old_size + add_nl + new_size + 1, __func__); + memcpy(new_string, *string, old_size); + char * pattern = add_nl ? "\n%s" : "%s"; + int test = sprintf(new_string + old_size, pattern, append); + exit_trouble(test < 0, __func__, "sprintf"); + free(*string); + *string = new_string; +} + + + +static uint8_t read_queue() +{ + static uint8_t things_below_player_parsing = 0; + uint8_t ret = 0; + char * msg; + while (NULL != (msg = get_message_from_queue(&world.queue))) { - ; + char * log_prefix = "LOG "; + if (!strcmp(msg, "THINGS_BELOW_PLAYER START")) + { + ret = 1; + things_below_player_parsing = 1; + free(world.things_below_player); + world.things_below_player = NULL; + } + else if (!strcmp(msg, "THINGS_BELOW_PLAYER END")) + { + things_below_player_parsing = 0; + } + else if (things_below_player_parsing) + { + ret = 1; + nl_append_string(msg, &world.things_below_player); + } + else if (!strncmp(msg, log_prefix, strlen(log_prefix))) + { + ret = 1; + nl_append_string(msg + strlen(log_prefix), &world.log); + } + else if (!strcmp(msg, "NEW_WORLD")) + { + ret = 1; + free(world.log); + world.log = NULL; + } + else if (!strcmp(msg, "WORLD_UPDATED")) + { + send("STACK"); + } + free(msg); } - while (EOF != (test = try_fgetc(world.file_server_out, __func__))); - * last_server_answer_time = time(0); + return ret; } @@ -284,22 +317,20 @@ extern void send(char * msg) extern char * io_loop() { - world.halfdelay = 1; /* Ensures read_worldstate() is only called */ - halfdelay(world.halfdelay); /* 10 times a second during user inactivity. */ + world.halfdelay = 1; /* Ensure server is polled only 10 times */ + halfdelay(world.halfdelay); /* a second during user inactivity. */ uint8_t change_in_client = 0; uint16_t last_focused_turn = world.turn; - time_t last_server_answer_time = time(0); while (1) { - server_activity_test(&last_server_answer_time); - ping_pong_test(last_server_answer_time); + test_and_poll_server(); if (world.winch) { reset_windows_on_winch(); world.winch = 0; change_in_client++; } - if (change_in_client || read_worldstate()) + if (change_in_client || read_worldstate() || read_queue()) { if (world.turn != last_focused_turn && world.focus_each_turn) {