#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;
cmd->pdu_len = le32_to_cpu(cmd->pdu_len);
switch (cmd->version) {
- case FIO_SERVER_VER1:
+ case FIO_SERVER_VER2:
break;
default:
log_err("fio: bad server cmd version %d\n", cmd->version);
/*
* Read (and defragment, if necessary) incoming commands
*/
-struct fio_net_cmd *fio_net_recv_cmd(int sk, int block)
+struct fio_net_cmd *fio_net_recv_cmd(int sk)
{
struct fio_net_cmd cmd, *cmdret = NULL;
size_t cmd_size = 0, pdu_offset = 0;
void *pdu = NULL;
do {
- struct pollfd pfd;
-
- pfd.fd = sk;
- pfd.events = POLLIN;
- ret = 0;
- do {
- int timeo = block ? 100 : 10;
-
- ret = poll(&pfd, 1, timeo);
- if (ret < 0) {
- if (errno == EINTR)
- break;
- log_err("fio: poll: %s\n", strerror(errno));
- break;
- } else if (!ret) {
- if (!block)
- return NULL;
- continue;
- }
-
- if (pfd.revents & POLLIN)
- break;
- if (pfd.revents & (POLLERR|POLLHUP)) {
- ret = 1;
- break;
- }
- } while (ret >= 0 && block);
-
- if (ret < 0)
- break;
-
ret = fio_recv_data(sk, &cmd, sizeof(cmd));
if (ret)
break;
int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t serial)
{
- struct fio_net_cmd cmd = {
- .version = __cpu_to_le16(FIO_SERVER_VER1),
- .opcode = cpu_to_le16(opcode),
- .serial = cpu_to_le64(serial),
- };
+ struct fio_net_cmd cmd;
+ fio_init_net_cmd(&cmd, opcode, NULL, 0);
fio_net_cmd_crc(&cmd);
return fio_send_data(sk, &cmd, sizeof(cmd));
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);
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);
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;
/* read forever */
while (!exit_backend) {
- cmd = fio_net_recv_cmd(sk, block);
+ struct pollfd pfd = {
+ .fd = sk,
+ .events = POLLIN,
+ };
+
+ ret = 0;
+ do {
+ ret = poll(&pfd, 1, 100);
+ if (ret < 0) {
+ if (errno == EINTR)
+ break;
+ log_err("fio: poll: %s\n", strerror(errno));
+ break;
+ } else if (!ret) {
+ if (!block)
+ return 0;
+ continue;
+ }
+
+ if (pfd.revents & POLLIN)
+ break;
+ if (pfd.revents & (POLLERR|POLLHUP)) {
+ ret = 1;
+ break;
+ }
+ } while (!exit_backend);
+
+ if (ret < 0)
+ break;
+
+ cmd = fio_net_recv_cmd(sk);
if (!cmd) {
ret = -1;
break;
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;
}
sigaction(SIGTERM, &act, NULL);
}
-
int fio_start_server(int daemonize)
{
pid_t pid;
projects / fio.git / blobdiff