X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.h;h=7a801bf0a283235ebc72d50392d7fc99f87f4dc1;hp=299c7a03738b002e318ef4d7df2e8886cfe23fac;hb=6c1a9c2355dd0bb95f6f4aa618898f9764b7d145;hpb=084d1c6f817eacaaefa1de4f0637ef6c1405d74b diff --git a/server.h b/server.h index 299c7a03..7a801bf0 100644 --- a/server.h +++ b/server.h @@ -38,34 +38,35 @@ 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 = 10, + + 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_NR = 17, + + 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 { @@ -108,14 +109,7 @@ struct cmd_end_pdu { }; struct cmd_add_job_pdu { - uint8_t jobname[32]; - uint8_t ioengine[32]; - uint32_t iodepth; - uint32_t rw; - uint32_t min_bs[2]; - uint32_t max_bs[2]; - uint32_t numjobs; - uint32_t group_reporting; + struct thread_options_pack top; }; struct cmd_text_pdu {