static struct json_object *root = NULL;
static struct json_array *clients_array = NULL;
static struct json_array *du_array = NULL;
-static int do_output_all_clients;
#define FIO_CLIENT_HASH_BITS 7
#define FIO_CLIENT_HASH_SZ (1 << FIO_CLIENT_HASH_BITS)
free(client->argv);
if (client->name)
free(client->name);
- while (client->nr_ini_file)
- free(client->ini_file[--client->nr_ini_file]);
- if (client->ini_file)
- free(client->ini_file);
+ while (client->nr_files) {
+ struct client_file *cf = &client->files[--client->nr_files];
+
+ free(cf->file);
+ }
+ if (client->files)
+ free(client->files);
if (!client->did_stat)
- sum_stat_clients -= client->nr_stat;
+ sum_stat_clients--;
free(client);
}
return NULL;
}
-void fio_client_add_ini_file(void *cookie, const char *ini_file)
+int fio_client_add_ini_file(void *cookie, const char *ini_file, int remote)
{
struct fio_client *client = cookie;
+ struct client_file *cf;
size_t new_size;
+ void *new_files;
+
+ if (!client)
+ return 1;
dprint(FD_NET, "client <%s>: add ini %s\n", client->hostname, ini_file);
- new_size = (client->nr_ini_file + 1) * sizeof(char *);
- client->ini_file = realloc(client->ini_file, new_size);
- client->ini_file[client->nr_ini_file] = strdup(ini_file);
- client->nr_ini_file++;
+ new_size = (client->nr_files + 1) * sizeof(struct client_file);
+ new_files = realloc(client->files, new_size);
+ if (!new_files)
+ return 1;
+
+ client->files = new_files;
+ cf = &client->files[client->nr_files];
+ cf->file = strdup(ini_file);
+ cf->remote = remote;
+ client->nr_files++;
+ return 0;
}
int fio_client_add(struct client_ops *ops, const char *hostname, void **cookie)
return flist_empty(&client_list);
}
+static int __fio_client_send_remote_ini(struct fio_client *client,
+ const char *filename)
+{
+ struct cmd_load_file_pdu *pdu;
+ size_t p_size;
+ int ret;
+
+ dprint(FD_NET, "send remote ini %s to %s\n", filename, client->hostname);
+
+ p_size = sizeof(*pdu) + strlen(filename) + 1;
+ pdu = malloc(p_size);
+ memset(pdu, 0, p_size);
+ pdu->name_len = strlen(filename);
+ strcpy((char *) pdu->file, filename);
+ pdu->client_type = cpu_to_le16((uint16_t) client->type);
+
+ client->sent_job = 1;
+ ret = fio_net_send_cmd(client->fd, FIO_NET_CMD_LOAD_FILE, pdu, p_size,NULL, NULL);
+ free(pdu);
+ return ret;
+}
+
/*
* Send file contents to server backend. We could use sendfile(), but to remain
* more portable lets just read/write the darn thing.
*/
-static int __fio_client_send_ini(struct fio_client *client, const char *filename)
+static int __fio_client_send_local_ini(struct fio_client *client,
+ const char *filename)
{
struct cmd_job_pdu *pdu;
size_t p_size;
return ret;
}
-int fio_client_send_ini(struct fio_client *client, const char *filename)
+int fio_client_send_ini(struct fio_client *client, const char *filename,
+ int remote)
{
int ret;
- ret = __fio_client_send_ini(client, filename);
+ if (!remote)
+ ret = __fio_client_send_local_ini(client, filename);
+ else
+ ret = __fio_client_send_remote_ini(client, filename);
+
if (!ret)
client->sent_job = 1;
return ret;
}
+static int fio_client_send_cf(struct fio_client *client,
+ struct client_file *cf)
+{
+ return fio_client_send_ini(client, cf->file, cf->remote);
+}
+
int fio_clients_send_ini(const char *filename)
{
struct fio_client *client;
flist_for_each_safe(entry, tmp, &client_list) {
client = flist_entry(entry, struct fio_client, list);
- if (client->nr_ini_file) {
+ if (client->nr_files) {
int i;
- for (i = 0; i < client->nr_ini_file; i++) {
- const char *ini = client->ini_file[i];
+ for (i = 0; i < client->nr_files; i++) {
+ struct client_file *cf;
- if (fio_client_send_ini(client, ini)) {
+ cf = &client->files[i];
+
+ if (fio_client_send_cf(client, cf)) {
remove_client(client);
break;
}
}
- } else if (!filename || fio_client_send_ini(client, filename))
+ }
+ if (client->sent_job)
+ continue;
+ if (!filename || fio_client_send_ini(client, filename, 0))
remove_client(client);
}
for (i = 0; i < DDIR_RWDIR_CNT; i++) {
dst->total_io_u[i] = le64_to_cpu(src->total_io_u[i]);
dst->short_io_u[i] = le64_to_cpu(src->short_io_u[i]);
+ dst->drop_io_u[i] = le64_to_cpu(src->drop_io_u[i]);
}
dst->total_submit = le64_to_cpu(src->total_submit);
}
static void json_object_add_client_info(struct json_object *obj,
-struct fio_client *client)
+ struct fio_client *client)
{
- json_object_add_value_string(obj, "hostname", client->hostname);
+ const char *hostname = client->hostname ? client->hostname : "";
+
+ json_object_add_value_string(obj, "hostname", hostname);
json_object_add_value_int(obj, "port", client->port);
}
json_array_add_value_object(clients_array, tsobj);
}
- if (!do_output_all_clients)
+ if (sum_stat_clients <= 1)
return;
sum_thread_stats(&client_ts, &p->ts, sum_stat_nr);
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 = fio_uint64_to_double(__le64_to_cpu(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)
client->jobs = le32_to_cpu(pdu->jobs);
client->nr_stat = le32_to_cpu(pdu->stat_outputs);
- if (sum_stat_clients > 1)
- do_output_all_clients = 1;
-
sum_stat_clients += client->nr_stat;
}
ret->compressed = le32_to_cpu(ret->compressed);
ret->log_offset = le32_to_cpu(ret->log_offset);
- samples = &ret->samples[i];
+ samples = &ret->samples[0];
for (i = 0; i < ret->nr_samples; i++) {
struct io_sample *s;
s = __get_sample(samples, ret->log_offset, i);
- s->time = le64_to_cpu(s->time);
- s->val = le64_to_cpu(s->val);
- s->ddir = le32_to_cpu(s->ddir);
- s->bs = le32_to_cpu(s->bs);
+ s->time = le64_to_cpu(s->time);
+ s->val = le64_to_cpu(s->val);
+ s->__ddir = le32_to_cpu(s->__ddir);
+ s->bs = le32_to_cpu(s->bs);
if (ret->log_offset) {
struct io_sample_offset *so = (void *) s;
projects / fio.git / blobdiff