server: rename CMD_RUN to CMD_SERVER_START

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

diff --git a/client.c b/client.c
index 3adddc02f3777d462662b755b298bc50c871d16c..a77dc9350e0d1d57ffcc2c7f065204b3f9b5b254 100644 (file)
--- a/client.c
+++ b/client.c
@@ -949,7 +949,7 @@ int fio_handle_client(struct fio_client *client)
                ops->probe(client, cmd);
                free(cmd);
                break;
-       case FIO_NET_CMD_RUN:
+       case FIO_NET_CMD_SERVER_START:
                client->state = Client_running;
                free(cmd);
                break;

diff --git a/server.c b/server.c
index b048a6c7002d0a9a39f5d77facf4d132d9d087c9..dfbe3377de92d520ed25a278f41318e27578b52f 100644 (file)
--- a/server.c
+++ b/server.c
@@ -566,7 +566,7 @@ static int handle_connection(int sk, int block)
 void fio_server_idle_loop(void)
 {
        if (!first_cmd_check) {
-               fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_RUN, 0, NULL);
+               fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_SERVER_START, 0, NULL);
                first_cmd_check = 1;
        }
        if (server_fd != -1)

diff --git a/server.h b/server.h
index f8ba81a838feaab32e16ed20bfcba5982fcb61ee..bc044e9b4772eff159f34225f8019889b9c8a04c 100644 (file)
--- a/server.h
+++ b/server.h
@@ -38,34 +38,34 @@ struct fio_net_int_cmd {
 };
 
 enum {
-       FIO_SERVER_VER          = 9,
-
-       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_ADD_JOB     = 15,
-       FIO_NET_CMD_NR          = 16,
-
-       FIO_NET_CMD_F_MORE      = 1UL << 0,
+       FIO_SERVER_VER                  = 9,
+
+       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_SERVER_START        = 14,
+       FIO_NET_CMD_ADD_JOB             = 15,
+       FIO_NET_CMD_NR                  = 16,
+
+       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_CLIENT_TIMEOUT  = 5000,
+       FIO_NET_CLIENT_TIMEOUT          = 5000,
 };
 
 struct cmd_ts_pdu {