X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fio.c;h=d0b9dc022b303f1e61de8a12d64e140c2273c8af;hb=04ae91b82c603f0928d94a94df3a322a7af8b971;hp=4623b3d89bbe4e6aa1912c24b8acdec649637b34;hpb=316a56901b2249264b72992fd5aa63ce16fd3304;p=plomrogue diff --git a/src/client/io.c b/src/client/io.c index 4623b3d..d0b9dc0 100644 --- a/src/client/io.c +++ b/src/client/io.c @@ -1,25 +1,25 @@ /* src/client/io.c */ +#define _POSIX_C_SOURCE 1 /* PIPE_BUF */ #include "io.h" -#include /* global errno */ -#include /* open() */ #include /* PIPE_BUF */ #include /* halfdelay(), getch() */ #include /* NULL */ #include /* uint8_t, uint16_t, uint32_t */ -#include /* FILE, sprintf(), fseek() */ +#include /* FILE, sprintf(), fseek(), fflush() */ #include /* strcmp(), strlen(), memcpy() */ #include /* free(), atoi() */ #include /* stat() */ -#include /* access(), write() */ +#include /* time_t */ +#include /* time() */ +#include /* access() */ #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() + * try_fgetc(), textfile_width(), try_fputc() */ #include "control.h" /* try_key() */ -#include "map_window.h" /* map_center() */ -#include "misc.h" /* reset_windows() */ +#include "map.h" /* map_center() */ #include "windows.h" /* reset_windows_on_winch(), draw_all_wins() */ #include "world.h" /* world global */ @@ -31,7 +31,7 @@ static void read_inventory(char * read_buf, uint32_t linemax, FILE * file); /* Read the next characters in "file" into world.map.cells. In detail: Read - * world.map.size.y times world.map.size.x characters, followed by one ignored + * world.map.length times world.map.length characters, followed by one ignored * character (that we assume is a newline). */ static void read_map_cells(FILE * file); @@ -47,8 +47,8 @@ static void read_log(char * read_buf, uint32_t linemax, FILE * file); static uint16_t read_value_from_line(char * read_buf, uint32_t linemax, FILE * file); -/* If the server's out file has changed since the last read_world(), return a - * pointer to its file descriptor; else, return NULL. +/* If the server's worldstate file has changed since the last read_world(), + * 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 * modification time in seconds via stat() is compared against world.last_update @@ -61,28 +61,38 @@ static uint16_t read_value_from_line(char * read_buf, uint32_t linemax, * the new world also starts in turn 1, not signifying any world change to the * turn check. The stat() check detects this change with at most 1 second delay. */ -static FILE * changed_server_out_file(char * path); +static FILE * changed_worldstate_file(char * path); -/* Attempt to read the server's out file as representation of the game world in - * a hard-coded serialization format. Returns 1 on success and 0 if the out file - * wasn't read for supposedly not having changed since a last read_world() call. +/* 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 + * out file wasn't read for supposedly not having changed since a last + * read_world() call. * - * Note that the first successful read_world() triggers map_center(), so that on - * start the client focuses the map window on the player. + * map_center() is triggered by either, the first successful read_world() (thus + * on client start), or on turn 1 (thus on world start). */ static uint8_t read_world(); +/* 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); + +/* 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); + static void read_inventory(char * read_buf, uint32_t linemax, FILE * file) { - char * f_name = "read_inventory()"; char * delimiter = "%\n"; free(world.player_inventory); world.player_inventory = NULL; /* Avoids illegal strlen() below. */ while (1) { - try_fgets(read_buf, linemax + 1, file, f_name); + try_fgets(read_buf, linemax + 1, file, __func__); if (!(strcmp(read_buf, delimiter))) { break; @@ -93,9 +103,10 @@ static void read_inventory(char * read_buf, uint32_t linemax, FILE * file) old_size = strlen(world.player_inventory); } int new_size = strlen(read_buf); - char * new_inventory = try_malloc(old_size + new_size + 1, f_name); + char * new_inventory = try_malloc(old_size + new_size + 1, __func__); memcpy(new_inventory, world.player_inventory, old_size); - sprintf(new_inventory + old_size, "%s", read_buf); + int test = sprintf(new_inventory + old_size, "%s", read_buf); + exit_trouble(test < 0, __func__, "sprintf"); free(world.player_inventory); world.player_inventory = new_inventory; } @@ -107,18 +118,17 @@ static void read_inventory(char * read_buf, uint32_t linemax, FILE * file) static void read_map_cells(FILE * file) { - char * f_name = "read_map_cells()"; free(world.map.cells); - world.map.cells = try_malloc(world.map.size.y * world.map.size.x, f_name); + world.map.cells = try_malloc(world.map.length * world.map.length, __func__); uint16_t y, x; - for (y = 0; y < world.map.size.y; y++) + for (y = 0; y < world.map.length; y++) { - for (x = 0; x < world.map.size.x; x++) + for (x = 0; x < world.map.length; x++) { - char c = try_fgetc(file, f_name); - world.map.cells[(y * world.map.size.x) + x] = c; + char c = try_fgetc(file, __func__); + world.map.cells[(y * world.map.length) + x] = c; } - try_fgetc(file, f_name); + try_fgetc(file, __func__); } } @@ -126,10 +136,9 @@ static void read_map_cells(FILE * file) static void read_log(char * read_buf, uint32_t linemax, FILE * file) { - char * f_name = "read_log()"; free(world.log); world.log = NULL; - while (try_fgets(read_buf, linemax + 1, file, f_name)) + while (try_fgets(read_buf, linemax + 1, file, __func__)) { int old_size = 0; if (NULL != world.log) @@ -137,9 +146,10 @@ static void read_log(char * read_buf, uint32_t linemax, FILE * file) old_size = strlen(world.log); } int new_size = strlen(read_buf); - char * new_log = try_malloc(old_size + new_size + 1, f_name); + char * new_log = try_malloc(old_size + new_size + 1, __func__); memcpy(new_log, world.log, old_size); - sprintf(new_log + old_size, "%s", read_buf); + int test = sprintf(new_log + old_size, "%s", read_buf); + exit_trouble(test < 0, __func__, "sprintf"); free(world.log); world.log = new_log; } @@ -150,32 +160,30 @@ static void read_log(char * read_buf, uint32_t linemax, FILE * file) static uint16_t read_value_from_line(char * read_buf, uint32_t linemax, FILE * file) { - char * f_name = "read_value_from_line()"; - try_fgets(read_buf, linemax + 1, file, f_name); + try_fgets(read_buf, linemax + 1, file, __func__); return atoi(read_buf); } -static FILE * changed_server_out_file(char * path) +static FILE * changed_worldstate_file(char * path) { - char * f_name = "changed_server_out_file()"; struct stat stat_buf; - exit_trouble(stat(path, &stat_buf), f_name, "stat()"); + exit_trouble(stat(path, &stat_buf), __func__, "stat"); if (stat_buf.st_mtime != world.last_update) { world.last_update = stat_buf.st_mtime; - return try_fopen(path, "r", f_name); + return try_fopen(path, "r", __func__); } - FILE * file = try_fopen(path, "r", f_name); + FILE * file = try_fopen(path, "r", __func__); char turn_string[6]; - try_fgets(turn_string, 6, file, f_name); + try_fgets(turn_string, 6, file, __func__); if (world.turn == atoi(turn_string)) { - try_fclose(file, f_name); + try_fclose(file, __func__); return NULL; } - exit_trouble(fseek(file, 0, SEEK_SET), f_name, "fseek()"); + exit_trouble(fseek(file, 0, SEEK_SET), __func__, "fseek"); return file; } @@ -183,71 +191,81 @@ static FILE * changed_server_out_file(char * path) static uint8_t read_world() { - char * f_name = "read_world()"; - char * path = "server/out"; - char * quit_msg = "No server out file found to read. Server may be down."; + char * path = "server/worldstate"; + char * quit_msg = "No worldstate file found to read. Server may be down."; static uint8_t first_read = 1; exit_err(access(path, F_OK), quit_msg); - FILE * file = changed_server_out_file(path); + FILE * file = changed_worldstate_file(path); if (!file) { return 0; } - uint32_t linemax = textfile_sizes(file, NULL); - char * read_buf = try_malloc(linemax + 1, f_name); + uint32_t linemax = textfile_width(file); + char * read_buf = try_malloc(linemax + 1, __func__); world.turn = read_value_from_line(read_buf, linemax, file); - world.score = read_value_from_line(read_buf, linemax, file); world.player_lifepoints = read_value_from_line(read_buf, linemax, file); read_inventory(read_buf, linemax, file); world.player_pos.y = read_value_from_line(read_buf, linemax, file); world.player_pos.x = read_value_from_line(read_buf, linemax, file); - if (first_read) + if (1 == world.turn || first_read) { map_center(); first_read = 0; } - world.map.size.y = read_value_from_line(read_buf, linemax, file); - world.map.size.x = read_value_from_line(read_buf, linemax, file); + world.map.length = read_value_from_line(read_buf, linemax, file); read_map_cells(file); read_log(read_buf, linemax, file); free(read_buf); - try_fclose(file, f_name); + try_fclose(file, __func__); return 1; } -extern void try_send(char * msg) +static void test_ping_pong(time_t last_server_answer_time) { - char * f_name = "try_send()"; - uint32_t msg_size = strlen(msg) + 1; - char * err = "try_send() tries to send message larger than PIPE_BUF bytes."; - exit_err(msg_size > PIPE_BUF, err); - int fd_out; - uint16_t j = 1; - while (0 != j) + static uint8_t ping_sent = 0; + time_t now = time(0); + if (ping_sent && last_server_answer_time > now - 3) { - fd_out = open(world.path_server_in, O_WRONLY | O_NONBLOCK); - if (fd_out > 0) - { - break; - } - exit_err(-1 == fd_out && ENXIO != errno, "Server fifo not found."); - j++; + ping_sent = 0; } - exit_err(0 == j, "Failed to open server fifo for writing."); - j = 1; - while (0 != j) + if (!ping_sent && last_server_answer_time < now - 3) { - int test = write(fd_out, msg, msg_size); - if (test > 0) - { - break; - } - j++; + send("PING"); + ping_sent = 1; + return; + } + exit_err(last_server_answer_time < now - 6, "Server not answering."); +} + + + +static void test_server_activity(time_t * last_server_answer_time) +{ + int test = try_fgetc(world.file_server_out, __func__); + if (EOF == test) + { + return; } - exit_err(0 == j, "Failed to write to server fifo."); - exit_trouble(-1 == close(fd_out), f_name, "close()"); + do + { + ; + } + while (EOF != (test = try_fgetc(world.file_server_out, __func__))); + * last_server_answer_time = time(0); +} + + + +extern void send(char * msg) +{ + uint32_t msg_size = strlen(msg) + 1; + char * err = "send() tries 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__); + fflush(world.file_server_in); } @@ -257,16 +275,25 @@ extern char * io_loop() world.halfdelay = 1; /* Ensures read_world() is only called 10 */ halfdelay(world.halfdelay); /* 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); if (world.winch) { reset_windows_on_winch(); world.winch = 0; change_in_client++; } - if (read_world() || change_in_client) + if (change_in_client || read_world()) { + if (world.turn != last_focused_turn && world.focus_each_turn) + { + last_focused_turn = world.turn; + map_center(); + } draw_all_wins(); } change_in_client = 0; @@ -280,6 +307,6 @@ extern char * io_loop() } } } - try_send("QUIT"); + send("QUIT"); return "Sent QUIT to server."; }