#include <sys/poll.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <sys/mman.h>
+#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <syslog.h>
+#include <signal.h>
#include "fio.h"
#include "server.h"
#include "crc/crc16.h"
+#include "ieee754.h"
int fio_net_port = 8765;
return fio_send_data(sk, &cmd, sizeof(cmd));
}
-static int send_quit_command(void)
+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);
char *buf = (char *) cmd->payload;
int ret;
- if (parse_jobs_ini(buf, 1, 0))
+ if (parse_jobs_ini(buf, 1, 0)) {
+ fio_server_send_quit_cmd();
return -1;
+ }
fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_START, 0);
ret = exec_run();
- send_quit_command();
+ fio_server_send_quit_cmd();
reset_fio_state();
return ret;
}
pdu->argc = le16_to_cpu(pdu->argc);
- for (i = 0; i < pdu->argc; i++)
+ dprint(FD_NET, "server: %d command line args\n", pdu->argc);
+
+ for (i = 0; i < pdu->argc; i++) {
argv[i] = (char *) pdu->argv[i];
+ dprint(FD_NET, "server: %d: %s\n", i, argv[i]);
+ }
- if (parse_cmd_line(pdu->argc, argv))
+ if (parse_cmd_line(pdu->argc, argv)) {
+ fio_server_send_quit_cmd();
return -1;
+ }
fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_START, 0);
ret = exec_run();
- send_quit_command();
+ fio_server_send_quit_cmd();
reset_fio_state();
return ret;
}
memset(&probe, 0, sizeof(probe));
gethostname((char *) probe.hostname, sizeof(probe.hostname));
+#ifdef FIO_BIG_ENDIAN
+ probe.bigendian = 1;
+#endif
probe.fio_major = FIO_MAJOR;
probe.fio_minor = FIO_MINOR;
probe.fio_patch = FIO_PATCH;
switch (cmd->opcode) {
case FIO_NET_CMD_QUIT:
fio_terminate_threads(TERMINATE_ALL);
- send_quit_command();
return -1;
case FIO_NET_CMD_EXIT:
exit_backend = 1;
static int accept_loop(int listen_sk)
{
- struct sockaddr addr;
- unsigned int len = sizeof(addr);
+ struct sockaddr_in addr;
+ fio_socklen_t len = sizeof(addr);
struct pollfd pfd;
int ret, sk, flags, exitval = 0;
+ dprint(FD_NET, "server enter accept loop\n");
+
flags = fcntl(listen_sk, F_GETFL);
flags |= O_NONBLOCK;
fcntl(listen_sk, F_SETFL, flags);
if (exit_backend)
goto out;
- sk = accept(listen_sk, &addr, &len);
+ sk = accept(listen_sk, (struct sockaddr *) &addr, &len);
if (sk < 0) {
log_err("fio: accept: %s\n", strerror(errno));
return -1;
}
- dprint(FD_NET, "server got a connection\n");
+ dprint(FD_NET, "server: connect from %s\n", inet_ntoa(addr.sin_addr));
server_fd = sk;
if (server_fd != -1)
return fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, buf, len);
- return 0;
+ return fwrite(buf, len, 1, f_err);
}
static void convert_io_stat(struct io_stat *dst, struct io_stat *src)
dst->max_val = cpu_to_le64(src->max_val);
dst->min_val = cpu_to_le64(src->min_val);
dst->samples = cpu_to_le64(src->samples);
- /* FIXME */
- dst->mean = __cpu_to_le64(src->mean);
- dst->S = __cpu_to_le64(src->S);
+
+ /*
+ * Encode to IEEE 754 for network transfer
+ */
+ dst->mean.u.i = __cpu_to_le64(fio_double_to_uint64(src->mean.u.f));
+ dst->S.u.i = __cpu_to_le64(fio_double_to_uint64(src->S.u.f));
}
static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src)
struct cmd_ts_pdu p;
int i, j;
+ dprint(FD_NET, "server sending end stats\n");
+
memset(&p, 0, sizeof(p));
strcpy(p.ts.name, ts->name);
p.ts.minf = cpu_to_le64(ts->minf);
p.ts.majf = cpu_to_le64(ts->majf);
p.ts.clat_percentiles = cpu_to_le64(ts->clat_percentiles);
- p.ts.percentile_list = NULL;
+
+ for (i = 0; i < FIO_IO_U_LIST_MAX_LEN; i++) {
+ fio_fp64_t *fp = &p.ts.percentile_list[i];
+
+ fp->u.i = __cpu_to_le64(fio_double_to_uint64(fp->u.f));
+ }
for (i = 0; i < FIO_IO_U_MAP_NR; i++) {
p.ts.io_u_map[i] = cpu_to_le32(ts->io_u_map[i]);
{
struct group_run_stats gs;
+ 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));
}
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);
va_list args;
size_t len;
+ dprint(FD_NET, "server log\n");
+
va_start(args, format);
len = vsnprintf(buffer, sizeof(buffer), format, args);
va_end(args);
{
struct sockaddr_in saddr_in;
struct sockaddr addr;
- unsigned int len;
+ fio_socklen_t len;
int sk, opt, ret;
dprint(FD_NET, "starting server\n");
return -1;
}
#ifdef SO_REUSEPORT
- if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) {
+ if (setsockopt(sk, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) {
log_err("fio: setsockopt: %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)
+{
+ 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);
+}
+
int fio_start_server(int daemonize)
{
pid_t pid;
+ server_signal_handler();
+
if (!daemonize)
return fio_server();