projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rbd: various fixes and cleanups
[fio.git]
/
server.h
diff --git
a/server.h
b/server.h
index adb190a9c15c59723ef6c6bc1169ee60f03e6adf..46d05a699755ed2883dfa067263033761efd7231 100644
(file)
--- a/
server.h
+++ b/
server.h
@@
-38,9
+38,10
@@
struct fio_net_cmd_reply {
};
enum {
};
enum {
- FIO_SERVER_VER = 3
0
,
+ FIO_SERVER_VER = 3
8
,
FIO_SERVER_MAX_FRAGMENT_PDU = 1024,
FIO_SERVER_MAX_FRAGMENT_PDU = 1024,
+ FIO_SERVER_MAX_CMD_MB = 2048,
FIO_NET_CMD_QUIT = 1,
FIO_NET_CMD_EXIT = 2,
FIO_NET_CMD_QUIT = 1,
FIO_NET_CMD_EXIT = 2,
@@
-60,7
+61,8
@@
enum {
FIO_NET_CMD_RUN = 16,
FIO_NET_CMD_IOLOG = 17,
FIO_NET_CMD_UPDATE_JOB = 18,
FIO_NET_CMD_RUN = 16,
FIO_NET_CMD_IOLOG = 17,
FIO_NET_CMD_UPDATE_JOB = 18,
- FIO_NET_CMD_NR = 19,
+ FIO_NET_CMD_LOAD_FILE = 19,
+ FIO_NET_CMD_NR = 20,
FIO_NET_CMD_F_MORE = 1UL << 0,
FIO_NET_CMD_F_MORE = 1UL << 0,
@@
-75,6
+77,12
@@
enum {
FIO_PROBE_FLAG_ZLIB = 1UL << 0,
};
FIO_PROBE_FLAG_ZLIB = 1UL << 0,
};
+struct cmd_load_file_pdu {
+ uint16_t name_len;
+ uint16_t client_type;
+ uint8_t file[];
+};
+
struct cmd_ts_pdu {
struct thread_stat ts;
struct group_run_stats rs;
struct cmd_ts_pdu {
struct thread_stat ts;
struct group_run_stats rs;
@@
-142,10
+150,11
@@
struct cmd_text_pdu {
};
struct cmd_iolog_pdu {
};
struct cmd_iolog_pdu {
+ uint64_t nr_samples;
uint32_t thread_number;
uint32_t thread_number;
- uint32_t nr_samples;
uint32_t log_type;
uint32_t compressed;
uint32_t log_type;
uint32_t compressed;
+ uint32_t log_offset;
uint8_t name[FIO_NET_NAME_MAX];
struct io_sample samples[0];
};
uint8_t name[FIO_NET_NAME_MAX];
struct io_sample samples[0];
};
@@
-167,11
+176,6
@@
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_du(void);
extern void fio_server_idle_loop(void);
-extern int fio_clients_connect(void);
-extern int fio_clients_send_ini(const char *);
-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 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 *);