#include <inttypes.h>
#include <string.h>
+#include <sys/time.h>
+#include <netinet/in.h>
#include "stat.h"
#include "os/os.h"
+#include "diskutil.h"
/*
* On-wire encoding is little endian
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
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 = 6,
- FIO_SERVER_MAX_PDU = 64,
+ FIO_SERVER_MAX_PDU = 1024,
FIO_NET_CMD_QUIT = 1,
FIO_NET_CMD_EXIT = 2,
FIO_NET_CMD_TEXT = 5,
FIO_NET_CMD_TS = 6,
FIO_NET_CMD_GS = 7,
- FIO_NET_CMD_ETA = 8,
- FIO_NET_CMD_PROBE = 9,
- FIO_NET_CMD_START = 10,
- FIO_NET_CMD_STOP = 11,
+ 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,
FIO_NET_CMD_CRC_SZ = sizeof(struct fio_net_cmd) -
2 * sizeof(uint16_t),
- FIO_NET_CMD_JOBLINE_ARGV = 128,
+ FIO_NET_CLIENT_TIMEOUT = 5000,
};
struct cmd_ts_pdu {
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_major;
uint8_t fio_minor;
uint8_t fio_patch;
+ uint8_t os;
+ uint8_t arch;
+ uint8_t bpp;
+};
+
+struct cmd_single_line_pdu {
+ uint16_t len;
+ uint8_t text[0];
};
struct cmd_line_pdu {
- uint16_t argc;
- uint8_t argv[FIO_NET_CMD_JOBLINE_ARGV][64];
+ uint16_t lines;
+ struct cmd_single_line_pdu options[0];
};
-extern int fio_start_server(int);
-extern int fio_server_text_output(const char *, unsigned int len);
+struct cmd_start_pdu {
+ uint32_t jobs;
+};
+
+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);
-extern int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t serial);
+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_status(void);
+extern void fio_server_send_du(void);
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 void fio_client_add(const char *);
-extern void fio_client_add_cmd_option(const char *, const char *);
+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_recv_cmd(int sk, int block);
+extern struct fio_net_cmd *fio_net_recv_cmd(int sk);
extern int exit_backend;
extern int fio_net_port;
-#ifdef FIO_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)
-#else
-#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)
-#endif
-
-#define le16_to_cpu(val) ({ \
- uint16_t *__val = &(val); \
- __le16_to_cpu(*__val); \
-})
-#define le32_to_cpu(val) ({ \
- uint32_t *__val = &(val); \
- __le32_to_cpu(*__val); \
-})
-#define le64_to_cpu(val) ({ \
- uint64_t *__val = &(val); \
- __le64_to_cpu(*__val); \
-})
-#define cpu_to_le16(val) ({ \
- uint16_t *__val = &(val); \
- __cpu_to_le16(*__val); \
-})
-#define cpu_to_le32(val) ({ \
- uint32_t *__val = &(val); \
- __cpu_to_le32(*__val); \
-})
-#define cpu_to_le64(val) ({ \
- uint64_t *__val = &(val); \
- __cpu_to_le64(*__val); \
-})
-
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);
projects / fio.git / blobdiff