projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lfsr-test: print total elapsed time correctly
[fio.git]
/
server.c
diff --git
a/server.c
b/server.c
index ede291fab8f754c4459107d94e97f7ff4870b284..93c0987febaf486c3d08f92f3797782300b2acff 100644
(file)
--- a/
server.c
+++ b/
server.c
@@
-333,7
+333,7
@@
static uint64_t alloc_reply(uint64_t tag, uint16_t opcode)
reply = calloc(1, sizeof(*reply));
INIT_FLIST_HEAD(&reply->list);
reply = calloc(1, sizeof(*reply));
INIT_FLIST_HEAD(&reply->list);
-
gettimeofday
(&reply->tv, NULL);
+
fio_gettime
(&reply->tv, NULL);
reply->saved_tag = tag;
reply->opcode = opcode;
reply->saved_tag = tag;
reply->opcode = opcode;
@@
-1158,6
+1158,10
@@
void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
p.ts.latency_window = cpu_to_le64(ts->latency_window);
p.ts.latency_percentile.u.i = cpu_to_le64(fio_double_to_uint64(ts->latency_percentile.u.f));
p.ts.latency_window = cpu_to_le64(ts->latency_window);
p.ts.latency_percentile.u.i = cpu_to_le64(fio_double_to_uint64(ts->latency_percentile.u.f));
+ p.ts.nr_block_infos = le64_to_cpu(ts->nr_block_infos);
+ for (i = 0; i < p.ts.nr_block_infos; i++)
+ p.ts.block_infos[i] = le32_to_cpu(ts->block_infos[i]);
+
convert_gs(&p.rs, rs);
fio_net_send_cmd(server_fd, FIO_NET_CMD_TS, &p, sizeof(p), NULL, NULL);
convert_gs(&p.rs, rs);
fio_net_send_cmd(server_fd, FIO_NET_CMD_TS, &p, sizeof(p), NULL, NULL);
@@
-1431,6
+1435,7
@@
fail:
*datap = data;
sfree(rep->data);
*datap = data;
sfree(rep->data);
+ __fio_mutex_remove(&rep->lock);
sfree(rep);
return 0;
}
sfree(rep);
return 0;
}