steadystate: make test script work better under Windows

[fio.git] / server.c

diff --git a/server.c b/server.c
index d36c5113a9bc8789bfb589892e097b7a3af9f71e..780f09f4ac8d7fb69da798968bd43368ece23b86 100644 (file)
--- a/server.c
+++ b/server.c
@@ -114,6 +114,7 @@ static const char *fio_server_ops[FIO_NET_CMD_NR] = {
        "LOAD_FILE",
        "VTRIGGER",
        "SENDFILE",
+       "JOB_OPT",
 };
 
 static void sk_lock(struct sk_out *sk_out)
@@ -1457,6 +1458,8 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
 {
        struct cmd_ts_pdu p;
        int i, j;
+       void *ss_buf;
+       uint64_t *ss_iops, *ss_bw;
 
        dprint(FD_NET, "server sending end stats\n");
 
@@ -1540,9 +1543,37 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
        for (i = 0; i < p.ts.nr_block_infos; i++)
                p.ts.block_infos[i] = le32_to_cpu(ts->block_infos[i]);
 
+       p.ts.ss_dur             = cpu_to_le64(ts->ss_dur);
+       p.ts.ss_state           = cpu_to_le32(ts->ss_state);
+       p.ts.ss_head            = cpu_to_le32(ts->ss_head);
+       p.ts.ss_limit.u.i       = cpu_to_le64(fio_double_to_uint64(ts->ss_limit.u.f));
+       p.ts.ss_slope.u.i       = cpu_to_le64(fio_double_to_uint64(ts->ss_slope.u.f));
+       p.ts.ss_deviation.u.i   = cpu_to_le64(fio_double_to_uint64(ts->ss_deviation.u.f));
+       p.ts.ss_criterion.u.i   = cpu_to_le64(fio_double_to_uint64(ts->ss_criterion.u.f));
+
        convert_gs(&p.rs, rs);
 
-       fio_net_queue_cmd(FIO_NET_CMD_TS, &p, sizeof(p), NULL, SK_F_COPY);
+       dprint(FD_NET, "ts->ss_state = %d\n", ts->ss_state);
+       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));
+
+               memcpy(ss_buf, &p, sizeof(p));
+
+               ss_iops = (uint64_t *) ((struct cmd_ts_pdu *)ss_buf + 1);
+               ss_bw = ss_iops + (int) ts->ss_dur;
+               for (i = 0; i < ts->ss_dur; i++) {
+                       ss_iops[i] = cpu_to_le64(ts->ss_iops_data[i]);
+                       ss_bw[i] = cpu_to_le64(ts->ss_bw_data[i]);
+               }
+
+               fio_net_queue_cmd(FIO_NET_CMD_TS, ss_buf, sizeof(p) + 2*ts->ss_dur*sizeof(uint64_t), NULL, SK_F_COPY);
+
+               free(ss_buf);
+       }
+       else
+               fio_net_queue_cmd(FIO_NET_CMD_TS, &p, sizeof(p), NULL, SK_F_COPY);
 }
 
 void fio_server_send_gs(struct group_run_stats *rs)
@@ -1656,7 +1687,7 @@ void fio_server_send_du(void)
 static int __fio_append_iolog_gz(struct sk_entry *first, struct io_log *log,
                                 struct io_logs *cur_log, z_stream *stream)
 {
-       struct sk_entry *entry;
+       unsigned int this_len;
        void *out_pdu;
        int ret;
 
@@ -1664,7 +1695,7 @@ static int __fio_append_iolog_gz(struct sk_entry *first, struct io_log *log,
        stream->avail_in = cur_log->nr_samples * log_entry_sz(log);
 
        do {
-               unsigned int this_len;
+               struct sk_entry *entry;
 
                /*
                 * Dirty - since the log is potentially huge, compress it into
@@ -1675,7 +1706,7 @@ static int __fio_append_iolog_gz(struct sk_entry *first, struct io_log *log,
 
                stream->avail_out = FIO_SERVER_MAX_FRAGMENT_PDU;
                stream->next_out = out_pdu;
-               ret = deflate(stream, Z_FINISH);
+               ret = deflate(stream, Z_BLOCK);
                /* may be Z_OK, or Z_STREAM_END */
                if (ret < 0) {
                        free(out_pdu);
@@ -1716,8 +1747,36 @@ static int fio_append_iolog_gz(struct sk_entry *first, struct io_log *log)
                        break;
        }
 
-       deflateEnd(&stream);
-       return ret;
+       ret = deflate(&stream, Z_FINISH);
+
+       while (ret != Z_STREAM_END) {
+               struct sk_entry *entry;
+               unsigned int this_len;
+               void *out_pdu;
+
+               out_pdu = malloc(FIO_SERVER_MAX_FRAGMENT_PDU);
+               stream.avail_out = FIO_SERVER_MAX_FRAGMENT_PDU;
+               stream.next_out = out_pdu;
+
+               ret = deflate(&stream, Z_FINISH);
+               /* may be Z_OK, or Z_STREAM_END */
+               if (ret < 0) {
+                       free(out_pdu);
+                       break;
+               }
+
+               this_len = FIO_SERVER_MAX_FRAGMENT_PDU - stream.avail_out;
+
+               entry = fio_net_prep_cmd(FIO_NET_CMD_IOLOG, out_pdu, this_len,
+                                        NULL, SK_F_VEC | SK_F_INLINE | SK_F_FREE);
+               flist_add_tail(&entry->list, &first->next);
+       } while (ret != Z_STREAM_END);
+
+       ret = deflateEnd(&stream);
+       if (ret == Z_OK)
+               return 0;
+
+       return 1;
 }
 #else
 static int fio_append_iolog_gz(struct sk_entry *first, struct io_log *log)