Move Windows port to MinGW

[fio.git] / client.c

diff --git a/client.c b/client.c
index 56accf08d68071f2d6bc124f41e542725f5498c2..ace70d357b97a3e882bacfea811e265779a85b44 100644 (file)
--- a/client.c
+++ b/client.c
@@ -29,8 +29,11 @@ struct fio_client {
        struct flist_head list;
        struct flist_head hash_list;
        struct flist_head arg_list;
-       struct sockaddr_in addr;
-       struct sockaddr_un addr_un;
+       union {
+               struct sockaddr_in addr;
+               struct sockaddr_in6 addr6;
+               struct sockaddr_un addr_un;
+       };
        char *hostname;
        int port;
        int fd;
@@ -42,6 +45,9 @@ struct fio_client {
        int skip_newline;
        int is_sock;
        int disk_stats_shown;
+       unsigned int jobs;
+       int error;
+       int ipv6;
 
        struct flist_head eta_list;
        struct client_eta *eta_in_flight;
@@ -58,8 +64,9 @@ enum {
        Client_created          = 0,
        Client_connected        = 1,
        Client_started          = 2,
-       Client_stopped          = 3,
-       Client_exited           = 4,
+       Client_running          = 3,
+       Client_stopped          = 4,
+       Client_exited           = 5,
 };
 
 static FLIST_HEAD(client_list);
@@ -201,7 +208,9 @@ int fio_client_add(const char *hostname, void **cookie)
 
        if (fio_server_parse_string(hostname, &client->hostname,
                                        &client->is_sock, &client->port,
-                                       &client->addr.sin_addr))
+                                       &client->addr.sin_addr,
+                                       &client->addr6.sin6_addr,
+                                       &client->ipv6))
                return -1;
 
        client->fd = -1;
@@ -217,18 +226,31 @@ int fio_client_add(const char *hostname, void **cookie)
 
 static int fio_client_connect_ip(struct fio_client *client)
 {
-       int fd;
-
-       client->addr.sin_family = AF_INET;
-       client->addr.sin_port = htons(client->port);
+       struct sockaddr *addr;
+       fio_socklen_t socklen;
+       int fd, domain;
+
+       if (client->ipv6) {
+               client->addr6.sin6_family = AF_INET6;
+               client->addr6.sin6_port = htons(client->port);
+               domain = AF_INET6;
+               addr = (struct sockaddr *) &client->addr6;
+               socklen = sizeof(client->addr6);
+       } else {
+               client->addr.sin_family = AF_INET;
+               client->addr.sin_port = htons(client->port);
+               domain = AF_INET;
+               addr = (struct sockaddr *) &client->addr;
+               socklen = sizeof(client->addr);
+       }
 
-       fd = socket(AF_INET, SOCK_STREAM, 0);
+       fd = socket(domain, SOCK_STREAM, 0);
        if (fd < 0) {
                log_err("fio: socket: %s\n", strerror(errno));
                return -1;
        }
 
-       if (connect(fd, (struct sockaddr *) &client->addr, sizeof(client->addr)) < 0) {
+       if (connect(fd, addr, socklen) < 0) {
                log_err("fio: connect: %s\n", strerror(errno));
                log_err("fio: failed to connect to %s:%u\n", client->hostname,
                                                                client->port);
@@ -382,6 +404,11 @@ int fio_clients_connect(void)
        struct flist_head *entry, *tmp;
        int ret;
 
+#ifdef WIN32
+       WSADATA wsd;
+       WSAStartup(MAKEWORD(2,2), &wsd);
+#endif
+
        dprint(FD_NET, "client: connect all\n");
 
        client_signal_handler();
@@ -616,7 +643,7 @@ static void convert_agg(struct disk_util_agg *agg)
        agg->io_ticks           = le32_to_cpu(agg->io_ticks);
        agg->time_in_queue      = le32_to_cpu(agg->time_in_queue);
        agg->slavecount         = le32_to_cpu(agg->slavecount);
-       agg->max_util.u.f       = __le64_to_cpu(fio_uint64_to_double(agg->max_util.u.i));
+       agg->max_util.u.f       = fio_uint64_to_double(__le64_to_cpu(agg->max_util.u.i));
 }
 
 static void convert_dus(struct disk_util_stat *dus)
@@ -647,7 +674,7 @@ static void handle_du(struct fio_client *client, struct fio_net_cmd *cmd)
                log_info("\nDisk stats (read/write):\n");
        }
 
-       print_disk_util(&du->dus, &du->agg);
+       print_disk_util(&du->dus, &du->agg, terse_output);
 }
 
 static void convert_jobs_eta(struct jobs_eta *je)
@@ -769,6 +796,25 @@ static void handle_probe(struct fio_client *client, struct fio_net_cmd *cmd)
                client->name = strdup((char *) probe->hostname);
 }
 
+static void handle_start(struct fio_client *client, struct fio_net_cmd *cmd)
+{
+       struct cmd_start_pdu *pdu = (struct cmd_start_pdu *) cmd->payload;
+
+       client->state = Client_started;
+       client->jobs = le32_to_cpu(pdu->jobs);
+}
+
+static void handle_stop(struct fio_client *client, struct fio_net_cmd *cmd)
+{
+       struct cmd_end_pdu *pdu = (struct cmd_end_pdu *) cmd->payload;
+
+       client->state = Client_stopped;
+       client->error = le32_to_cpu(pdu->error);
+
+       if (client->error)
+               log_info("client <%s>: exited with error %d\n", client->hostname, client->error);
+}
+
 static int handle_client(struct fio_client *client)
 {
        struct fio_net_cmd *cmd;
@@ -824,12 +870,16 @@ static int handle_client(struct fio_client *client)
                handle_probe(client, cmd);
                free(cmd);
                break;
+       case FIO_NET_CMD_RUN:
+               client->state = Client_running;
+               free(cmd);
+               break;
        case FIO_NET_CMD_START:
-               client->state = Client_started;
+               handle_start(client, cmd);
                free(cmd);
                break;
        case FIO_NET_CMD_STOP:
-               client->state = Client_stopped;
+               handle_stop(client, cmd);
                free(cmd);
                break;
        default:
@@ -861,6 +911,8 @@ static void request_client_etas(void)
                        skipped++;
                        continue;
                }
+               if (client->state != Client_running)
+                       continue;
 
                assert(!client->eta_in_flight);
                flist_add_tail(&client->eta_list, &eta_list);
@@ -929,7 +981,7 @@ int fio_handle_clients(void)
        struct fio_client *client;
        struct flist_head *entry;
        struct pollfd *pfds;
-       int i, ret = 0;
+       int i, ret = 0, retval = 0;
 
        gettimeofday(&eta_tv, NULL);
 
@@ -986,10 +1038,12 @@ int fio_handle_clients(void)
                                log_info("client: host=%s disconnected\n",
                                                client->hostname);
                                remove_client(client);
-                       }
+                               retval = 1;
+                       } else if (client->error)
+                               retval = 1;
                }
        }
 
        free(pfds);
-       return 0;
+       return retval;
 }