#include "fio_version.h"
-int fio_net_port = 8765;
+int fio_net_port = FIO_NET_PORT;
int exit_backend = 0;
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,
spdu.jobs = cpu_to_le32(thread_number);
fio_net_send_cmd(server_fd, FIO_NET_CMD_START, &spdu, sizeof(spdu), 0);
- ret = exec_run();
+ ret = fio_backend();
epdu.error = ret;
fio_net_send_cmd(server_fd, FIO_NET_CMD_STOP, &epdu, sizeof(epdu), 0);
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;
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->m_rate[i] = cpu_to_le32(je->m_rate[i]);
+ je->t_rate[i] = cpu_to_le32(je->t_rate[i]);
+ je->m_iops[i] = cpu_to_le32(je->m_iops[i]);
+ je->t_iops[i] = cpu_to_le32(je->t_iops[i]);
je->rate[i] = cpu_to_le32(je->rate[i]);
je->iops[i] = cpu_to_le32(je->iops[i]);
}
void fio_server_idle_loop(void)
{
- if (!first_cmd_check)
+ if (!first_cmd_check) {
fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_RUN, 0, NULL);
+ first_cmd_check = 1;
+ }
if (server_fd != -1)
handle_connection(server_fd, 0);
}
return sk;
}
+int fio_server_parse_host(const char *host, int *ipv6, struct in_addr *inp,
+ struct in6_addr *inp6)
+
+{
+ int ret = 0;
+
+ if (*ipv6)
+ ret = inet_pton(AF_INET6, host, inp6);
+ else
+ ret = inet_pton(AF_INET, host, inp);
+
+ if (ret != 1) {
+ struct hostent *hent;
+
+ hent = gethostbyname(host);
+ if (!hent) {
+ log_err("fio: failed to resolve <%s>\n", host);
+ return 0;
+ }
+
+ 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");
+ return 0;
+ }
+ memcpy(inp, hent->h_addr_list[0], 4);
+ }
+ ret = 1;
+ }
+
+ return !(ret == 1);
+}
+
+/*
+ * 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,
struct in6_addr *inp6, int *ipv6)
{
+ const char *host = str;
+ char *portp;
+ int lport = 0;
+
*ptr = NULL;
*is_sock = 0;
*port = fio_net_port;
if (!strncmp(str, "sock:", 5)) {
*ptr = strdup(str + 5);
*is_sock = 1;
- } else {
- const char *host = str;
- char *portp;
- int ret, lport = 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);
+
+ 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))
- goto done;
-
- *ptr = strdup(host);
-
- if (*ipv6)
- ret = inet_pton(AF_INET6, host, inp6);
- else
- ret = inet_pton(AF_INET, host, inp);
+ if (lport)
+ *port = lport;
- if (ret != 1) {
- struct hostent *hent;
+ if (!strlen(host))
+ return 0;
- hent = gethostbyname(host);
- if (!hent) {
- log_err("fio: failed to resolve <%s>\n", host);
-err:
- free(*ptr);
- *ptr = NULL;
- return 1;
- }
+ *ptr = strdup(host);
- 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");
- goto err;
- }
- memcpy(inp, hent->h_addr_list[0], 4);
- }
- }
+ if (fio_server_parse_host(*ptr, ipv6, inp, inp6)) {
+ free(*ptr);
+ *ptr = NULL;
+ return 1;
}
-done:
if (*port == 0)
*port = fio_net_port;
pid_t pid;
int ret;
+#if defined(WIN32)
+ WSADATA wsd;
+ WSAStartup(MAKEWORD(2,2), &wsd);
+#endif
+
if (!pidfile)
return fio_server();
projects / fio.git / blobdiff