/*
- * Memory helpers
+ * Clock functions
*/
+
#include <unistd.h>
#include <sys/time.h>
#include "fio.h"
-#include "os.h"
#include "hash.h"
-static int clock_gettime_works = 1;
+static int clock_gettime_works;
#ifdef FIO_DEBUG_TIME
#define HASH_BITS 8
#define HASH_SIZE (1 << HASH_BITS)
-static struct list_head hash[HASH_SIZE];
+static struct flist_head hash[HASH_SIZE];
static int gtod_inited;
struct gtod_log {
- struct list_head list;
+ struct flist_head list;
void *caller;
unsigned long calls;
};
static struct gtod_log *find_hash(void *caller)
{
unsigned long h = hash_ptr(caller, HASH_BITS);
- struct list_head *entry;
+ struct flist_head *entry;
- list_for_each(entry, &hash[h]) {
- struct gtod_log *log = list_entry(entry, struct gtod_log, list);
+ flist_for_each(entry, &hash[h]) {
+ struct gtod_log *log = flist_entry(entry, struct gtod_log,
+ list);
if (log->caller == caller)
return log;
unsigned long h;
log = malloc(sizeof(*log));
- INIT_LIST_HEAD(&log->list);
+ INIT_FLIST_HEAD(&log->list);
log->caller = caller;
log->calls = 0;
h = hash_ptr(caller, HASH_BITS);
- list_add_tail(&log->list, &hash[h]);
+ flist_add_tail(&log->list, &hash[h]);
}
return log;
int i;
for (i = 0; i < HASH_SIZE; i++) {
- struct list_head *entry;
+ struct flist_head *entry;
struct gtod_log *log;
- list_for_each(entry, &hash[i]) {
- log = list_entry(entry, struct gtod_log, list);
+ flist_for_each(entry, &hash[i]) {
+ log = flist_entry(entry, struct gtod_log, list);
- printf("function %p, calls %lu\n", log->caller, log->calls);
+ printf("function %p, calls %lu\n", log->caller,
+ log->calls);
total_calls += log->calls;
}
}
int i;
for (i = 0; i < HASH_SIZE; i++)
- INIT_LIST_HEAD(&hash[i]);
+ INIT_FLIST_HEAD(&hash[i]);
gtod_inited = 1;
}
#endif /* FIO_DEBUG_TIME */
+#ifdef FIO_DEBUG_TIME
void fio_gettime(struct timeval *tp, void *caller)
+#else
+void fio_gettime(struct timeval *tp, void fio_unused *caller)
+#endif
{
#ifdef FIO_DEBUG_TIME
if (!caller)
caller = __builtin_return_address(0);
gtod_log_caller(caller);
-#else
- caller = NULL;
#endif
-repeat:
- if (!clock_gettime_works)
+ if (!clock_gettime_works) {
+gtod:
gettimeofday(tp, NULL);
- else {
+ } else {
struct timespec ts;
if (clock_gettime(CLOCK_MONOTONIC, &ts) < 0) {
clock_gettime_works = 0;
- goto repeat;
+ goto gtod;
}
tp->tv_sec = ts.tv_sec;
tp->tv_usec = ts.tv_nsec / 1000;
}
}
-
-static void fio_init check_clock(void)
-{
- struct timespec ts;
-
- if (clock_getres(CLOCK_MONOTONIC, &ts) < 0)
- clock_gettime_works = 0;
-}