server: add missing IOLOG command to text list
[fio.git] / server.c
index 89422e96781dae80cd0fad5ec2ed473691820376..9110707656ad3e2ca4f8166521b9d407efe57551 100644 (file)
--- a/server.c
+++ b/server.c
@@ -16,6 +16,7 @@
 #include <netdb.h>
 #include <syslog.h>
 #include <signal.h>
+#include <zlib.h>
 
 #include "fio.h"
 #include "server.h"
@@ -54,6 +55,7 @@ static const char *fio_server_ops[FIO_NET_CMD_NR] = {
        "SERVER_START",
        "ADD_JOB",
        "CMD_RUN"
+       "CMD_IOLOG",
 };
 
 const char *fio_server_op(unsigned int op)
@@ -67,19 +69,40 @@ const char *fio_server_op(unsigned int op)
        return buf;
 }
 
-int fio_send_data(int sk, const void *p, unsigned int len)
+static ssize_t iov_total_len(const struct iovec *iov, int count)
 {
-       assert(len <= sizeof(struct fio_net_cmd) + FIO_SERVER_MAX_FRAGMENT_PDU);
+       ssize_t ret = 0;
 
-       do {
-               int ret = send(sk, p, len, 0);
+       while (count--) {
+               ret += iov->iov_len;
+               iov++;
+       }
+
+       return ret;
+}
+
+static int fio_sendv_data(int sk, struct iovec *iov, int count)
+{
+       ssize_t total_len = iov_total_len(iov, count);
+       ssize_t ret;
 
+       do {
+               ret = writev(sk, iov, count);
                if (ret > 0) {
-                       len -= ret;
-                       if (!len)
+                       total_len -= ret;
+                       if (!total_len)
                                break;
-                       p += ret;
-                       continue;
+
+                       while (ret) {
+                               if (ret >= iov->iov_len) {
+                                       ret -= iov->iov_len;
+                                       iov++;
+                                       continue;
+                               }
+                               iov->iov_base += ret;
+                               iov->iov_len -= ret;
+                               ret = 0;
+                       }
                } else if (!ret)
                        break;
                else if (errno == EAGAIN || errno == EINTR)
@@ -88,7 +111,7 @@ int fio_send_data(int sk, const void *p, unsigned int len)
                        break;
        } while (!exit_backend);
 
-       if (!len)
+       if (!total_len)
                return 0;
 
        if (errno)
@@ -97,6 +120,15 @@ int fio_send_data(int sk, const void *p, unsigned int len)
        return 1;
 }
 
+int fio_send_data(int sk, const void *p, unsigned int len)
+{
+       struct iovec iov = { .iov_base = (void *) p, .iov_len = len };
+
+       assert(len <= sizeof(struct fio_net_cmd) + FIO_SERVER_MAX_FRAGMENT_PDU);
+
+       return fio_sendv_data(sk, &iov, 1);
+}
+
 int fio_recv_data(int sk, void *p, unsigned int len)
 {
        do {
@@ -248,15 +280,19 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk)
        return cmdret;
 }
 
-void fio_net_cmd_crc(struct fio_net_cmd *cmd)
+void fio_net_cmd_crc_pdu(struct fio_net_cmd *cmd, const void *pdu)
 {
        uint32_t pdu_len;
 
        cmd->cmd_crc16 = __cpu_to_le16(fio_crc16(cmd, FIO_NET_CMD_CRC_SZ));
 
        pdu_len = le32_to_cpu(cmd->pdu_len);
-       if (pdu_len)
-               cmd->pdu_crc16 = __cpu_to_le16(fio_crc16(cmd->payload, pdu_len));
+       cmd->pdu_crc16 = __cpu_to_le16(fio_crc16(pdu, pdu_len));
+}
+
+void fio_net_cmd_crc(struct fio_net_cmd *cmd)
+{
+       fio_net_cmd_crc_pdu(cmd, cmd->payload);
 }
 
 int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size,
@@ -846,10 +882,108 @@ void fio_server_send_du(void)
        }
 }
 
