projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
engines/cpu: fix potential overflow in thinktime calculation
[fio.git]
/
gettime.c
diff --git
a/gettime.c
b/gettime.c
index 87fc29b50163252e412b85e969aad5de66b7f12b..7702193dc0b7eced79b5ade5b9a9d07553b9a10e 100644
(file)
--- a/
gettime.c
+++ b/
gettime.c
@@
-237,12
+237,11
@@
static unsigned long get_cycles_per_msec(void)
c_s = get_cpu_clock();
do {
__fio_gettime(&e);
c_s = get_cpu_clock();
do {
__fio_gettime(&e);
+ c_e = get_cpu_clock();
elapsed = utime_since(&s, &e);
elapsed = utime_since(&s, &e);
- if (elapsed >= 1280) {
- c_e = get_cpu_clock();
+ if (elapsed >= 1280)
break;
break;
- }
} while (1);
fio_clock_source = old_cs;
} while (1);
fio_clock_source = old_cs;
@@
-373,7
+372,7
@@
static int calibrate_cpu_clock(void)
#endif // ARCH_HAVE_CPU_CLOCK
#ifndef CONFIG_TLS_THREAD
#endif // ARCH_HAVE_CPU_CLOCK
#ifndef CONFIG_TLS_THREAD
-void fio_local_clock_init(
int is_threa
d)
+void fio_local_clock_init(
voi
d)
{
struct tv_valid *t;
{
struct tv_valid *t;
@@
-389,7
+388,7
@@
static void kill_tv_tls_key(void *data)
free(data);
}
#else
free(data);
}
#else
-void fio_local_clock_init(
int is_threa
d)
+void fio_local_clock_init(
voi
d)
{
}
#endif
{
}
#endif