#include <sys/types.h>
#include <sys/stat.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 <signal.h>
#include "fio.h"
#include "server.h"
struct sockaddr_in addr;
char *hostname;
int fd;
+
+ int state;
+ int skip_newline;
+
+ uint16_t argc;
+ char **argv;
+};
+
+enum {
+ Client_created = 0,
+ Client_connected = 1,
+ Client_started = 2,
+ Client_stopped = 3,
+ Client_exited = 4,
};
static FLIST_HEAD(client_list);
+static int handle_client(struct fio_client *client, int one);
+
static struct fio_client *find_client_by_fd(int fd)
{
struct fio_client *client;
return NULL;
}
-#if 0
static struct fio_client *find_client_by_name(const char *name)
{
struct fio_client *client;
return NULL;
}
-#endif
static void remove_client(struct fio_client *client)
{
- dprint(FD_NET, "removed client <%s>\n", client->hostname);
+ dprint(FD_NET, "client: removed <%s>\n", client->hostname);
flist_del(&client->list);
nr_clients--;
+
free(client->hostname);
+ if (client->argv)
+ free(client->argv);
+
free(client);
}
+static void __fio_client_add_cmd_option(struct fio_client *client,
+ const char *opt)
+{
+ int index;
+
+ index = client->argc++;
+ client->argv = realloc(client->argv, sizeof(char *) * client->argc);
+ client->argv[index] = strdup(opt);
+ dprint(FD_NET, "client: add cmd %d: %s\n", index, opt);
+}
+
+void fio_client_add_cmd_option(const char *hostname, const char *opt)
+{
+ struct fio_client *client;
+
+ if (!hostname || !opt)
+ return;
+
+ client = find_client_by_name(hostname);
+ if (!client) {
+ log_err("fio: unknown client %s\n", hostname);
+ return;
+ }
+
+ __fio_client_add_cmd_option(client, opt);
+}
+
void fio_client_add(const char *hostname)
{
struct fio_client *client;
- dprint(FD_NET, "added client <%s>\n", hostname);
+ dprint(FD_NET, "client: added <%s>\n", hostname);
client = malloc(sizeof(*client));
memset(client, 0, sizeof(*client));
+
client->hostname = strdup(hostname);
client->fd = -1;
+
+ __fio_client_add_cmd_option(client, "fio");
+
flist_add(&client->list, &client_list);
nr_clients++;
}
{
int fd;
- dprint(FD_NET, "connect to host %s\n", client->hostname);
+ dprint(FD_NET, "client: connect to host %s\n", client->hostname);
memset(&client->addr, 0, sizeof(client->addr));
client->addr.sin_family = AF_INET;
}
client->fd = fd;
+ client->state = Client_connected;
return 0;
}
struct flist_head *entry;
struct fio_client *client;
+ dprint(FD_NET, "client: terminate clients\n");
+
flist_for_each(entry, &client_list) {
client = flist_entry(entry, struct fio_client, list);
static void sig_int(int sig)
{
+ dprint(FD_NET, "client: got sign %d\n", sig);
fio_clients_terminate();
}
sigaction(SIGTERM, &act, NULL);
}
+static void probe_client(struct fio_client *client)
+{
+ dprint(FD_NET, "client: send probe\n");
+
+ fio_net_send_simple_cmd(client->fd, FIO_NET_CMD_PROBE, 0);
+ handle_client(client, 1);
+}
+
+static int send_client_cmd_line(struct fio_client *client)
+{
+ struct cmd_line_pdu *pdu;
+ int i, ret;
+
+ dprint(FD_NET, "client: send cmdline %d\n", client->argc);
+
+ pdu = malloc(sizeof(*pdu));
+ for (i = 0; i < client->argc; i++)
+ strcpy((char *) pdu->argv[i], client->argv[i]);
+
+ pdu->argc = cpu_to_le16(client->argc);
+ ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOBLINE, pdu, sizeof(*pdu));
+ free(pdu);
+ return ret;
+}
+
int fio_clients_connect(void)
{
struct fio_client *client;
struct flist_head *entry, *tmp;
int ret;
+ dprint(FD_NET, "client: connect all\n");
+
client_signal_handler();
flist_for_each_safe(entry, tmp, &client_list) {
client = flist_entry(entry, struct fio_client, list);
ret = fio_client_connect(client);
- if (ret)
+ if (ret) {
remove_client(client);
+ continue;
+ }
+
+ probe_client(client);
+
+ if (client->argc > 1)
+ send_client_cmd_line(client);
}
return !nr_clients;
}
-static int send_file_buf(struct fio_client *client, char *buf, off_t size)
-{
- return fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, buf, size);
-}
-
/*
* Send file contents to server backend. We could use sendfile(), but to remain
* more portable lets just read/write the darn thing.
continue;
} while (1);
- ret = send_file_buf(client, buf, sb.st_size);
+ if (len) {
+ log_err("fio: failed reading job file %s\n", filename);
+ return 1;
+ }
+
+ ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_JOB, buf, sb.st_size);
free(buf);
return ret;
}
dst->max_val = le64_to_cpu(src->max_val);
dst->min_val = le64_to_cpu(src->min_val);
dst->samples = le64_to_cpu(src->samples);
- /* FIXME */
- dst->mean = __le64_to_cpu(src->mean);
- dst->S = __le64_to_cpu(src->S);
+
+ /*
+ * Floats arrive as IEEE 754 encoded uint64_t, convert back to double
+ */
+ dst->mean.u.f = fio_uint64_to_double(le64_to_cpu(dst->mean.u.i));
+ dst->S.u.f = fio_uint64_to_double(le64_to_cpu(dst->S.u.i));
}
static void convert_ts(struct thread_stat *dst, struct thread_stat *src)
dst->minf = le64_to_cpu(src->minf);
dst->majf = le64_to_cpu(src->majf);
dst->clat_percentiles = le64_to_cpu(src->clat_percentiles);
- dst->percentile_list = NULL;
+
+ for (i = 0; i < FIO_IO_U_LIST_MAX_LEN; i++) {
+ fio_fp64_t *fps = &src->percentile_list[i];
+ fio_fp64_t *fpd = &dst->percentile_list[i];
+
+ fpd->u.f = fio_uint64_to_double(le64_to_cpu(fps->u.i));
+ }
for (i = 0; i < FIO_IO_U_MAP_NR; i++) {
dst->io_u_map[i] = le32_to_cpu(src->io_u_map[i]);
display_thread_status(je);
}
-static int handle_client(struct fio_client *client)
+static void handle_probe(struct fio_net_cmd *cmd)
+{
+ struct cmd_probe_pdu *probe = (struct cmd_probe_pdu *) cmd->payload;
+
+ log_info("Probe: hostname=%s, be=%u, fio ver %u.%u.%u\n",
+ probe->hostname, probe->bigendian, probe->fio_major,
+ probe->fio_minor, probe->fio_patch);
+}
+
+static int handle_client(struct fio_client *client, int one)
{
struct fio_net_cmd *cmd;
int done = 0;
- while ((cmd = fio_net_recv_cmd(client->fd)) != NULL) {
+ dprint(FD_NET, "client: handle %s\n", client->hostname);
+
+ while ((cmd = fio_net_recv_cmd(client->fd, 1)) != NULL) {
dprint(FD_NET, "%s: got cmd op %d\n", client->hostname,
cmd->opcode);
switch (cmd->opcode) {
- case FIO_NET_CMD_ACK:
- free(cmd);
- break;
case FIO_NET_CMD_QUIT:
remove_client(client);
free(cmd);
done = 1;
break;
- case FIO_NET_CMD_TEXT:
- fwrite(cmd->payload, cmd->pdu_len, 1, stdout);
- fflush(stdout);
+ case FIO_NET_CMD_TEXT: {
+ const char *buf = (const char *) cmd->payload;
+ int fio_unused ret;
+
+ if (!client->skip_newline)
+ fprintf(f_out, "Client <%s>: ", client->hostname);
+ ret = fwrite(buf, cmd->pdu_len, 1, f_out);
+ fflush(f_out);
+ client->skip_newline = strchr(buf, '\n') == NULL;
free(cmd);
break;
+ }
case FIO_NET_CMD_TS:
handle_ts(cmd);
free(cmd);
handle_eta(cmd);
free(cmd);
break;
+ case FIO_NET_CMD_PROBE:
+ handle_probe(cmd);
+ free(cmd);
+ break;
+ case FIO_NET_CMD_START:
+ client->state = Client_started;
+ free(cmd);
+ break;
+ case FIO_NET_CMD_STOP:
+ client->state = Client_stopped;
+ free(cmd);
+ break;
default:
log_err("fio: unknown client op: %d\n", cmd->opcode);
free(cmd);
break;
}
- if (done)
+ if (done || one)
break;
}
assert(i == nr_clients);
- ret = poll(pfds, nr_clients, 100);
- if (ret < 0) {
- if (errno == EINTR)
+ do {
+ ret = poll(pfds, nr_clients, 100);
+ if (ret < 0) {
+ if (errno == EINTR)
+ continue;
+ log_err("fio: poll clients: %s\n", strerror(errno));
+ break;
+ } else if (!ret)
continue;
- log_err("fio: poll clients: %s\n", strerror(errno));
- break;
- } else if (!ret)
- continue;
+ } while (ret <= 0);
for (i = 0; i < nr_clients; i++) {
if (!(pfds[i].revents & POLLIN))
log_err("fio: unknown client\n");
continue;
}
- handle_client(client);
+ handle_client(client, 0);
}
}
projects / fio.git / blobdiff