+/*
+ * Send a command with a separate PDU, not inlined in the command
+ */
+static int fio_send_cmd_ext_pdu(int sk, uint16_t opcode, const void *buf,
+                               off_t size, uint64_t tag, uint32_t flags)
+{
+       struct fio_net_cmd cmd;
+       struct iovec iov[2];
+
+       iov[0].iov_base = &cmd;
+       iov[0].iov_len = sizeof(cmd);
+       iov[1].iov_base = (void *) buf;
+       iov[1].iov_len = size;
+
+       __fio_init_net_cmd(&cmd, opcode, size, tag);
+       cmd.flags = __cpu_to_le32(flags);
+       fio_net_cmd_crc_pdu(&cmd, buf);
+
+       return fio_sendv_data(server_fd, iov, 2);
+}
+
+int fio_send_iolog(struct thread_data *td, struct io_log *log, const char *name)
+{
+       struct cmd_iolog_pdu pdu;
+       z_stream stream;
+       void *out_pdu;
+       int i, ret = 0;
+
+       pdu.nr_samples = __cpu_to_le32(log->nr_samples);
+       pdu.log_type = cpu_to_le32(log->log_type);
+       strcpy((char *) pdu.name, name);
+
+       for (i = 0; i < log->nr_samples; i++) {
+               struct io_sample *s = &log->log[i];
+
+               s->time = cpu_to_le64(s->time);
+               s->val  = cpu_to_le64(s->val);
+               s->ddir = cpu_to_le32(s->ddir);
+               s->bs   = cpu_to_le32(s->bs);
+       }
+
+       /*
+        * Dirty - since the log is potentially huge, compress it into
+        * FIO_SERVER_MAX_FRAGMENT_PDU chunks and let the receiving
+        * side defragment it.
+        */
+       out_pdu = malloc(FIO_SERVER_MAX_FRAGMENT_PDU);
+
+       stream.zalloc = Z_NULL;
+       stream.zfree = Z_NULL;
+       stream.opaque = Z_NULL;
+
+       if (deflateInit(&stream, Z_DEFAULT_COMPRESSION) != Z_OK) {
+               ret = 1;
+               goto err;
+       }
+
+       /*
+        * Send header first, it's not compressed.
+        */
+       ret = fio_send_cmd_ext_pdu(server_fd, FIO_NET_CMD_IOLOG, &pdu,
+                                       sizeof(pdu), 0, FIO_NET_CMD_F_MORE);
+       if (ret)
+               goto err_zlib;
+
+       stream.next_in = (void *) log->log;
+       stream.avail_in = log->nr_samples * sizeof(struct io_sample);
+
+       do {
+               unsigned int this_len, flags = 0;
+               int ret;
+
+               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)
+                       goto err_zlib;
+
+               this_len = FIO_SERVER_MAX_FRAGMENT_PDU - stream.avail_out;
+
+               if (stream.avail_in)
+                       flags = FIO_NET_CMD_F_MORE;
+
+               ret = fio_send_cmd_ext_pdu(server_fd, FIO_NET_CMD_IOLOG,
+                                          out_pdu, this_len, 0, flags);
+               if (ret)
+                       goto err_zlib;
+       } while (stream.avail_in);
+
+err_zlib:
+       deflateEnd(&stream);
+err:
+       free(out_pdu);
+       return ret;
+}
+
 void fio_server_send_add_job(struct thread_options *o, const char *ioengine)
 {
        struct cmd_add_job_pdu pdu;
 
+       memset(&pdu, 0, sizeof(pdu));
        convert_thread_options_to_net(&pdu.top, o);
 
        fio_net_send_cmd(server_fd, FIO_NET_CMD_ADD_JOB, &pdu, sizeof(pdu), 0);