Fix warnings about unused fwrite() return value

[fio.git] / client.c

diff --git a/client.c b/client.c
index 12c2c37732c3321c2a08c2e573a4b9c2c79cd12f..01f64086ae6bbc4f1fc8bf154fef1064008e27f5 100644 (file)
--- a/client.c
+++ b/client.c
@@ -8,10 +8,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include <sys/mman.h>
+#include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
+#include <signal.h>
 
 #include "fio.h"
 #include "server.h"
@@ -75,7 +76,7 @@ static struct fio_client *find_client_by_name(const char *name)
 
 static void remove_client(struct fio_client *client)
 {
-       dprint(FD_NET, "removed client <%s>\n", client->hostname);
+       dprint(FD_NET, "client: removed <%s>\n", client->hostname);
        flist_del(&client->list);
        nr_clients--;
 
@@ -89,9 +90,12 @@ static void remove_client(struct fio_client *client)
 static void __fio_client_add_cmd_option(struct fio_client *client,
                                        const char *opt)
 {
-       client->argc++;
+       int index;
+
+       index = client->argc++;
        client->argv = realloc(client->argv, sizeof(char *) * client->argc);
-       client->argv[client->argc - 1] = strdup(opt);
+       client->argv[index] = strdup(opt);
+       dprint(FD_NET, "client: add cmd %d: %s\n", index, opt);
 }
 
 void fio_client_add_cmd_option(const char *hostname, const char *opt)
@@ -114,7 +118,7 @@ void fio_client_add(const char *hostname)
 {
        struct fio_client *client;
 
-       dprint(FD_NET, "added client <%s>\n", hostname);
+       dprint(FD_NET, "client: added  <%s>\n", hostname);
        client = malloc(sizeof(*client));
        memset(client, 0, sizeof(*client));
 
@@ -131,7 +135,7 @@ static int fio_client_connect(struct fio_client *client)
 {
        int fd;
 
-       dprint(FD_NET, "connect to host %s\n", client->hostname);
+       dprint(FD_NET, "client: connect to host %s\n", client->hostname);
 
        memset(&client->addr, 0, sizeof(client->addr));
        client->addr.sin_family = AF_INET;
@@ -171,6 +175,8 @@ void fio_clients_terminate(void)
        struct flist_head *entry;
        struct fio_client *client;
 
+       dprint(FD_NET, "client: terminate clients\n");
+
        flist_for_each(entry, &client_list) {
                client = flist_entry(entry, struct fio_client, list);
 
@@ -180,6 +186,7 @@ void fio_clients_terminate(void)
 
 static void sig_int(int sig)
 {
+       dprint(FD_NET, "client: got sign %d\n", sig);
        fio_clients_terminate();
 }
 
@@ -200,6 +207,8 @@ static void client_signal_handler(void)
 
 static void probe_client(struct fio_client *client)
 {
+       dprint(FD_NET, "client: send probe\n");
+
        fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_PROBE, 0);
        handle_client(client, 1);
 }
@@ -209,6 +218,8 @@ static int send_client_cmd_line(struct fio_client *client)
        struct cmd_line_pdu *pdu;
        int i, ret;
 
+       dprint(FD_NET, "client: send cmdline %d\n", client->argc);
+
        pdu = malloc(sizeof(*pdu));
        for (i = 0; i < client->argc; i++)
                strcpy((char *) pdu->argv[i], client->argv[i]);
@@ -225,6 +236,8 @@ int fio_clients_connect(void)
        struct flist_head *entry, *tmp;
        int ret;
 
+       dprint(FD_NET, "client: connect all\n");
+
        client_signal_handler();
 
        flist_for_each_safe(entry, tmp, &client_list) {
@@ -317,9 +330,12 @@ static void convert_io_stat(struct io_stat *dst, struct io_stat *src)
        dst->max_val    = le64_to_cpu(src->max_val);
        dst->min_val    = le64_to_cpu(src->min_val);
        dst->samples    = le64_to_cpu(src->samples);
-       /* FIXME */
-       dst->mean       = __le64_to_cpu(src->mean);
-       dst->S          = __le64_to_cpu(src->S);
+
+       /*
+        * Floats arrive as IEEE 754 encoded uint64_t, convert back to double
+        */
+       dst->mean.u.f   = fio_uint64_to_double(le64_to_cpu(dst->mean.u.i));
+       dst->S.u.f      = fio_uint64_to_double(le64_to_cpu(dst->S.u.i));
 }
 
 static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
@@ -344,7 +360,13 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
        dst->minf               = le64_to_cpu(src->minf);
        dst->majf               = le64_to_cpu(src->majf);
        dst->clat_percentiles   = le64_to_cpu(src->clat_percentiles);
-       dst->percentile_list    = NULL;
+
+       for (i = 0; i < FIO_IO_U_LIST_MAX_LEN; i++) {
+               fio_fp64_t *fps = &src->percentile_list[i];
+               fio_fp64_t *fpd = &dst->percentile_list[i];
+
+               fpd->u.f = fio_uint64_to_double(le64_to_cpu(fps->u.i));
+       }
 
        for (i = 0; i < FIO_IO_U_MAP_NR; i++) {
                dst->io_u_map[i]        = le32_to_cpu(src->io_u_map[i]);
@@ -445,8 +467,9 @@ static void handle_probe(struct fio_net_cmd *cmd)
 {
        struct cmd_probe_pdu *probe = (struct cmd_probe_pdu *) cmd->payload;
 
-       log_info("Probe: hostname=%s, fio ver %u.%u.%u\n", probe->hostname,
-                       probe->fio_major, probe->fio_minor, probe->fio_patch);
+       log_info("Probe: hostname=%s, be=%u, fio ver %u.%u.%u\n",
+               probe->hostname, probe->bigendian, probe->fio_major,
+               probe->fio_minor, probe->fio_patch);
 }
 
 static int handle_client(struct fio_client *client, int one)
@@ -454,6 +477,8 @@ static int handle_client(struct fio_client *client, int one)
        struct fio_net_cmd *cmd;
        int done = 0;
 
+       dprint(FD_NET, "client: handle %s\n", client->hostname);
+
        while ((cmd = fio_net_recv_cmd(client->fd, 1)) != NULL) {
                dprint(FD_NET, "%s: got cmd op %d\n", client->hostname,
                                                        cmd->opcode);
@@ -466,10 +491,11 @@ static int handle_client(struct fio_client *client, int one)
                        break;
                case FIO_NET_CMD_TEXT: {
                        const char *buf = (const char *) cmd->payload;
+                       int fio_unused ret;
 
                        if (!client->skip_newline)
                                fprintf(f_out, "Client <%s>: ", client->hostname);
-                       fwrite(buf, cmd->pdu_len, 1, f_out);
+                       ret = fwrite(buf, cmd->pdu_len, 1, f_out);
                        fflush(f_out);
                        client->skip_newline = strchr(buf, '\n') == NULL;
                        free(cmd);