cmd->version = le16_to_cpu(cmd->version);
cmd->opcode = le16_to_cpu(cmd->opcode);
cmd->flags = le32_to_cpu(cmd->flags);
- cmd->serial = le64_to_cpu(cmd->serial);
+ cmd->tag = le64_to_cpu(cmd->tag);
cmd->pdu_len = le32_to_cpu(cmd->pdu_len);
switch (cmd->version) {
cmd->pdu_crc16 = __cpu_to_le16(crc16(cmd->payload, pdu_len));
}
-int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size)
+int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size,
+ uint64_t tag)
{
- struct fio_net_cmd *cmd;
- size_t this_len;
+ struct fio_net_cmd *cmd = NULL;
+ size_t this_len, cur_len = 0;
int ret;
do {
if (this_len > FIO_SERVER_MAX_PDU)
this_len = FIO_SERVER_MAX_PDU;
- cmd = malloc(sizeof(*cmd) + this_len);
+ if (!cmd || cur_len < sizeof(*cmd) + this_len) {
+ if (cmd)
+ free(cmd);
+
+ cur_len = sizeof(*cmd) + this_len;
+ cmd = malloc(cur_len);
+ }
- fio_init_net_cmd(cmd, opcode, buf, this_len);
+ fio_init_net_cmd(cmd, opcode, buf, this_len, tag);
if (this_len < size)
cmd->flags = __cpu_to_le32(FIO_NET_CMD_F_MORE);
fio_net_cmd_crc(cmd);
ret = fio_send_data(fd, cmd, sizeof(*cmd) + this_len);
- free(cmd);
size -= this_len;
buf += this_len;
} while (!ret && size);
+ if (cmd)
+ free(cmd);
+
return ret;
}
-int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t serial)
+int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t tag)
{
struct fio_net_cmd cmd;
- fio_init_net_cmd(&cmd, opcode, NULL, 0);
+ fio_init_net_cmd(&cmd, opcode, NULL, 0, tag);
fio_net_cmd_crc(&cmd);
return fio_send_data(sk, &cmd, sizeof(cmd));
probe.os = FIO_OS;
probe.arch = FIO_ARCH;
- return fio_net_send_cmd(server_fd, FIO_NET_CMD_PROBE, &probe, sizeof(probe));
+ return fio_net_send_cmd(server_fd, FIO_NET_CMD_PROBE, &probe, sizeof(probe), 0);
+}
+
+static int handle_send_eta_cmd(struct fio_net_cmd *cmd)
+{
+ struct jobs_eta *je;
+ size_t size;
+ int i;
+
+ size = sizeof(*je) + thread_number * sizeof(char);
+ je = malloc(size);
+ memset(je, 0, size);
+
+ if (!calc_thread_status(je, 1)) {
+ free(je);
+ return 0;
+ }
+
+ dprint(FD_NET, "server sending status\n");
+
+ je->nr_running = cpu_to_le32(je->nr_running);
+ je->nr_ramp = cpu_to_le32(je->nr_ramp);
+ je->nr_pending = cpu_to_le32(je->nr_pending);
+ je->files_open = cpu_to_le32(je->files_open);
+ je->m_rate = cpu_to_le32(je->m_rate);
+ je->t_rate = cpu_to_le32(je->t_rate);
+ je->m_iops = cpu_to_le32(je->m_iops);
+ je->t_iops = cpu_to_le32(je->t_iops);
+
+ for (i = 0; i < 2; i++) {
+ je->rate[i] = cpu_to_le32(je->rate[i]);
+ je->iops[i] = cpu_to_le32(je->iops[i]);
+ }
+
+ je->elapsed_sec = cpu_to_le32(je->nr_running);
+ je->eta_sec = cpu_to_le64(je->eta_sec);
+
+ fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, cmd->tag);
+ free(je);
+ return 0;
}
static int handle_command(struct fio_net_cmd *cmd)
{
int ret;
- dprint(FD_NET, "server: got opcode %d\n", cmd->opcode);
+ dprint(FD_NET, "server: got opcode %d, pdu=%u\n", cmd->opcode, cmd->pdu_len);
switch (cmd->opcode) {
case FIO_NET_CMD_QUIT:
case FIO_NET_CMD_PROBE:
ret = handle_probe_cmd(cmd);
break;
+ case FIO_NET_CMD_SEND_ETA:
+ ret = handle_send_eta_cmd(cmd);
+ break;
default:
log_err("fio: unknown opcode: %d\n", cmd->opcode);
ret = 1;
int fio_server_text_output(const char *buf, unsigned int len)
{
if (server_fd != -1)
- return fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, buf, len);
+ return fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, buf, len, 0);
return fwrite(buf, len, 1, f_err);
}
convert_gs(&p.rs, rs);
- fio_net_send_cmd(server_fd, FIO_NET_CMD_TS, &p, sizeof(p));
+ fio_net_send_cmd(server_fd, FIO_NET_CMD_TS, &p, sizeof(p), 0);
}
void fio_server_send_gs(struct group_run_stats *rs)
dprint(FD_NET, "server sending group run stats\n");
convert_gs(&gs, rs);
- fio_net_send_cmd(server_fd, FIO_NET_CMD_GS, &gs, sizeof(gs));
-}
-
-void fio_server_send_status(void)
-{
- struct jobs_eta *je;
- size_t size;
- void *buf;
- int i;
-
- size = sizeof(*je) + thread_number * sizeof(char);
- buf = malloc(size);
- memset(buf, 0, size);
- je = buf;
-
- if (!calc_thread_status(je)) {
- free(je);
- return;
- }
-
- dprint(FD_NET, "server sending status\n");
-
- je->nr_running = cpu_to_le32(je->nr_running);
- je->nr_ramp = cpu_to_le32(je->nr_ramp);
- je->nr_pending = cpu_to_le32(je->nr_pending);
- je->files_open = cpu_to_le32(je->files_open);
- je->m_rate = cpu_to_le32(je->m_rate);
- je->t_rate = cpu_to_le32(je->t_rate);
- je->m_iops = cpu_to_le32(je->m_iops);
- je->t_iops = cpu_to_le32(je->t_iops);
-
- for (i = 0; i < 2; i++) {
- je->rate[i] = cpu_to_le32(je->rate[i]);
- je->iops[i] = cpu_to_le32(je->iops[i]);
- }
-
- je->elapsed_sec = cpu_to_le32(je->nr_running);
- je->eta_sec = cpu_to_le64(je->eta_sec);
-
- fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, buf, size);
- free(je);
+ fio_net_send_cmd(server_fd, FIO_NET_CMD_GS, &gs, sizeof(gs), 0);
}
int fio_server_log(const char *format, ...)
sigaction(SIGTERM, &act, NULL);
}
-int fio_start_server(int daemonize)
+static void write_pid(pid_t pid, const char *pidfile)
+{
+ FILE *fpid;
+
+ fpid = fopen(pidfile, "w");
+ if (!fpid) {
+ log_err("fio: failed opening pid file %s\n", pidfile);
+ return;
+ }
+
+ fprintf(fpid, "%u\n", (unsigned int) pid);
+}
+
+/*
+ * If pidfile is specified, background us.
+ */
+int fio_start_server(char *pidfile)
{
pid_t pid;
+ int ret;
server_signal_handler();
- if (!daemonize)
+ if (!pidfile)
return fio_server();
openlog("fio", LOG_NDELAY|LOG_NOWAIT|LOG_PID, LOG_USER);
pid = fork();
if (pid < 0) {
syslog(LOG_ERR, "failed server fork");
+ free(pidfile);
return -1;
- } else if (pid)
+ } else if (pid) {
+ write_pid(pid, pidfile);
exit(0);
+ }
setsid();
close(STDIN_FILENO);
f_out = NULL;
f_err = NULL;
log_syslog = 1;
- return fio_server();
+
+ ret = fio_server();
+
+ closelog();
+ unlink(pidfile);
+ free(pidfile);
+ return ret;
}
void fio_server_set_arg(const char *arg)
projects / fio.git / blobdiff