Merge branch 'master' into gfio

Conflicts:
	client.c
	eta.c
	server.c
	server.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --cc client.c
index 685472e20c7c6c8156441b5ab2a44e07e5ae63f8,7c9910961e7dee6685cd473b5d2193c0cd8a0391..c1e516d5288d7453798d1cd8d217280d5d637bd7
--- 1/client.c
--- 2/client.c
+++ b/client.c
@@@ -845,10 -725,10 +845,11 @@@ static void convert_jobs_eta(struct job
  
        je->elapsed_sec         = le64_to_cpu(je->elapsed_sec);
        je->eta_sec             = le64_to_cpu(je->eta_sec);
 +      je->nr_threads          = le32_to_cpu(je->nr_threads);
+       je->is_pow2             = le32_to_cpu(je->is_pow2);
  }
  
 -static void sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je)
 +void fio_client_sum_jobs_eta(struct jobs_eta *dst, struct jobs_eta *je)
  {
        int i;
  

diff --cc eta.c
index a068e1e9cf770cc4fc4b8754fc1f52c9759878b5,911459501d342c004f95d8a696cd2e08e0e3f8bc..34afe0ca4cb89c35c0e895c487bf9228bba60b56
--- 1/eta.c
--- 2/eta.c
+++ b/eta.c
@@@ -374,11 -375,11 +378,11 @@@ void display_thread_status(struct jobs_
        }
  
        p += sprintf(p, "Jobs: %d (f=%d)", je->nr_running, je->files_open);
 -      if (je->m_rate || je->t_rate) {
 +      if (je->m_rate[0] || je->m_rate[1] || je->t_rate[0] || je->t_rate[1]) {
                char *tr, *mr;
  
-               mr = num2str(je->m_rate[0] + je->m_rate[1], 4, 0, i2p);
-               tr = num2str(je->t_rate[0] + je->t_rate[1], 4, 0, i2p);
 -              mr = num2str(je->m_rate, 4, 0, je->is_pow2);
 -              tr = num2str(je->t_rate, 4, 0, je->is_pow2);
++              mr = num2str(je->m_rate[0] + je->m_rate[1], 4, 0, je->is_pow2);
++              tr = num2str(je->t_rate[0] + je->t_rate[1], 4, 0, je->is_pow2);
                p += sprintf(p, ", CR=%s/%s KB/s", tr, mr);
                free(tr);
                free(mr);

diff --cc fio.1
Simple merge

diff --cc server.c
index 456c88c8ab376a5d6af42f7d5e9b9d91863604cf,72def7e003ee938a1c41f3d4a7e31d14b4ce3ce3..27356c67d70f742110a0932a9fbb35486179e352
--- 1/server.c
--- 2/server.c
+++ b/server.c
@@@ -670,9 -451,9 +670,10 @@@ static int handle_send_eta_cmd(struct f
  
        je->elapsed_sec         = cpu_to_le64(je->elapsed_sec);
        je->eta_sec             = cpu_to_le64(je->eta_sec);
 +      je->nr_threads          = cpu_to_le32(je->nr_threads);
+       je->is_pow2             = cpu_to_le32(je->is_pow2);
  
 -      fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, cmd->tag);
 +      fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, &tag, NULL);
        free(je);
        return 0;
  }

diff --cc server.h
index b7ae7ee8c5f0720004be0309bbf1bd486b5234c4,6d5a83d505234eeabd8656d0da452c32dab2f0d1..a838126fff0f97e1847907308e914f5d9b3dc80b
--- 1/server.h
--- 2/server.h
+++ b/server.h
@@@ -38,39 -36,33 +38,39 @@@ struct fio_net_cmd_reply 
  };
  
  enum {
-       FIO_SERVER_VER                  = 16,
 -      FIO_SERVER_VER          = 8,
 -
 -      FIO_SERVER_MAX_PDU      = 1024,
 -
 -      FIO_NET_CMD_QUIT        = 1,
 -      FIO_NET_CMD_EXIT        = 2,
 -      FIO_NET_CMD_JOB         = 3,
 -      FIO_NET_CMD_JOBLINE     = 4,
 -      FIO_NET_CMD_TEXT        = 5,
 -      FIO_NET_CMD_TS          = 6,
 -      FIO_NET_CMD_GS          = 7,
 -      FIO_NET_CMD_SEND_ETA    = 8,
 -      FIO_NET_CMD_ETA         = 9,
 -      FIO_NET_CMD_PROBE       = 10,
 -      FIO_NET_CMD_START       = 11,
 -      FIO_NET_CMD_STOP        = 12,
 -      FIO_NET_CMD_DU          = 13,
 -      FIO_NET_CMD_RUN         = 14,
 -      FIO_NET_CMD_NR          = 15,
 -
 -      FIO_NET_CMD_F_MORE      = 1UL << 0,
++      FIO_SERVER_VER                  = 17,
 +
 +      FIO_SERVER_MAX_FRAGMENT_PDU     = 1024,
 +
 +      FIO_NET_CMD_QUIT                = 1,
 +      FIO_NET_CMD_EXIT                = 2,
 +      FIO_NET_CMD_JOB                 = 3,
 +      FIO_NET_CMD_JOBLINE             = 4,
 +      FIO_NET_CMD_TEXT                = 5,
 +      FIO_NET_CMD_TS                  = 6,
 +      FIO_NET_CMD_GS                  = 7,
 +      FIO_NET_CMD_SEND_ETA            = 8,
 +      FIO_NET_CMD_ETA                 = 9,
 +      FIO_NET_CMD_PROBE               = 10,
 +      FIO_NET_CMD_START               = 11,
 +      FIO_NET_CMD_STOP                = 12,
 +      FIO_NET_CMD_DU                  = 13,
 +      FIO_NET_CMD_SERVER_START        = 14,
 +      FIO_NET_CMD_ADD_JOB             = 15,
 +      FIO_NET_CMD_RUN                 = 16,
 +      FIO_NET_CMD_IOLOG               = 17,
 +      FIO_NET_CMD_UPDATE_JOB          = 18,
 +      FIO_NET_CMD_NR                  = 19,
 +
 +      FIO_NET_CMD_F_MORE              = 1UL << 0,
  
        /* crc does not include the crc fields */
 -      FIO_NET_CMD_CRC_SZ      = sizeof(struct fio_net_cmd) -
 -                                      2 * sizeof(uint16_t),
 +      FIO_NET_CMD_CRC_SZ              = sizeof(struct fio_net_cmd) -
 +                                              2 * sizeof(uint16_t),
 +
 +      FIO_NET_NAME_MAX                = 256,
  
 -      FIO_NET_CLIENT_TIMEOUT  = 5000,
 +      FIO_NET_CLIENT_TIMEOUT          = 5000,
  };
  
  struct cmd_ts_pdu {

diff --cc stat.h
Simple merge