projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
t/zbd: Fix test 2 and 3 result handling
[fio.git]
/
gettime.c
diff --git
a/gettime.c
b/gettime.c
index 57c66f7e6fbc6a1d8688cbc2d4b6ee0f370c8930..272a3e6244527c27d59a06ff99fb4871424a063b 100644
(file)
--- a/
gettime.c
+++ b/
gettime.c
@@
-2,16
+2,9
@@
* Clock functions
*/
* Clock functions
*/
-#include <unistd.h>
#include <math.h>
#include <math.h>
-#include <sys/time.h>
-#include <time.h>
#include "fio.h"
#include "fio.h"
-#include "fio_sem.h"
-#include "smalloc.h"
-
-#include "hash.h"
#include "os/os.h"
#if defined(ARCH_HAVE_CPU_CLOCK)
#include "os/os.h"
#if defined(ARCH_HAVE_CPU_CLOCK)
@@
-244,16
+237,15
@@
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);
- if (elapsed >= 1280) {
- c_e = get_cpu_clock();
+ elapsed = ntime_since(&s, &e);
+ if (elapsed >= 1280000)
break;
break;
- }
} while (1);
fio_clock_source = old_cs;
} while (1);
fio_clock_source = old_cs;
- return (c_e - c_s) * 1000 / elapsed;
+ return (c_e - c_s) * 1000
000
/ elapsed;
}
#define NR_TIME_ITERS 50
}
#define NR_TIME_ITERS 50
@@
-306,10
+298,10
@@
static int calibrate_cpu_clock(void)
avg /= samples;
cycles_per_msec = avg;
avg /= samples;
cycles_per_msec = avg;
- dprint(FD_TIME, "avg: %llu\n", (unsigned long long) avg);
- dprint(FD_TIME, "min=%llu, max=%llu, mean=%f, S=%f\n",
+ dprint(FD_TIME, "min=%llu, max=%llu, mean=%f, S=%f, N=%d\n",
(unsigned long long) minc,
(unsigned long long) minc,
- (unsigned long long) maxc, mean, S);
+ (unsigned long long) maxc, mean, S, NR_TIME_ITERS);
+ dprint(FD_TIME, "trimmed mean=%llu, N=%d\n", (unsigned long long) avg, samples);
max_ticks = MAX_CLOCK_SEC * cycles_per_msec * 1000ULL;
max_mult = ULLONG_MAX / max_ticks;
max_ticks = MAX_CLOCK_SEC * cycles_per_msec * 1000ULL;
max_mult = ULLONG_MAX / max_ticks;
@@
-380,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;
@@
-396,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