#include "crc/crc16.h"
#include "lib/ieee754.h"
-#include "fio_version.h"
-
int fio_net_port = 8765;
int exit_backend = 0;
static char *fio_server_arg;
static char *bind_sock;
static struct sockaddr_in saddr_in;
+static struct sockaddr_in6 saddr_in6;
static int first_cmd_check;
+static int use_ipv6;
static const char *fio_server_ops[FIO_NET_CMD_NR] = {
"",
cmd->cmd_crc16 = le16_to_cpu(cmd->cmd_crc16);
cmd->pdu_crc16 = le16_to_cpu(cmd->pdu_crc16);
- crc = crc16(cmd, FIO_NET_CMD_CRC_SZ);
+ crc = fio_crc16(cmd, FIO_NET_CMD_CRC_SZ);
if (crc != cmd->cmd_crc16) {
log_err("fio: server bad crc on command (got %x, wanted %x)\n",
cmd->cmd_crc16, crc);
break;
/* Verify payload crc */
- crc = crc16(pdu, cmd.pdu_len);
+ crc = fio_crc16(pdu, cmd.pdu_len);
if (crc != cmd.pdu_crc16) {
log_err("fio: server bad crc on payload ");
log_err("(got %x, wanted %x)\n", cmd.pdu_crc16, crc);
{
uint32_t pdu_len;
- cmd->cmd_crc16 = __cpu_to_le16(crc16(cmd, FIO_NET_CMD_CRC_SZ));
+ cmd->cmd_crc16 = __cpu_to_le16(fio_crc16(cmd, FIO_NET_CMD_CRC_SZ));
pdu_len = le32_to_cpu(cmd->pdu_len);
if (pdu_len)
- cmd->pdu_crc16 = __cpu_to_le16(crc16(cmd->payload, pdu_len));
+ cmd->pdu_crc16 = __cpu_to_le16(fio_crc16(cmd->payload, pdu_len));
}
int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size,
fio_net_cmd_crc(&cmd->cmd);
INIT_FLIST_HEAD(&cmd->list);
- gettimeofday(&cmd->tv, NULL);
+ fio_gettime(&cmd->tv, NULL);
cmd->saved_tag = tag;
ret = fio_send_data(sk, &cmd->cmd, sizeof(cmd->cmd));
static int handle_job_cmd(struct fio_net_cmd *cmd)
{
char *buf = (char *) cmd->payload;
+ struct cmd_start_pdu spdu;
+ struct cmd_end_pdu epdu;
int ret;
if (parse_jobs_ini(buf, 1, 0)) {
return -1;
}
- fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_START, 0, NULL);
+ spdu.jobs = cpu_to_le32(thread_number);
+ spdu.stat_outputs = cpu_to_le32(stat_number);
+ fio_net_send_cmd(server_fd, FIO_NET_CMD_START, &spdu, sizeof(spdu), 0);
+
+ ret = fio_backend();
+
+ epdu.error = ret;
+ fio_net_send_cmd(server_fd, FIO_NET_CMD_STOP, &epdu, sizeof(epdu), 0);
- ret = exec_run();
fio_server_send_quit_cmd();
reset_fio_state();
return ret;
fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_START, 0, NULL);
- ret = exec_run();
+ ret = fio_backend();
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
+#ifdef CONFIG_BIG_ENDIAN
probe.bigendian = 1;
#endif
- probe.fio_major = FIO_MAJOR;
- probe.fio_minor = FIO_MINOR;
- probe.fio_patch = FIO_PATCH;
+ strncpy((char *) probe.fio_version, fio_version_string, sizeof(probe.fio_version));
probe.os = FIO_OS;
probe.arch = FIO_ARCH;
je->iops[i] = cpu_to_le32(je->iops[i]);
}
- je->elapsed_sec = cpu_to_le32(je->nr_running);
+ je->elapsed_sec = cpu_to_le64(je->elapsed_sec);
je->eta_sec = cpu_to_le64(je->eta_sec);
+ je->is_pow2 = cpu_to_le32(je->is_pow2);
fio_net_send_cmd(server_fd, FIO_NET_CMD_ETA, je, size, cmd->tag);
free(je);
static int accept_loop(int listen_sk)
{
struct sockaddr_in addr;
- fio_socklen_t len = sizeof(addr);
+ socklen_t len = sizeof(addr);
struct pollfd pfd;
int ret, sk, flags, exitval = 0;
static int fio_init_server_ip(void)
{
+ struct sockaddr *addr;
+ socklen_t socklen;
int sk, opt;
- sk = socket(AF_INET, SOCK_STREAM, 0);
+ if (use_ipv6)
+ sk = socket(AF_INET6, SOCK_STREAM, 0);
+ else
+ sk = socket(AF_INET, SOCK_STREAM, 0);
+
if (sk < 0) {
log_err("fio: socket: %s\n", strerror(errno));
return -1;
}
opt = 1;
- if (setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) {
+ if (setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, (void *)&opt, sizeof(opt)) < 0) {
log_err("fio: setsockopt: %s\n", strerror(errno));
close(sk);
return -1;
}
#endif
- saddr_in.sin_family = AF_INET;
+ if (use_ipv6) {
+ addr = (struct sockaddr *) &saddr_in6;
+ socklen = sizeof(saddr_in6);
+ saddr_in6.sin6_family = AF_INET6;
+ } else {
+ addr = (struct sockaddr *) &saddr_in;
+ socklen = sizeof(saddr_in);
+ saddr_in.sin_family = AF_INET;
+ }
- if (bind(sk, (struct sockaddr *) &saddr_in, sizeof(saddr_in)) < 0) {
+ if (bind(sk, addr, socklen) < 0) {
log_err("fio: bind: %s\n", strerror(errno));
close(sk);
return -1;
static int fio_init_server_sock(void)
{
struct sockaddr_un addr;
- fio_socklen_t len;
+ socklen_t len;
mode_t mode;
int sk;
if (sk < 0)
return sk;
- if (!bind_sock)
- sprintf(bind_str, "%s:%u", inet_ntoa(saddr_in.sin_addr), fio_net_port);
- else
+ if (!bind_sock) {
+ char *p, port[16];
+ const void *src;
+ int af;
+
+ if (use_ipv6) {
+ af = AF_INET6;
+ src = &saddr_in6.sin6_addr;
+ } else {
+ af = AF_INET;
+ src = &saddr_in.sin_addr;
+ }
+
+ p = (char *) inet_ntop(af, src, bind_str, sizeof(bind_str));
+
+ sprintf(port, ",%u", fio_net_port);
+ if (p)
+ strcat(p, port);
+ else
+ strcpy(bind_str, port);
+ } else
strcpy(bind_str, bind_sock);
log_info("fio: server listening on %s\n", bind_str);
return sk;
}
+/*
+ * Parse a host/ip/port string. Reads from 'str'.
+ *
+ * Outputs:
+ *
+ * For IPv4:
+ * *ptr is the host, *port is the port, inp is the destination.
+ * For IPv6:
+ * *ptr is the host, *port is the port, inp6 is the dest, and *ipv6 is 1.
+ * For local domain sockets:
+ * *ptr is the filename, *is_sock is 1.
+ */
int fio_server_parse_string(const char *str, char **ptr, int *is_sock,
- int *port, struct in_addr *inp)
+ int *port, struct in_addr *inp,
+ struct in6_addr *inp6, int *ipv6)
{
+ const char *host = str;
+ char *portp;
+ int ret, lport = 0;
+
*ptr = NULL;
*is_sock = 0;
*port = fio_net_port;
+ *ipv6 = 0;
if (!strncmp(str, "sock:", 5)) {
*ptr = strdup(str + 5);
*is_sock = 1;
- } else {
- const char *host = str;
- char *portp;
- int lport = 0;
-
- /*
- * Is it ip:<ip or host>:port
- */
- if (!strncmp(host, "ip:", 3))
- host += 3;
- else if (host[0] == ':') {
- /* String is :port */
- host++;
- lport = atoi(host);
+
+ return 0;
+ }
+
+ /*
+ * Is it ip:<ip or host>:port
+ */
+ if (!strncmp(host, "ip:", 3))
+ host += 3;
+ else if (!strncmp(host, "ip4:", 4))
+ host += 4;
+ else if (!strncmp(host, "ip6:", 4)) {
+ host += 4;
+ *ipv6 = 1;
+ } else if (host[0] == ':') {
+ /* String is :port */
+ host++;
+ lport = atoi(host);
+ if (!lport || lport > 65535) {
+ log_err("fio: bad server port %u\n", port);
+ return 1;
+ }
+ /* no hostname given, we are done */
+ *port = lport;
+ return 0;
+ }
+
+ /*
+ * If no port seen yet, check if there's a last ':' at the end
+ */
+ if (!lport) {
+ portp = strchr(host, ',');
+ if (portp) {
+ *portp = '\0';
+ portp++;
+ lport = atoi(portp);
if (!lport || lport > 65535) {
log_err("fio: bad server port %u\n", port);
return 1;
}
- /* no hostname given, we are done */
- *port = lport;
- return 0;
}
+ }
- /*
- * If no port seen yet, check if there's a last ':' at the end
- */
- if (!lport) {
- portp = strchr(host, ':');
- if (portp) {
- *portp = '\0';
- portp++;
- lport = atoi(portp);
- if (!lport || lport > 65535) {
- log_err("fio: bad server port %u\n", port);
- return 1;
- }
- }
- }
+ if (lport)
+ *port = lport;
+
+ if (!strlen(host))
+ return 0;
- if (lport)
- *port = lport;
+ *ptr = strdup(host);
- *ptr = strdup(host);
+ if (*ipv6)
+ ret = inet_pton(AF_INET6, host, inp6);
+ else
+ ret = inet_pton(AF_INET, host, inp);
- if (inet_aton(host, inp) != 1) {
- struct hostent *hent;
+ if (ret != 1) {
+ struct hostent *hent;
- hent = gethostbyname(host);
- if (!hent) {
+ hent = gethostbyname(host);
+ if (!hent) {
+ log_err("fio: failed to resolve <%s>\n", host);
+ free(*ptr);
+ *ptr = NULL;
+ return 1;
+ }
+
+ if (*ipv6) {
+ if (hent->h_addrtype != AF_INET6) {
+ log_info("fio: falling back to IPv4\n");
+ *ipv6 = 0;
+ } else
+ memcpy(inp6, hent->h_addr_list[0], 16);
+ }
+ if (!*ipv6) {
+ if (hent->h_addrtype != AF_INET) {
+ log_err("fio: lookup type mismatch\n");
free(*ptr);
*ptr = NULL;
return 1;
}
-
- memcpy(inp, hent->h_addr, 4);
+ memcpy(inp, hent->h_addr_list[0], 4);
}
}
goto out;
ret = fio_server_parse_string(fio_server_arg, &bind_sock, &is_sock,
- &port, &saddr_in.sin_addr);
+ &port, &saddr_in.sin_addr,
+ &saddr_in6.sin6_addr, &use_ipv6);
if (!is_sock && bind_sock) {
free(bind_sock);
out:
fio_net_port = port;
saddr_in.sin_port = htons(port);
+ saddr_in6.sin6_port = htons(port);
return ret;
}
pid_t pid;
int ret;
+#if defined(WIN32)
+ WSADATA wsd;
+ WSAStartup(MAKEWORD(2,2), &wsd);
+#endif
+
if (!pidfile)
return fio_server();