X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=server.h;h=46555ceea491444df213497564d23c227789d075;hb=38fdef226f1a1fa053ab53005abbc184143bff65;hp=c85f1bcc36e090431423e9f39f7a143477b5510a;hpb=794d69ca97738736844ee6a6da37f1ef686578cb;p=fio.git diff --git a/server.h b/server.h index c85f1bcc..46555cee 100644 --- a/server.h +++ b/server.h @@ -3,7 +3,10 @@ #include #include -#include +#include + +#include "stat.h" +#include "os/os.h" /* * On-wire encoding is little endian @@ -12,74 +15,117 @@ struct fio_net_cmd { uint16_t version; /* protocol version */ uint16_t opcode; /* command opcode */ uint32_t flags; /* modifier flags */ - uint64_t serial; /* serial number */ + uint64_t tag; /* passed back on reply */ uint32_t pdu_len; /* length of post-cmd layload */ + /* + * 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[0]; /* payload */ }; +struct fio_net_int_cmd { + struct fio_net_cmd cmd; + struct flist_head list; + struct timeval tv; + uint64_t saved_tag; +}; + enum { - FIO_SERVER_VER = 1, - FIO_SERVER_VER1 = 1, + FIO_SERVER_VER = 5, - FIO_SERVER_MAX_PDU = 64, + FIO_SERVER_MAX_PDU = 1024, FIO_NET_CMD_QUIT = 1, - FIO_NET_CMD_JOB = 2, - FIO_NET_CMD_ACK = 3, - FIO_NET_CMD_NAK = 4, + 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_NR = 13, - FIO_NET_CMD_F_MORE = 1, + 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, }; -extern int fio_server(void); -extern int fio_server_text_output(const char *, unsigned int len); -extern int fio_server_log(const char *format, ...); -extern int fio_net_send_cmd(int, uint16_t, const char *, off_t); +struct cmd_ts_pdu { + struct thread_stat ts; + struct group_run_stats rs; +}; + +struct cmd_probe_pdu { + uint8_t hostname[64]; + uint8_t bigendian; + uint8_t fio_major; + uint8_t fio_minor; + uint8_t fio_patch; + uint8_t os; + uint8_t arch; + uint8_t bpp; +}; -extern int fio_client_connect(const char *); -extern int fio_client_send_ini(const char *); +struct cmd_single_line_pdu { + uint16_t len; + uint8_t text[0]; +}; + +struct cmd_line_pdu { + uint16_t lines; + struct cmd_single_line_pdu options[0]; +}; + +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 *); +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_idle_loop(void); + +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 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);