projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove comment wrt sigaction() usage, it's deprecated
[fio.git]
/
gettime.c
diff --git
a/gettime.c
b/gettime.c
index 161240eeedbbcee0107bfc92a5c1fa7e94954915..2753faecb02d0596b1898346a46bf7f1d9e44873 100644
(file)
--- a/
gettime.c
+++ b/
gettime.c
@@
-6,22
+6,21
@@
#include <sys/time.h>
#include "fio.h"
#include <sys/time.h>
#include "fio.h"
-#include "os.h"
#include "hash.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)
#ifdef FIO_DEBUG_TIME
#define HASH_BITS 8
#define HASH_SIZE (1 << HASH_BITS)
-static struct list_head hash[HASH_SIZE];
+static struct
f
list_head hash[HASH_SIZE];
static int gtod_inited;
struct gtod_log {
static int gtod_inited;
struct gtod_log {
- struct list_head list;
+ struct
f
list_head list;
void *caller;
unsigned long calls;
};
void *caller;
unsigned long calls;
};
@@
-29,10
+28,11
@@
struct gtod_log {
static struct gtod_log *find_hash(void *caller)
{
unsigned long h = hash_ptr(caller, HASH_BITS);
static struct gtod_log *find_hash(void *caller)
{
unsigned long h = hash_ptr(caller, HASH_BITS);
- struct list_head *entry;
+ struct
f
list_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;
if (log->caller == caller)
return log;
@@
-49,12
+49,12
@@
static struct gtod_log *find_log(void *caller)
unsigned long h;
log = malloc(sizeof(*log));
unsigned long h;
log = malloc(sizeof(*log));
- INIT_LIST_HEAD(&log->list);
+ INIT_
F
LIST_HEAD(&log->list);
log->caller = caller;
log->calls = 0;
h = hash_ptr(caller, HASH_BITS);
log->caller = caller;
log->calls = 0;
h = hash_ptr(caller, HASH_BITS);
- list_add_tail(&log->list, &hash[h]);
+
f
list_add_tail(&log->list, &hash[h]);
}
return log;
}
return log;
@@
-75,13
+75,14
@@
static void fio_exit fio_dump_gtod(void)
int i;
for (i = 0; i < HASH_SIZE; i++) {
int i;
for (i = 0; i < HASH_SIZE; i++) {
- struct list_head *entry;
+ struct
f
list_head *entry;
struct gtod_log *log;
struct gtod_log *log;
- list_for_each(entry, &hash[i]) {
- log = list_entry(entry, struct gtod_log, list);
+
f
list_for_each(entry, &hash[i]) {
+ log =
f
list_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;
}
}
total_calls += log->calls;
}
}
@@
-94,7
+95,7
@@
static void fio_init gtod_init(void)
int i;
for (i = 0; i < HASH_SIZE; i++)
int i;
for (i = 0; i < HASH_SIZE; i++)
- INIT_LIST_HEAD(&hash[i]);
+ INIT_
F
LIST_HEAD(&hash[i]);
gtod_inited = 1;
}
gtod_inited = 1;
}
@@
-113,26
+114,18
@@
void fio_gettime(struct timeval *tp, void fio_unused *caller)
gtod_log_caller(caller);
#endif
gtod_log_caller(caller);
#endif
-repeat:
- if (!clock_gettime_works)
+ if (!clock_gettime_works) {
+gtod:
gettimeofday(tp, NULL);
gettimeofday(tp, NULL);
- else {
+
}
else {
struct timespec ts;
if (clock_gettime(CLOCK_MONOTONIC, &ts) < 0) {
clock_gettime_works = 0;
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;
}
}
}
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;
-}