#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 "fio.h"
#include "server.h"
#include "crc/crc16.h"
+#include "ieee754.h"
int fio_net_port = 8765;
/*
* 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;
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);
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);
/* 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;
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)
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 sockaddr_in saddr_in;
struct sockaddr addr;
- unsigned int len;
+ fio_socklen_t len;
int sk, opt, ret;
dprint(FD_NET, "starting server\n");