#include "hash.h"
#include "os/os.h"
-#ifdef ARCH_HAVE_CPU_CLOCK
+#if defined(ARCH_HAVE_CPU_CLOCK) && !defined(ARCH_CPU_CLOCK_CYCLES_PER_USEC)
static unsigned long cycles_per_usec;
static unsigned long inv_cycles_per_usec;
#endif
} else if (tv)
tv->last_cycles = t;
+#ifdef ARCH_CPU_CLOCK_CYCLES_PER_USEC
+ usecs = t / ARCH_CPU_CLOCK_CYCLES_PER_USEC;
+#else
usecs = (t * inv_cycles_per_usec) / 16777216UL;
+#endif
tp->tv_sec = usecs / 1000000;
tp->tv_usec = usecs % 1000000;
break;
}
}
-#ifdef ARCH_HAVE_CPU_CLOCK
+#if defined(ARCH_HAVE_CPU_CLOCK) && !defined(ARCH_CPU_CLOCK_CYCLES_PER_USEC)
static unsigned long get_cycles_per_usec(void)
{
struct timeval s, e;
#else
static int calibrate_cpu_clock(void)
{
+#ifdef ARCH_CPU_CLOCK_CYCLES_PER_USEC
+ return 0;
+#else
return 1;
-}
#endif
+}
+#endif // ARCH_HAVE_CPU_CLOCK
#ifndef CONFIG_TLS_THREAD
void fio_local_clock_init(int is_thread)
struct clock_thread *threads;
unsigned int nr_cpus = cpus_online();
struct clock_entry *entries;
- unsigned long tentries, failed;
+ unsigned long tentries, failed = 0;
struct clock_entry *prev, *this;
uint32_t seq = 0;
- int i;
+ unsigned int i;
log_info("cs: reliable_tsc: %s\n", tsc_reliable ? "yes" : "no");
pthread_mutex_init(&t->lock, NULL);
pthread_mutex_init(&t->started, NULL);
pthread_mutex_lock(&t->lock);
- pthread_create(&t->thread, NULL, clock_thread_fn, t);
+ if (pthread_create(&t->thread, NULL, clock_thread_fn, t)) {
+ failed++;
+ nr_cpus = i;
+ break;
+ }
}
for (i = 0; i < nr_cpus; i++) {
pthread_mutex_unlock(&t->lock);
}
- for (failed = i = 0; i < nr_cpus; i++) {
+ for (i = 0; i < nr_cpus; i++) {
struct clock_thread *t = &threads[i];
void *ret;