}
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);
}
/*
* Get header first, it's not compressed
*/
- nr_samples = le32_to_cpu(pdu->nr_samples);
+ nr_samples = le64_to_cpu(pdu->nr_samples);
- total = nr_samples * __log_entry_sz(pdu->log_offset);
+ total = nr_samples * __log_entry_sz(le32_to_cpu(pdu->log_offset));
ret = malloc(total + sizeof(*pdu));
ret->nr_samples = nr_samples;
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;