projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: minor consistency and spelling changes
[fio.git]
/
gettime.c
diff --git
a/gettime.c
b/gettime.c
index 5ceb809de3ae9247a5cc7d3e2557b062541fc73f..85ba7cba8954aa3a70ae5e1faf9a76ab6ab22c72 100644
(file)
--- a/
gettime.c
+++ b/
gettime.c
@@
-13,12
+13,16
@@
#include "hash.h"
#include "os/os.h"
#include "hash.h"
#include "os/os.h"
-#if defined(ARCH_HAVE_CPU_CLOCK) && !defined(ARCH_CPU_CLOCK_CYCLES_PER_USEC)
+#if defined(ARCH_HAVE_CPU_CLOCK)
+#ifndef ARCH_CPU_CLOCK_CYCLES_PER_USEC
static unsigned long cycles_per_usec;
static unsigned long inv_cycles_per_usec;
static uint64_t max_cycles_for_mult;
static unsigned long cycles_per_usec;
static unsigned long inv_cycles_per_usec;
static uint64_t max_cycles_for_mult;
+#endif
+#ifdef ARCH_CPU_CLOCK_WRAPS
static unsigned long long cycles_start, cycles_wrap;
#endif
static unsigned long long cycles_start, cycles_wrap;
#endif
+#endif
int tsc_reliable = 0;
struct tv_valid {
int tsc_reliable = 0;
struct tv_valid {
@@
-129,7
+133,9
@@
static void fio_init gtod_init(void)
#ifdef CONFIG_CLOCK_GETTIME
static int fill_clock_gettime(struct timespec *ts)
{
#ifdef CONFIG_CLOCK_GETTIME
static int fill_clock_gettime(struct timespec *ts)
{
-#ifdef CONFIG_CLOCK_MONOTONIC
+#if defined(CONFIG_CLOCK_MONOTONIC_RAW)
+ return clock_gettime(CLOCK_MONOTONIC_RAW, ts);
+#elif defined(CONFIG_CLOCK_MONOTONIC)
return clock_gettime(CLOCK_MONOTONIC, ts);
#else
return clock_gettime(CLOCK_REALTIME, ts);
return clock_gettime(CLOCK_MONOTONIC, ts);
#else
return clock_gettime(CLOCK_REALTIME, ts);
@@
-171,6
+177,7
@@
static void __fio_gettime(struct timeval *tp)
#endif
t = get_cpu_clock();
#endif
t = get_cpu_clock();
+#ifdef ARCH_CPU_CLOCK_WRAPS
if (t < cycles_start && !cycles_wrap)
cycles_wrap = 1;
else if (cycles_wrap && t >= cycles_start && !tv->warned) {
if (t < cycles_start && !cycles_wrap)
cycles_wrap = 1;
else if (cycles_wrap && t >= cycles_start && !tv->warned) {
@@
-179,6
+186,7
@@
static void __fio_gettime(struct timeval *tp)
}
t -= cycles_start;
}
t -= cycles_start;
+#endif
tv->last_cycles = t;
tv->last_tv_valid = 1;
#ifdef ARCH_CPU_CLOCK_CYCLES_PER_USEC
tv->last_cycles = t;
tv->last_tv_valid = 1;
#ifdef ARCH_CPU_CLOCK_CYCLES_PER_USEC
@@
-224,6
+232,7
@@
static unsigned long get_cycles_per_usec(void)
struct timeval s, e;
uint64_t c_s, c_e;
enum fio_cs old_cs = fio_clock_source;
struct timeval s, e;
uint64_t c_s, c_e;
enum fio_cs old_cs = fio_clock_source;
+ uint64_t elapsed;
#ifdef CONFIG_CLOCK_GETTIME
fio_clock_source = CS_CGETTIME;
#ifdef CONFIG_CLOCK_GETTIME
fio_clock_source = CS_CGETTIME;
@@
-234,8
+243,6
@@
static unsigned long get_cycles_per_usec(void)
c_s = get_cpu_clock();
do {
c_s = get_cpu_clock();
do {
- uint64_t elapsed;
-
__fio_gettime(&e);
elapsed = utime_since(&s, &e);
__fio_gettime(&e);
elapsed = utime_since(&s, &e);
@@
-246,7
+253,7
@@
static unsigned long get_cycles_per_usec(void)
} while (1);
fio_clock_source = old_cs;
} while (1);
fio_clock_source = old_cs;
- return (c_e - c_s
+ 127) >> 7
;
+ return (c_e - c_s
) / elapsed
;
}
#define NR_TIME_ITERS 50
}
#define NR_TIME_ITERS 50
@@
-254,7
+261,7
@@
static unsigned long get_cycles_per_usec(void)
static int calibrate_cpu_clock(void)
{
double delta, mean, S;
static int calibrate_cpu_clock(void)
{
double delta, mean, S;
- uint64_t avg, cycles[NR_TIME_ITERS];
+ uint64_t
minc, maxc,
avg, cycles[NR_TIME_ITERS];
int i, samples;
cycles[0] = get_cycles_per_usec();
int i, samples;
cycles[0] = get_cycles_per_usec();
@@
-277,10
+284,14
@@
static int calibrate_cpu_clock(void)
S = sqrt(S / (NR_TIME_ITERS - 1.0));
S = sqrt(S / (NR_TIME_ITERS - 1.0));
- samples = avg = 0;
+ minc = -1ULL;
+ maxc = samples = avg = 0;
for (i = 0; i < NR_TIME_ITERS; i++) {
double this = cycles[i];
for (i = 0; i < NR_TIME_ITERS; i++) {
double this = cycles[i];
+ minc = min(cycles[i], minc);
+ maxc = max(cycles[i], maxc);
+
if ((fmax(this, mean) - fmin(this, mean)) > S)
continue;
samples++;
if ((fmax(this, mean) - fmin(this, mean)) > S)
continue;
samples++;
@@
-288,23
+299,24
@@
static int calibrate_cpu_clock(void)
}
S /= (double) NR_TIME_ITERS;
}
S /= (double) NR_TIME_ITERS;
- mean /= 10.0;
for (i = 0; i < NR_TIME_ITERS; i++)
for (i = 0; i < NR_TIME_ITERS; i++)
- dprint(FD_TIME, "cycles[%d]=%llu\n", i,
- (unsigned long long) cycles[i] / 10);
+ dprint(FD_TIME, "cycles[%d]=%llu\n", i, (unsigned long long) cycles[i]);
avg /= samples;
avg /= samples;
- avg = (avg + 5) / 10;
dprint(FD_TIME, "avg: %llu\n", (unsigned long long) avg);
dprint(FD_TIME, "avg: %llu\n", (unsigned long long) avg);
- dprint(FD_TIME, "mean=%f, S=%f\n", mean, S);
+ dprint(FD_TIME, "min=%llu, max=%llu, mean=%f, S=%f\n",
+ (unsigned long long) minc,
+ (unsigned long long) maxc, mean, S);
cycles_per_usec = avg;
inv_cycles_per_usec = 16777216UL / cycles_per_usec;
max_cycles_for_mult = ~0ULL / inv_cycles_per_usec;
dprint(FD_TIME, "inv_cycles_per_usec=%lu\n", inv_cycles_per_usec);
cycles_per_usec = avg;
inv_cycles_per_usec = 16777216UL / cycles_per_usec;
max_cycles_for_mult = ~0ULL / inv_cycles_per_usec;
dprint(FD_TIME, "inv_cycles_per_usec=%lu\n", inv_cycles_per_usec);
+#ifdef ARCH_CPU_CLOCK_WRAPS
cycles_start = get_cpu_clock();
dprint(FD_TIME, "cycles_start=%llu\n", cycles_start);
cycles_start = get_cpu_clock();
dprint(FD_TIME, "cycles_start=%llu\n", cycles_start);
+#endif
return 0;
}
#else
return 0;
}
#else
@@
-369,8
+381,7
@@
void fio_clock_init(void)
uint64_t utime_since(const struct timeval *s, const struct timeval *e)
{
uint64_t utime_since(const struct timeval *s, const struct timeval *e)
{
- long sec, usec;
- uint64_t ret;
+ int64_t sec, usec;
sec = e->tv_sec - s->tv_sec;
usec = e->tv_usec - s->tv_usec;
sec = e->tv_sec - s->tv_sec;
usec = e->tv_usec - s->tv_usec;
@@
-385,9
+396,7
@@
uint64_t utime_since(const struct timeval *s, const struct timeval *e)
if (sec < 0 || (sec == 0 && usec < 0))
return 0;
if (sec < 0 || (sec == 0 && usec < 0))
return 0;
- ret = sec * 1000000ULL + usec;
-
- return ret;
+ return usec + (sec * 1000000);
}
uint64_t utime_since_now(const struct timeval *s)
}
uint64_t utime_since_now(const struct timeval *s)
@@
-400,7
+409,7
@@
uint64_t utime_since_now(const struct timeval *s)
uint64_t mtime_since(const struct timeval *s, const struct timeval *e)
{
uint64_t mtime_since(const struct timeval *s, const struct timeval *e)
{
- long sec, usec
, ret
;
+ long sec, usec;
sec = e->tv_sec - s->tv_sec;
usec = e->tv_usec - s->tv_usec;
sec = e->tv_sec - s->tv_sec;
usec = e->tv_usec - s->tv_usec;
@@
-412,11
+421,9
@@
uint64_t mtime_since(const struct timeval *s, const struct timeval *e)
if (sec < 0 || (sec == 0 && usec < 0))
return 0;
if (sec < 0 || (sec == 0 && usec < 0))
return 0;
- sec *= 1000UL;
- usec /= 1000UL;
- ret = sec + usec;
-
- return ret;
+ sec *= 1000;
+ usec /= 1000;
+ return sec + usec;
}
uint64_t mtime_since_now(const struct timeval *s)
}
uint64_t mtime_since_now(const struct timeval *s)
@@
-467,19
+474,29
@@
static void *clock_thread_fn(void *data)
struct clock_entry *c;
os_cpu_mask_t cpu_mask;
uint32_t last_seq;
struct clock_entry *c;
os_cpu_mask_t cpu_mask;
uint32_t last_seq;
+ unsigned long long first;
int i;
int i;
- memset(&cpu_mask, 0, sizeof(cpu_mask));
+ if (fio_cpuset_init(&cpu_mask)) {
+ int __err = errno;
+
+ log_err("clock cpuset init failed: %s\n", strerror(__err));
+ goto err_out;
+ }
+
fio_cpu_set(&cpu_mask, t->cpu);
if (fio_setaffinity(gettid(), cpu_mask) == -1) {
fio_cpu_set(&cpu_mask, t->cpu);
if (fio_setaffinity(gettid(), cpu_mask) == -1) {
- log_err("clock setaffinity failed\n");
- return (void *) 1;
+ int __err = errno;
+
+ log_err("clock setaffinity failed: %s\n", strerror(__err));
+ goto err;
}
pthread_mutex_lock(&t->lock);
pthread_mutex_unlock(&t->started);
}
pthread_mutex_lock(&t->lock);
pthread_mutex_unlock(&t->started);
+ first = get_cpu_clock();
last_seq = 0;
c = &t->entries[0];
for (i = 0; i < t->nr_entries; i++, c++) {
last_seq = 0;
c = &t->entries[0];
for (i = 0; i < t->nr_entries; i++, c++) {
@@
-502,7
+519,8
@@
static void *clock_thread_fn(void *data)
unsigned long long clocks;
clocks = t->entries[i - 1].tsc - t->entries[0].tsc;
unsigned long long clocks;
clocks = t->entries[i - 1].tsc - t->entries[0].tsc;
- log_info("cs: cpu%3d: %llu clocks seen\n", t->cpu, clocks);
+ log_info("cs: cpu%3d: %llu clocks seen, first %llu\n", t->cpu,
+ clocks, first);
}
/*
}
/*
@@
-510,9
+528,14
@@
static void *clock_thread_fn(void *data)
* indefinitely. Check for that and return failure.
*/
if (!t->entries[i - 1].tsc && !t->entries[0].tsc)
* indefinitely. Check for that and return failure.
*/
if (!t->entries[i - 1].tsc && !t->entries[0].tsc)
-
return (void *) 1
;
+
goto err
;
+ fio_cpuset_exit(&cpu_mask);
return NULL;
return NULL;
+err:
+ fio_cpuset_exit(&cpu_mask);
+err_out:
+ return (void *) 1;
}
static int clock_cmp(const void *p1, const void *p2)
}
static int clock_cmp(const void *p1, const void *p2)
@@
-609,6
+632,8
@@
int fio_monotonic_clocktest(int debug)
qsort(entries, tentries, sizeof(struct clock_entry), clock_cmp);
qsort(entries, tentries, sizeof(struct clock_entry), clock_cmp);
+ /* silence silly gcc */
+ prev = NULL;
for (failed = i = 0; i < tentries; i++) {
this = &entries[i];
for (failed = i = 0; i < tentries; i++) {
this = &entries[i];