server: silence mem debug warning

[fio.git] / server.c

diff --git a/server.c b/server.c
index d0ff25a31a898b243aa3a043ccc64264929331ee..74f5e6ad8ff36e53713deafbe1eb6272d26f99a1 100644 (file)
--- a/server.c
+++ b/server.c
@@ -128,6 +128,8 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk)
                do {
                        ret = poll(&pfd, 1, 100);
                        if (ret < 0) {
+                               if (errno == EINTR)
+                                       break;
                                log_err("fio: poll: %s\n", strerror(errno));
                                break;
                        } else if (!ret)
@@ -370,12 +372,8 @@ again:
 
        server_fd = sk;
 
-       printf("handle\n");
-
        exitval = handle_connection(sk);
 
-       printf("out, exit %d\n", exitval);
-
        server_fd = -1;
        close(sk);
 
@@ -482,6 +480,8 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
        struct cmd_ts_pdu p;
        int i, j;
 
+       memset(&p, 0, sizeof(p));
+
        strcpy(p.ts.name, ts->name);
        strcpy(p.ts.verror, ts->verror);
        strcpy(p.ts.description, ts->description);
@@ -523,10 +523,10 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
 
        for (i = 0; i < 3; i++) {
                p.ts.total_io_u[i]      = cpu_to_le64(ts->total_io_u[i]);
-               p.ts.short_io_u[i]      = cpu_to_le64(ts->total_io_u[i]);
+               p.ts.short_io_u[i]      = cpu_to_le64(ts->short_io_u[i]);
        }
 
-       p.ts.total_submit               = cpu_to_le64(ts->total_submit);
+       p.ts.total_submit       = cpu_to_le64(ts->total_submit);
        p.ts.total_complete     = cpu_to_le64(ts->total_complete);
 
        for (i = 0; i < 2; i++) {