static char *bind_sock;
static struct sockaddr_in saddr_in;
+static const char *fio_server_ops[FIO_NET_CMD_NR] = {
+ "",
+ "QUIT",
+ "EXIT",
+ "JOB",
+ "JOBLINE",
+ "TEXT",
+ "TS",
+ "GS",
+ "SEND_ETA",
+ "ETA",
+ "PROBE",
+ "START",
+ "STOP",
+ "DISK_UTIL",
+};
+
+const char *fio_server_op(unsigned int op)
+{
+ static char buf[32];
+
+ if (op < FIO_NET_CMD_NR)
+ return fio_server_ops[op];
+
+ sprintf(buf, "UNKNOWN/%d", op);
+ return buf;
+}
+
int fio_send_data(int sk, const void *p, unsigned int len)
{
assert(len <= sizeof(struct fio_net_cmd) + FIO_SERVER_MAX_PDU);
break;
else if (errno == EAGAIN || errno == EINTR)
continue;
+ else
+ break;
} while (!exit_backend);
if (!len)
break;
else if (errno == EAGAIN || errno == EINTR)
continue;
+ else
+ break;
} while (!exit_backend);
if (!len)
return ret;
}
-int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t tag)
+static int fio_net_send_simple_stack_cmd(int sk, uint16_t opcode, uint64_t tag)
{
struct fio_net_cmd cmd;
return fio_send_data(sk, &cmd, sizeof(cmd));
}
+/*
+ * If 'list' is non-NULL, then allocate and store the sent command for
+ * later verification.
+ */
+int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t tag,
+ struct flist_head *list)
+{
+ struct fio_net_int_cmd *cmd;
+ int ret;
+
+ if (!list)
+ return fio_net_send_simple_stack_cmd(sk, opcode, tag);
+
+ cmd = malloc(sizeof(*cmd));
+
+ fio_init_net_cmd(&cmd->cmd, opcode, NULL, 0, (uintptr_t) cmd);
+ fio_net_cmd_crc(&cmd->cmd);
+
+ INIT_FLIST_HEAD(&cmd->list);
+ gettimeofday(&cmd->tv, NULL);
+ cmd->saved_tag = tag;
+
+ ret = fio_send_data(sk, &cmd->cmd, sizeof(cmd->cmd));
+ if (ret) {
+ free(cmd);
+ return ret;
+ }
+
+ flist_add_tail(&cmd->list, list);
+ return 0;
+}
+
static int fio_server_send_quit_cmd(void)
{
dprint(FD_NET, "server: sending quit\n");
- return fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_QUIT, 0);
+ return fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_QUIT, 0, NULL);
}
static int handle_job_cmd(struct fio_net_cmd *cmd)
return -1;
}
- fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_START, 0);
+ fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_START, 0, NULL);
ret = exec_run();
fio_server_send_quit_cmd();
free(argv);
- fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_START, 0);
+ fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_START, 0, NULL);
ret = exec_run();
fio_server_send_quit_cmd();
{
struct cmd_probe_pdu probe;
+ dprint(FD_NET, "server: sending probe reply\n");
+
memset(&probe, 0, sizeof(probe));
gethostname((char *) probe.hostname, sizeof(probe.hostname));
#ifdef FIO_BIG_ENDIAN
probe.os = FIO_OS;
probe.arch = FIO_ARCH;
- return fio_net_send_cmd(server_fd, FIO_NET_CMD_PROBE, &probe, sizeof(probe), 0);
+ probe.bpp = sizeof(void *);
+
+ return fio_net_send_cmd(server_fd, FIO_NET_CMD_PROBE, &probe, sizeof(probe), cmd->tag);
}
static int handle_send_eta_cmd(struct fio_net_cmd *cmd)
size_t size;
int i;
- size = sizeof(*je) + thread_number * sizeof(char);
+ if (!thread_number)
+ return 0;
+
+ size = sizeof(*je) + thread_number * sizeof(char) + 1;
je = malloc(size);
memset(je, 0, size);
{
int ret;
- dprint(FD_NET, "server: got opcode %d, pdu=%u\n", cmd->opcode, cmd->pdu_len);
+ dprint(FD_NET, "server: got op [%s], pdu=%u, tag=%lx\n",
+ fio_server_op(cmd->opcode), cmd->pdu_len, cmd->tag);
switch (cmd->opcode) {
case FIO_NET_CMD_QUIT:
ret = handle_send_eta_cmd(cmd);
break;
default:
- log_err("fio: unknown opcode: %d\n", cmd->opcode);
+ log_err("fio: unknown opcode: %s\n",fio_server_op(cmd->opcode));
ret = 1;
}
p.ts.clat_percentiles = cpu_to_le64(ts->clat_percentiles);
for (i = 0; i < FIO_IO_U_LIST_MAX_LEN; i++) {
- fio_fp64_t *fp = &p.ts.percentile_list[i];
+ fio_fp64_t *src = &ts->percentile_list[i];
+ fio_fp64_t *dst = &p.ts.percentile_list[i];
- fp->u.i = __cpu_to_le64(fio_double_to_uint64(fp->u.f));
+ dst->u.i = __cpu_to_le64(fio_double_to_uint64(src->u.f));
}
for (i = 0; i < FIO_IO_U_MAP_NR; i++) {
fio_net_send_cmd(server_fd, FIO_NET_CMD_GS, &gs, sizeof(gs), 0);
}
+static void convert_agg(struct disk_util_agg *dst, struct disk_util_agg *src)
+{
+ int i;
+
+ for (i = 0; i < 2; i++) {
+ dst->ios[i] = cpu_to_le32(src->ios[i]);
+ dst->merges[i] = cpu_to_le32(src->merges[i]);
+ dst->sectors[i] = cpu_to_le64(src->sectors[i]);
+ dst->ticks[i] = cpu_to_le32(src->ticks[i]);
+ }
+
+ dst->io_ticks = cpu_to_le32(src->io_ticks);
+ dst->time_in_queue = cpu_to_le32(src->time_in_queue);
+ dst->slavecount = cpu_to_le32(src->slavecount);
+ dst->max_util.u.i = __cpu_to_le64(fio_double_to_uint64(src->max_util.u.f));
+}
+
+static void convert_dus(struct disk_util_stat *dst, struct disk_util_stat *src)
+{
+ int i;
+
+ strcpy((char *) dst->name, (char *) src->name);
+
+ for (i = 0; i < 2; i++) {
+ dst->ios[i] = cpu_to_le32(src->ios[i]);
+ dst->merges[i] = cpu_to_le32(src->merges[i]);
+ dst->sectors[i] = cpu_to_le64(src->sectors[i]);
+ dst->ticks[i] = cpu_to_le32(src->ticks[i]);
+ }
+
+ dst->io_ticks = cpu_to_le32(src->io_ticks);
+ dst->time_in_queue = cpu_to_le32(src->time_in_queue);
+ dst->msec = cpu_to_le64(src->msec);
+}
+
+void fio_server_send_du(void)
+{
+ struct disk_util *du;
+ struct flist_head *entry;
+ struct cmd_du_pdu pdu;
+
+ dprint(FD_NET, "server: sending disk_util %d\n", !flist_empty(&disk_list));
+
+ memset(&pdu, 0, sizeof(pdu));
+
+ flist_for_each(entry, &disk_list) {
+ du = flist_entry(entry, struct disk_util, list);
+
+ convert_dus(&pdu.dus, &du->dus);
+ convert_agg(&pdu.agg, &du->agg);
+
+ fio_net_send_cmd(server_fd, FIO_NET_CMD_DU, &pdu, sizeof(pdu), 0);
+ }
+}
+
int fio_server_log(const char *format, ...)
{
char buffer[1024];
log_info("fio: server listening on %s\n", bind_str);
- if (listen(sk, 1) < 0) {
+ if (listen(sk, 0) < 0) {
log_err("fio: listen: %s\n", strerror(errno));
return -1;
}
return ret;
}
-static void sig_int(int sig)
-{
- fio_terminate_threads(TERMINATE_ALL);
- exit_backend = 1;
-}
-
-static void server_signal_handler(void)
+void fio_server_got_signal(int signal)
{
- struct sigaction act;
-
- memset(&act, 0, sizeof(act));
- act.sa_handler = sig_int;
- act.sa_flags = SA_RESTART;
- sigaction(SIGINT, &act, NULL);
-
- memset(&act, 0, sizeof(act));
- act.sa_handler = sig_int;
- act.sa_flags = SA_RESTART;
- sigaction(SIGTERM, &act, NULL);
+ if (signal == SIGPIPE)
+ server_fd = -1;
+ else {
+ log_info("\nfio: terminating on signal %d\n", signal);
+ exit_backend = 1;
+ }
}
static int check_existing_pidfile(const char *pidfile)
pid = atoi(buf);
if (kill(pid, SIGCONT) < 0)
- return 0;
+ return errno != ESRCH;
return 1;
}
pid_t pid;
int ret;
- server_signal_handler();
-
if (!pidfile)
return fio_server();