From 337d75a81c40aef6d693fc0d18e78b0c2444a1be Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Sat, 1 Oct 2011 12:36:32 -0600 Subject: [PATCH] server: exit gracefully on ctrl-c Signed-off-by: Jens Axboe --- init.c | 5 +++-- server.c | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/init.c b/init.c index 1dcb4904..623d4a12 100644 --- a/init.c +++ b/init.c @@ -1385,11 +1385,12 @@ int parse_options(int argc, char *argv[]) if (nr_clients) { if (fio_clients_send_ini(ini_file[i])) return 1; - } else { + free(ini_file[i]); + } else if (!is_backend) { if (parse_jobs_ini(ini_file[i], 0, i)) return 1; + free(ini_file[i]); } - free(ini_file[i]); } free(ini_file); diff --git a/server.c b/server.c index 38698bc3..ca37e3f6 100644 --- a/server.c +++ b/server.c @@ -409,7 +409,10 @@ int fio_server(void) int fio_server_text_output(const char *buf, unsigned int len) { - return fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, buf, len); + if (server_fd != -1) + return fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, buf, len); + + return 0; } int fio_server_log(const char *format, ...) -- 2.25.1