X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.h;h=d73ce1d635466f0111fe2e7973dc6026fd8240b5;hp=b94c22183c9d5605ce20ee875cca0a95615e389c;hb=a64c13a449ddd63bf7b501d85571360f3afd8980;hpb=2378826d96532b390bd4cb08d3946b497a9b0e51 diff --git a/server.h b/server.h index b94c2218..d73ce1d6 100644 --- a/server.h +++ b/server.h @@ -38,7 +38,7 @@ struct fio_net_cmd_reply { }; enum { - FIO_SERVER_VER = 45, + FIO_SERVER_VER = 49, FIO_SERVER_MAX_FRAGMENT_PDU = 1024, FIO_SERVER_MAX_CMD_MB = 2048, @@ -196,44 +196,16 @@ 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_server_get_verify_state(const char *, int, void **); +extern int fio_server_get_verify_state(const char *, int, void **, int *); -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 void fio_net_cmd_crc_pdu(struct fio_net_cmd *, const void *); 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_stop(int sk, int error, int signal); extern int fio_net_send_quit(int sk); extern int exit_backend; extern int fio_net_port; -static inline void __fio_init_net_cmd(struct fio_net_cmd *cmd, uint16_t opcode, - 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); - cmd->pdu_len = cpu_to_le32(pdu_len); -} - - -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) -{ - __fio_init_net_cmd(cmd, opcode, pdu_len, tag); - - if (pdu) - memcpy(&cmd->payload, pdu, pdu_len); -} - #endif