X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=src%2Fclient%2Fio.c;h=299df7fae354f564dd1f3d8df060d84cf829345b;hb=2b2a1e0169b3a863fd87b679d789a4e2b789eb67;hp=ec724786a4b1b87bf607f33b08d3556b273a46cd;hpb=28b8b4234e395c3fdc4800e5cfb3dcd70a15cadf;p=plomrogue
diff --git a/src/client/io.c b/src/client/io.c
index ec72478..299df7f 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,18 +43,13 @@ 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.
*/
static uint16_t read_value_from_line(char * read_buf, uint32_t linemax,
FILE * file);
-/* If the server's worldstate file has changed since the last read_world(),
+/* If the server's worldstate file has changed since the last read_worldstate(),
* return a pointer to its file descriptor; else, return NULL.
*
* Two tests are performed to check for a file change. The file's last data
@@ -69,24 +66,27 @@ static uint16_t read_value_from_line(char * read_buf, uint32_t linemax,
static FILE * changed_worldstate_file(char * path);
/* Attempt to read the server's worldstate file as representation of the game
- * world in a hard-coded serialization format. Returns 1 on success and 0 if the
+ * world in a hard-coded serialization format. Returns 1 on success, or 0 if the
* out file wasn't read for supposedly not having changed since a last
- * read_world() call.
+ * read_worldstate() call.
*
- * map_center() is triggered by either, the first successful read_world() (thus
- * on client start), or on turn 1 (thus on world start).
+ * map_center() is triggered by either, the first successful read_worldstate()
+ * (thus on client start), or on turn 1 (thus on world start).
*/
-static uint8_t read_world();
+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.
*/
-static void test_ping_pong(time_t last_server_answer_time);
+static void ping_pong_test(time_t last_server_answer_time);
-/* Update "last_server_answer_time" if new stuff has been written to the
- * server's out file.
+/* Read server's out file into queue, update "last_server_answer_time" if new
+ * stuff is found there.
*/
-static void test_server_activity(time_t * last_server_answer_time);
+static void try_growing_queue(time_t * last_server_answer_time);
+
+/* Read server out file for messages, act on them (i.e. derive log messages). */
+static uint8_t read_outfile();
@@ -144,29 +144,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)
{
@@ -199,7 +176,7 @@ static FILE * changed_worldstate_file(char * path)
-static uint8_t read_world()
+static uint8_t read_worldstate()
{
char * path = "server/worldstate";
char * quit_msg = "No worldstate file found to read. Server may be down.";
@@ -225,7 +202,6 @@ static uint8_t read_world()
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,13 +209,14 @@ static uint8_t read_world()
-static void test_ping_pong(time_t last_server_answer_time)
+static void ping_pong_test(time_t last_server_answer_time)
{
static uint8_t ping_sent = 0;
time_t now = time(0);
- if (ping_sent && last_server_answer_time > now - 3)
- {
- ping_sent = 0;
+ if (ping_sent && last_server_answer_time > now - 3) /* Re-set if last */
+ { /* ping was answered */
+ ping_sent = 0; /* with server */
+ return; /* activity. */
}
if (!ping_sent && last_server_answer_time < now - 3)
{
@@ -252,19 +229,44 @@ static void test_ping_pong(time_t last_server_answer_time)
-static void test_server_activity(time_t * last_server_answer_time)
+static void try_growing_queue(time_t * last_server_answer_time)
{
- int test = try_fgetc(world.file_server_out, __func__);
- if (EOF == test)
+ if (read_file_into_queue(world.file_server_out, &world.queue,
+ &world.queue_size))
{
- return;
+ * last_server_answer_time = time(0);
}
- do
+}
+
+
+
+static uint8_t read_outfile()
+{
+ uint8_t ret = 0;
+ char * msg;
+ while (NULL != (msg=get_message_from_queue(&world.queue,&world.queue_size)))
{
- ;
+ 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;
}
@@ -272,7 +274,7 @@ static void test_server_activity(time_t * last_server_answer_time)
extern void send(char * msg)
{
uint32_t msg_size = strlen(msg) + 1;
- char * err = "send() tries to send message larger than PIPE_BUF bytes.";
+ char * err = "send() tried to send message larger than PIPE_BUF bytes.";
exit_err(msg_size > PIPE_BUF, err);
try_fwrite(msg, strlen(msg), 1, world.file_server_in, __func__);
try_fputc('\n', world.file_server_in, __func__);
@@ -283,22 +285,22 @@ extern void send(char * msg)
extern char * io_loop()
{
- world.halfdelay = 1; /* Ensures read_world() is only called 10 */
- halfdelay(world.halfdelay); /* times a second during user inactivity. */
+ world.halfdelay = 1; /* Ensures read_worldstate() is only called */
+ halfdelay(world.halfdelay); /* 10 times 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);
+ try_growing_queue(&last_server_answer_time);
+ ping_pong_test(last_server_answer_time);
if (world.winch)
{
reset_windows_on_winch();
world.winch = 0;
change_in_client++;
}
- if (change_in_client || read_world())
+ if (change_in_client || read_worldstate() || read_outfile())
{
if (world.turn != last_focused_turn && world.focus_each_turn)
{