X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fio.c;h=233a60c78043bd8e6c7de7e54c0e98eed511bcdf;hb=31aad69cad9823763b416c13811d472a14d25375;hp=26e4fe4330082d719079e44696ed45f2db755fff;hpb=4aacb1d1011030e10044e2a54c68453bac14938a;p=plomrogue
diff --git a/src/client/io.c b/src/client/io.c
index 26e4fe4..233a60c 100644
--- a/src/client/io.c
+++ b/src/client/io.c
@@ -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,13 @@ 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 test_ping_pong(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 test_server_activity(time_t * last_server_answer_time);
+/* Read queue, act on them (as of right now only: derive log messages). */
+static uint8_t read_queue();
@@ -144,29 +139,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 +197,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 +204,15 @@ static uint8_t read_worldstate()
-static void test_ping_pong(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 +230,33 @@ static void test_ping_pong(time_t last_server_answer_time)
-static void test_server_activity(time_t * last_server_answer_time)
+static uint8_t read_queue()
{
- int test = try_fgetc(world.file_server_out, __func__);
- if (EOF == test)
- {
- return;
- }
- do
+ uint8_t ret = 0;
+ char * msg;
+ while (NULL != (msg = get_message_from_queue(&world.queue)))
{
- ;
+ char * log_prefix = "LOG ";
+ if (!strncmp(msg, log_prefix, strlen(log_prefix)))
+ {
+ ret = 1;
+ char * log_msg = msg + strlen(log_prefix);
+ int old_size = 0;
+ if (world.log)
+ {
+ old_size = strlen(world.log);
+ }
+ int new_size = strlen(log_msg);
+ char * new_log = try_malloc(old_size + 1 + new_size + 1, __func__);
+ memcpy(new_log, world.log, old_size);
+ int test = sprintf(new_log + old_size, "\n%s", log_msg);
+ exit_trouble(test < 0, __func__, "sprintf");
+ free(world.log);
+ world.log = new_log;
+ }
+ free(msg);
}
- while (EOF != (test = try_fgetc(world.file_server_out, __func__)));
- * last_server_answer_time = time(0);
+ return ret;
}
@@ -284,22 +275,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)
{
- test_server_activity(&last_server_answer_time);
- test_ping_pong(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)
{