X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=server.h;h=1a9b650d2577d295cae450c2e58ba52d5ada686b;hb=f23ff35ed3db83db98ac2909eeec5144a181811e;hp=2235f3a503f3f38541eeafb820922f31ec02371b;hpb=46bcd498f7b3fb55f7f048bf299f36bd8c8f7db1;p=fio.git diff --git a/server.h b/server.h index 2235f3a5..1a9b650d 100644 --- a/server.h +++ b/server.h @@ -12,6 +12,17 @@ #define FIO_NET_PORT 8765 +struct sk_out { + unsigned int refs; /* frees sk_out when it drops to zero. + * protected by below ->lock */ + + int sk; /* socket fd to talk to client */ + struct fio_mutex lock; /* protects ref and below list */ + struct flist_head list; /* list of pending transmit work */ + struct fio_mutex wait; /* wake backend when items added to list */ + struct fio_mutex xmit; /* held while sending data */ +}; + /* * On-wire encoding is little endian */ @@ -27,20 +38,21 @@ struct fio_net_cmd { */ uint16_t cmd_crc16; /* cmd checksum */ uint16_t pdu_crc16; /* payload checksum */ - uint8_t payload[0]; /* payload */ + uint8_t payload[]; /* payload */ }; -struct fio_net_int_cmd { - struct fio_net_cmd cmd; +struct fio_net_cmd_reply { struct flist_head list; - struct timeval tv; + struct timespec ts; uint64_t saved_tag; + uint16_t opcode; }; enum { - FIO_SERVER_VER = 11, + FIO_SERVER_VER = 69, FIO_SERVER_MAX_FRAGMENT_PDU = 1024, + FIO_SERVER_MAX_CMD_MB = 2048, FIO_NET_CMD_QUIT = 1, FIO_NET_CMD_EXIT = 2, @@ -58,7 +70,13 @@ enum { 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_IOLOG = 17, + FIO_NET_CMD_UPDATE_JOB = 18, + FIO_NET_CMD_LOAD_FILE = 19, + FIO_NET_CMD_VTRIGGER = 20, + FIO_NET_CMD_SENDFILE = 21, + FIO_NET_CMD_JOB_OPT = 22, + FIO_NET_CMD_NR = 23, FIO_NET_CMD_F_MORE = 1UL << 0, @@ -66,7 +84,36 @@ enum { 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_PROBE_FLAG_ZLIB = 1UL << 0, +}; + +struct cmd_sendfile { + uint8_t path[FIO_NET_NAME_MAX]; +}; + +struct cmd_sendfile_reply { + uint32_t size; + uint32_t error; + uint8_t data[0]; +}; + +/* + * Client sends this to server on VTRIGGER, server sends back a full + * all_io_list structure. + */ +struct cmd_vtrigger_pdu { + uint16_t len; + uint8_t cmd[]; +}; + +struct cmd_load_file_pdu { + uint16_t name_len; + uint16_t client_type; + uint8_t file[]; }; struct cmd_ts_pdu { @@ -79,26 +126,31 @@ struct cmd_du_pdu { struct disk_util_agg agg; }; -struct cmd_probe_pdu { +struct cmd_client_probe_pdu { + uint64_t flags; + uint8_t server[128]; +}; + +struct cmd_probe_reply_pdu { uint8_t hostname[64]; uint8_t bigendian; - uint8_t fio_major; - uint8_t fio_minor; - uint8_t fio_patch; + uint8_t fio_version[32]; uint8_t os; uint8_t arch; uint8_t bpp; + uint32_t cpus; + uint64_t flags; }; struct cmd_single_line_pdu { uint16_t len; - uint8_t text[0]; + uint8_t text[]; }; struct cmd_line_pdu { uint16_t lines; uint16_t client_type; - struct cmd_single_line_pdu options[0]; + struct cmd_single_line_pdu options[]; }; struct cmd_job_pdu { @@ -109,13 +161,17 @@ struct cmd_job_pdu { struct cmd_start_pdu { uint32_t jobs; + uint32_t stat_outputs; }; struct cmd_end_pdu { uint32_t error; + uint32_t signal; }; struct cmd_add_job_pdu { + uint32_t thread_number; + uint32_t groupid; struct thread_options_pack top; }; @@ -127,13 +183,37 @@ struct cmd_text_pdu { uint8_t buf[0]; }; +enum { + XMIT_COMPRESSED = 1U, + STORE_COMPRESSED = 2U, +}; + +struct cmd_iolog_pdu { + uint64_t nr_samples; + uint32_t thread_number; + uint32_t log_type; + uint32_t compressed; + uint32_t log_offset; + uint32_t log_hist_coarseness; + uint8_t name[FIO_NET_NAME_MAX]; + struct io_sample samples[0]; +}; + +struct cmd_job_option { + uint16_t global; + uint16_t truncated; + uint32_t groupid; + uint8_t name[64]; + uint8_t value[128]; +}; + extern int fio_start_server(char *); extern int fio_server_text_output(int, const char *, size_t); -extern int fio_net_send_cmd(int, uint16_t, const void *, off_t, uint64_t); +extern int fio_net_send_cmd(int, uint16_t, const void *, off_t, uint64_t *, struct flist_head *); 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 int fio_server_parse_host(const char *, int *, struct in_addr *, struct in6_addr *); +extern int fio_server_parse_string(const char *, char **, bool *, int *, struct in_addr *, struct in6_addr *, int *); +extern int fio_server_parse_host(const char *, int, struct in_addr *, struct in6_addr *); extern const char *fio_server_op(unsigned int); extern void fio_server_got_signal(int); @@ -142,33 +222,20 @@ 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 void fio_server_send_job_options(struct flist_head *, unsigned int); +extern int fio_server_get_verify_state(const char *, int, void **); + +extern struct fio_net_cmd *fio_net_recv_cmd(int sk, bool wait); -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_recv_cmd(int sk); +extern int fio_send_iolog(struct thread_data *, struct io_log *, const char *); +extern void fio_server_send_add_job(struct thread_data *); +extern void fio_server_send_start(struct thread_data *); +extern int fio_net_send_quit(int sk); -struct thread_options; -extern void fio_server_send_add_job(struct thread_options *, const char *); +extern int fio_server_create_sk_key(void); +extern void fio_server_destroy_sk_key(void); extern int exit_backend; extern int fio_net_port; -static inline void fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode, - const void *pdu, uint32_t pdu_len, - uint64_t tag) -{ - memset(cmd, 0, sizeof(*cmd)); - - 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); - memcpy(&cmd->payload, pdu, pdu_len); - } -} - #endif