server: cleanup iolog pdu prep

[fio.git] / server.c

diff --git a/server.c b/server.c
index 0323125ed6fda9f9f7a7819c3afee18075555a63..e9792027c6330659ce1aa4a8b4402452efa0836f 100644 (file)
--- a/server.c
+++ b/server.c
@@ -1556,7 +1556,7 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
        convert_gs(&p.rs, rs);
 
        dprint(FD_NET, "ts->ss_state = %d\n", ts->ss_state);
        convert_gs(&p.rs, rs);
 
        dprint(FD_NET, "ts->ss_state = %d\n", ts->ss_state);

-       if (ts->ss_state & __FIO_SS_DATA) {
+       if (ts->ss_state & FIO_SS_DATA) {

                dprint(FD_NET, "server sending steadystate ring buffers\n");
 
                ss_buf = malloc(sizeof(p) + 2*ts->ss_dur*sizeof(uint64_t));
                dprint(FD_NET, "server sending steadystate ring buffers\n");
 
                ss_buf = malloc(sizeof(p) + 2*ts->ss_dur*sizeof(uint64_t));


@@ -1928,16 +1928,16 @@ static int fio_append_text_log(struct sk_entry *first, struct io_log *log)
 
 int fio_send_iolog(struct thread_data *td, struct io_log *log, const char *name)
 {
 
 int fio_send_iolog(struct thread_data *td, struct io_log *log, const char *name)
 {

-       struct cmd_iolog_pdu pdu;
+       struct cmd_iolog_pdu pdu = {
+               .nr_samples             = cpu_to_le64(iolog_nr_samples(log)),
+               .thread_number          = cpu_to_le32(td->thread_number),
+               .log_type               = cpu_to_le32(log->log_type),
+               .log_hist_coarseness    = cpu_to_le32(log->hist_coarseness),
+       };

        struct sk_entry *first;
        struct flist_head *entry;
        int ret = 0;
 
        struct sk_entry *first;
        struct flist_head *entry;
        int ret = 0;
 

-       pdu.nr_samples = cpu_to_le64(iolog_nr_samples(log));
-       pdu.thread_number = cpu_to_le32(td->thread_number);
-       pdu.log_type = cpu_to_le32(log->log_type);
-       pdu.log_hist_coarseness = cpu_to_le32(log->hist_coarseness);
-

        if (!flist_empty(&log->chunk_list))
                pdu.compressed = __cpu_to_le32(STORE_COMPRESSED);
        else if (use_zlib)
        if (!flist_empty(&log->chunk_list))
                pdu.compressed = __cpu_to_le32(STORE_COMPRESSED);
        else if (use_zlib)