projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make normal distribution takes deviations as a percentage
[fio.git]
/
server.c
diff --git
a/server.c
b/server.c
index c4ab906f74f38e579ee7eb3d838f95abbdef0fc5..c2498497ef214bc28804e91d960f4e913226e0e5 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;
@@
-1178,14
+1178,14
@@
static void convert_agg(struct disk_util_agg *dst, struct disk_util_agg *src)
int i;
for (i = 0; i < 2; i++) {
int i;
for (i = 0; i < 2; i++) {
- dst->ios[i] = cpu_to_le
32
(src->ios[i]);
- dst->merges[i] = cpu_to_le
32
(src->merges[i]);
+ dst->ios[i] = cpu_to_le
64
(src->ios[i]);
+ dst->merges[i] = cpu_to_le
64
(src->merges[i]);
dst->sectors[i] = cpu_to_le64(src->sectors[i]);
dst->sectors[i] = cpu_to_le64(src->sectors[i]);
- dst->ticks[i] = cpu_to_le
32
(src->ticks[i]);
+ dst->ticks[i] = cpu_to_le
64
(src->ticks[i]);
}
}
- dst->io_ticks = cpu_to_le
32
(src->io_ticks);
- dst->time_in_queue = cpu_to_le
32
(src->time_in_queue);
+ dst->io_ticks = cpu_to_le
64
(src->io_ticks);
+ dst->time_in_queue = cpu_to_le
64
(src->time_in_queue);
dst->slavecount = cpu_to_le32(src->slavecount);
dst->max_util.u.i = cpu_to_le64(fio_double_to_uint64(src->max_util.u.f));
}
dst->slavecount = cpu_to_le32(src->slavecount);
dst->max_util.u.i = cpu_to_le64(fio_double_to_uint64(src->max_util.u.f));
}
@@
-1198,14
+1198,14
@@
static void convert_dus(struct disk_util_stat *dst, struct disk_util_stat *src)
strncpy((char *) dst->name, (char *) src->name, FIO_DU_NAME_SZ - 1);
for (i = 0; i < 2; i++) {
strncpy((char *) dst->name, (char *) src->name, FIO_DU_NAME_SZ - 1);
for (i = 0; i < 2; i++) {
- dst->s.ios[i] = cpu_to_le
32
(src->s.ios[i]);
- dst->s.merges[i] = cpu_to_le
32
(src->s.merges[i]);
+ dst->s.ios[i] = cpu_to_le
64
(src->s.ios[i]);
+ dst->s.merges[i] = cpu_to_le
64
(src->s.merges[i]);
dst->s.sectors[i] = cpu_to_le64(src->s.sectors[i]);
dst->s.sectors[i] = cpu_to_le64(src->s.sectors[i]);
- dst->s.ticks[i] = cpu_to_le
32
(src->s.ticks[i]);
+ dst->s.ticks[i] = cpu_to_le
64
(src->s.ticks[i]);
}
}
- dst->s.io_ticks = cpu_to_le
32
(src->s.io_ticks);
- dst->s.time_in_queue = cpu_to_le
32
(src->s.time_in_queue);
+ dst->s.io_ticks = cpu_to_le
64
(src->s.io_ticks);
+ dst->s.time_in_queue = cpu_to_le
64
(src->s.time_in_queue);
dst->s.msec = cpu_to_le64(src->s.msec);
}
dst->s.msec = cpu_to_le64(src->s.msec);
}
@@
-1431,6
+1431,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;
}