projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'regrow_agg_logs' of https://github.com/pmoust/fio
[fio.git]
/
gettime.c
diff --git
a/gettime.c
b/gettime.c
index c256a96c16c8f26253a253c82d23d23f4a5d914c..f85da6e082c8d7cef315f644a2be90cf853ce82f 100644
(file)
--- a/
gettime.c
+++ b/
gettime.c
@@
-2,15
+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 "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)
@@
-133,18
+127,33
@@
static void fio_init gtod_init(void)
#endif /* FIO_DEBUG_TIME */
#endif /* FIO_DEBUG_TIME */
-#ifdef CONFIG_CLOCK_GETTIME
-static int fill_clock_gettime(struct timespec *ts)
+/*
+ * Queries the value of the monotonic clock if a monotonic clock is available
+ * or the wall clock time if no monotonic clock is available. Returns 0 if
+ * querying the clock succeeded or -1 if querying the clock failed.
+ */
+int fio_get_mono_time(struct timespec *ts)
{
{
-#if defined(CONFIG_CLOCK_MONOTONIC_RAW)
- return clock_gettime(CLOCK_MONOTONIC_RAW, ts);
-#elif defined(CONFIG_CLOCK_MONOTONIC)
- return clock_gettime(CLOCK_MONOTONIC, ts);
+ int ret;
+
+#ifdef CONFIG_CLOCK_GETTIME
+#if defined(CONFIG_CLOCK_MONOTONIC)
+ ret = clock_gettime(CLOCK_MONOTONIC, ts);
#else
#else
- ret
urn
clock_gettime(CLOCK_REALTIME, ts);
+ ret
=
clock_gettime(CLOCK_REALTIME, ts);
#endif
#endif
-}
+#else
+ struct timeval tv;
+
+ ret = gettimeofday(&tv, NULL);
+ if (ret == 0) {
+ ts->tv_sec = tv.tv_sec;
+ ts->tv_nsec = tv.tv_usec * 1000;
+ }
#endif
#endif
+ assert(ret <= 0);
+ return ret;
+}
static void __fio_gettime(struct timespec *tp)
{
static void __fio_gettime(struct timespec *tp)
{
@@
-161,8
+170,8
@@
static void __fio_gettime(struct timespec *tp)
#endif
#ifdef CONFIG_CLOCK_GETTIME
case CS_CGETTIME: {
#endif
#ifdef CONFIG_CLOCK_GETTIME
case CS_CGETTIME: {
- if (fi
ll_clock_get
time(tp) < 0) {
- log_err("fio:
clock_gettime
fails\n");
+ if (fi
o_get_mono_
time(tp) < 0) {
+ log_err("fio:
fio_get_mono_time()
fails\n");
assert(0);
}
break;
assert(0);
}
break;
@@
-230,29
+239,21
@@
static unsigned long get_cycles_per_msec(void)
{
struct timespec s, e;
uint64_t c_s, c_e;
{
struct timespec s, e;
uint64_t c_s, c_e;
- enum fio_cs old_cs = fio_clock_source;
uint64_t elapsed;
uint64_t elapsed;
-#ifdef CONFIG_CLOCK_GETTIME
- fio_clock_source = CS_CGETTIME;
-#else
- fio_clock_source = CS_GTOD;
-#endif
- __fio_gettime(&s);
+ fio_get_mono_time(&s);
c_s = get_cpu_clock();
do {
c_s = get_cpu_clock();
do {
- __fio_gettime(&e);
+ fio_get_mono_time(&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);
} while (1);
- fio_clock_source = old_cs;
- return (c_e - c_s) * 1000 / elapsed;
+ return (c_e - c_s) * 1000000 / elapsed;
}
#define NR_TIME_ITERS 50
}
#define NR_TIME_ITERS 50
@@
-305,10
+306,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;
@@
-378,8
+379,8
@@
static int calibrate_cpu_clock(void)
}
#endif // ARCH_HAVE_CPU_CLOCK
}
#endif // ARCH_HAVE_CPU_CLOCK
-#if
ndef CONFIG_TLS_THREAD
-void fio_local_clock_init(
int is_threa
d)
+#if
defined(ARCH_HAVE_CPU_CLOCK) && !defined(CONFIG_TLS_THREAD)
+void fio_local_clock_init(
voi
d)
{
struct tv_valid *t;
{
struct tv_valid *t;
@@
-395,7
+396,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
@@
-405,7
+406,7
@@
void fio_clock_init(void)
if (fio_clock_source == fio_clock_source_inited)
return;
if (fio_clock_source == fio_clock_source_inited)
return;
-#if
ndef CONFIG_TLS_THREAD
+#if
defined(ARCH_HAVE_CPU_CLOCK) && !defined(CONFIG_TLS_THREAD)
if (pthread_key_create(&tv_tls_key, kill_tv_tls_key))
log_err("fio: can't create TLS key\n");
#endif
if (pthread_key_create(&tv_tls_key, kill_tv_tls_key))
log_err("fio: can't create TLS key\n");
#endif
@@
-523,23
+524,33
@@
uint64_t mtime_since_now(const struct timespec *s)
return mtime_since(s, &t);
}
return mtime_since(s, &t);
}
-uint64_t mtime_since(const struct timespec *s, const struct timespec *e)
+/*
+ * Returns *e - *s in milliseconds as a signed integer. Note: rounding is
+ * asymmetric. If the difference yields +1 ns then 0 is returned. If the
+ * difference yields -1 ns then -1 is returned.
+ */
+int64_t rel_time_since(const struct timespec *s, const struct timespec *e)
{
{
- int64_t sec,
u
sec;
+ int64_t sec,
n
sec;
sec = e->tv_sec - s->tv_sec;
sec = e->tv_sec - s->tv_sec;
-
usec = (e->tv_nsec - s->tv_nsec) / 1000
;
- if (
sec > 0 && u
sec < 0) {
+
nsec = e->tv_nsec - s->tv_nsec
;
+ if (
n
sec < 0) {
sec--;
sec--;
-
usec += 1000
000;
+
nsec += 1000ULL * 1000 * 1
000;
}
}
+ assert(0 <= nsec && nsec < 1000ULL * 1000 * 1000);
- if (sec < 0 || (sec == 0 && usec < 0))
- return 0;
+ return sec * 1000 + nsec / (1000 * 1000);
+}
- sec *= 1000;
- usec /= 1000;
- return sec + usec;
+/*
+ * Returns *e - *s in milliseconds as an unsigned integer. Returns 0 if
+ * *e < *s.
+ */
+uint64_t mtime_since(const struct timespec *s, const struct timespec *e)
+{
+ return max(rel_time_since(s, e), (int64_t)0);
}
uint64_t time_since_now(const struct timespec *s)
}
uint64_t time_since_now(const struct timespec *s)
@@
-563,8
+574,7
@@
struct clock_thread {
pthread_t thread;
int cpu;
int debug;
pthread_t thread;
int cpu;
int debug;
- pthread_mutex_t lock;
- pthread_mutex_t started;
+ struct fio_sem lock;
unsigned long nr_entries;
uint32_t *seq;
struct clock_entry *entries;
unsigned long nr_entries;
uint32_t *seq;
struct clock_entry *entries;
@@
-600,8
+610,7
@@
static void *clock_thread_fn(void *data)
goto err;
}
goto err;
}
- pthread_mutex_lock(&t->lock);
- pthread_mutex_unlock(&t->started);
+ fio_sem_down(&t->lock);
first = get_cpu_clock();
c = &t->entries[0];
first = get_cpu_clock();
c = &t->entries[0];
@@
-702,9
+711,7
@@
int fio_monotonic_clocktest(int debug)
t->seq = &seq;
t->nr_entries = nr_entries;
t->entries = &entries[i * nr_entries];
t->seq = &seq;
t->nr_entries = nr_entries;
t->entries = &entries[i * nr_entries];
- pthread_mutex_init(&t->lock, NULL);
- pthread_mutex_init(&t->started, NULL);
- pthread_mutex_lock(&t->lock);
+ __fio_sem_init(&t->lock, FIO_SEM_LOCKED);
if (pthread_create(&t->thread, NULL, clock_thread_fn, t)) {
failed++;
nr_cpus = i;
if (pthread_create(&t->thread, NULL, clock_thread_fn, t)) {
failed++;
nr_cpus = i;
@@
-715,13
+722,7
@@
int fio_monotonic_clocktest(int debug)
for (i = 0; i < nr_cpus; i++) {
struct clock_thread *t = &cthreads[i];
for (i = 0; i < nr_cpus; i++) {
struct clock_thread *t = &cthreads[i];
- pthread_mutex_lock(&t->started);
- }
-
- for (i = 0; i < nr_cpus; i++) {
- struct clock_thread *t = &cthreads[i];
-
- pthread_mutex_unlock(&t->lock);
+ fio_sem_up(&t->lock);
}
for (i = 0; i < nr_cpus; i++) {
}
for (i = 0; i < nr_cpus; i++) {
@@
-731,6
+732,7
@@
int fio_monotonic_clocktest(int debug)
pthread_join(t->thread, &ret);
if (ret)
failed++;
pthread_join(t->thread, &ret);
if (ret)
failed++;
+ __fio_sem_remove(&t->lock);
}
free(cthreads);
}
free(cthreads);