X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.h;h=da1167167749b4041de47b8598b20e0bd4346b7d;hp=d66782d532a6124c8364afec6e66ad29da584f44;hb=df07130a05d53b6a40b6783384600e10641d76d2;hpb=82fa6b21d98da1341a54f415e43940213b39f18b diff --git a/server.h b/server.h index d66782d5..da116716 100644 --- a/server.h +++ b/server.h @@ -3,7 +3,12 @@ #include #include -#include +#include +#include + +#include "stat.h" +#include "os/os.h" +#include "diskutil.h" /* * On-wire encoding is little endian @@ -12,69 +17,133 @@ struct fio_net_cmd { uint16_t version; /* protocol version */ uint16_t opcode; /* command opcode */ uint32_t flags; /* modifier flags */ - uint64_t serial; /* serial number */ - uint32_t pad; + uint64_t tag; /* passed back on reply */ uint32_t pdu_len; /* length of post-cmd layload */ - uint32_t cmd_crc32; /* cmd checksum */ - uint32_t pdu_crc32; /* payload checksum */ - uint8_t payload[0]; /* payload */ + /* + * These must be immediately before the payload, anything before + * these fields are checksummed. + */ + uint16_t cmd_crc16; /* cmd checksum */ + uint16_t pdu_crc16; /* payload checksum */ + uint8_t payload[]; /* payload */ +}; + +struct fio_net_int_cmd { + struct flist_head list; + struct timeval tv; + uint64_t saved_tag; + struct fio_net_cmd cmd; }; enum { - FIO_SERVER_VER = 1, - FIO_SERVER_VER1 = 1, + FIO_SERVER_VER = 11, - FIO_SERVER_MAX_PDU = 4096, + FIO_SERVER_MAX_PDU = 1024, FIO_NET_CMD_QUIT = 1, - FIO_NET_CMD_JOB = 2, - FIO_NET_CMD_JOB_END = 3, - FIO_NET_CMD_ACK = 4, - FIO_NET_CMD_NAK = 5, - FIO_NET_CMD_TEXT = 6, + 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, + + /* crc does not include the crc fields */ + FIO_NET_CMD_CRC_SZ = sizeof(struct fio_net_cmd) - + 2 * sizeof(uint16_t), + + FIO_NET_CLIENT_TIMEOUT = 5000, +}; + +struct cmd_ts_pdu { + struct thread_stat ts; + struct group_run_stats rs; +}; + +struct cmd_du_pdu { + struct disk_util_stat dus; + struct disk_util_agg agg; +}; + +struct cmd_probe_pdu { + uint8_t hostname[64]; + uint8_t bigendian; + uint8_t fio_version[32]; + uint8_t os; + uint8_t arch; + uint8_t bpp; }; -extern int fio_server(void); -extern int fio_server_text_output(const char *, unsigned int len); +struct cmd_single_line_pdu { + uint16_t len; + uint8_t text[]; +}; + +struct cmd_line_pdu { + uint16_t lines; + struct cmd_single_line_pdu options[]; +}; + +struct cmd_start_pdu { + uint32_t jobs; + uint32_t stat_outputs; +}; + +struct cmd_end_pdu { + uint32_t error; +}; + +extern int fio_start_server(char *); +extern int fio_server_text_output(const char *, size_t); extern int fio_server_log(const char *format, ...); +extern int fio_net_send_cmd(int, uint16_t, const void *, off_t, uint64_t); +extern int fio_net_send_simple_cmd(int, uint16_t, uint64_t, struct flist_head *); +extern void fio_server_set_arg(const char *); +extern int fio_server_parse_string(const char *, char **, int *, int *, struct in_addr *, struct in6_addr *, int *); +extern const char *fio_server_op(unsigned int); +extern void fio_server_got_signal(int); + +struct thread_stat; +struct group_run_stats; +extern void fio_server_send_ts(struct thread_stat *, struct group_run_stats *); +extern void fio_server_send_gs(struct group_run_stats *); +extern void fio_server_send_du(void); +extern void fio_server_idle_loop(void); -extern int fio_client_connect(const char *); -extern int fio_client_send_ini(const char *); +extern int fio_clients_connect(void); +extern int fio_clients_send_ini(const char *); extern int fio_handle_clients(void); +extern int fio_client_add(const char *, void **); +extern void fio_client_add_cmd_option(void *, const char *); +extern void fio_client_add_ini_file(void *, const char *); extern int fio_recv_data(int sk, void *p, unsigned int len); extern int fio_send_data(int sk, const void *p, unsigned int len); extern void fio_net_cmd_crc(struct fio_net_cmd *); -extern struct fio_net_cmd *fio_net_cmd_read(int sk); +extern struct fio_net_cmd *fio_net_recv_cmd(int sk); extern int exit_backend; extern int fio_net_port; -#if __BYTE_ORDER == __LITTLE_ENDIAN -#define le16_to_cpu(x) (x) -#define le32_to_cpu(x) (x) -#define le64_to_cpu(x) (x) -#define cpu_to_le16(x) (x) -#define cpu_to_le32(x) (x) -#define cpu_to_le64(x) (x) -#elif __BYTE_ORDER == __BIG_ENDIAN -#define le16_to_cpu(x) __bswap_16(x) -#define le32_to_cpu(x) __bswap_32(x) -#define le64_to_cpu(x) __bswap_64(x) -#define cpu_to_le16(x) __bswap_16(x) -#define cpu_to_le32(x) __bswap_32(x) -#define cpu_to_le64(x) __bswap_64(x) -#else -#error "Endianness not detected" -#endif - static inline void fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode, - const void *pdu, uint32_t pdu_len) + const void *pdu, uint32_t pdu_len, + uint64_t tag) { memset(cmd, 0, sizeof(*cmd)); - cmd->version = cpu_to_le16(FIO_SERVER_VER1); + cmd->version = __cpu_to_le16(FIO_SERVER_VER); cmd->opcode = cpu_to_le16(opcode); + cmd->tag = cpu_to_le64(tag); if (pdu) { cmd->pdu_len = cpu_to_le32(pdu_len);