projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Track fsync/fdatasync/sync_file_range issue count
[fio.git]
/
gettime-thread.c
diff --git
a/gettime-thread.c
b/gettime-thread.c
index 6dc14864fdc61bb8380702c154dce5e83f60d2b0..fc52236bf5969028aabec5c0507f445e91298d65 100644
(file)
--- a/
gettime-thread.c
+++ b/
gettime-thread.c
@@
-6,30
+6,30
@@
#include "fio.h"
#include "smalloc.h"
#include "fio.h"
#include "smalloc.h"
-struct time
val *fio_tv
= NULL;
+struct time
spec *fio_ts
= NULL;
int fio_gtod_offload = 0;
static pthread_t gtod_thread;
static os_cpu_mask_t fio_gtod_cpumask;
void fio_gtod_init(void)
{
int fio_gtod_offload = 0;
static pthread_t gtod_thread;
static os_cpu_mask_t fio_gtod_cpumask;
void fio_gtod_init(void)
{
- if (fio_t
v
)
+ if (fio_t
s
)
return;
return;
- fio_t
v = smalloc(sizeof(struct timeval
));
- if (!fio_t
v
)
+ fio_t
s = smalloc(sizeof(*fio_ts
));
+ if (!fio_t
s
)
log_err("fio: smalloc pool exhausted\n");
}
static void fio_gtod_update(void)
{
log_err("fio: smalloc pool exhausted\n");
}
static void fio_gtod_update(void)
{
- if (fio_t
v
) {
+ if (fio_t
s
) {
struct timeval __tv;
gettimeofday(&__tv, NULL);
struct timeval __tv;
gettimeofday(&__tv, NULL);
- fio_t
v
->tv_sec = __tv.tv_sec;
+ fio_t
s
->tv_sec = __tv.tv_sec;
write_barrier();
write_barrier();
- fio_t
v->tv_usec = __tv.tv_usec
;
+ fio_t
s->tv_nsec = __tv.tv_usec * 1000
;
write_barrier();
}
}
write_barrier();
}
}
@@
-42,10
+42,17
@@
struct gtod_cpu_data {
static void *gtod_thread_main(void *data)
{
struct fio_mutex *mutex = data;
static void *gtod_thread_main(void *data)
{
struct fio_mutex *mutex = data;
+ int ret;
+
+ ret = fio_setaffinity(gettid(), fio_gtod_cpumask);
- fio_setaffinity(gettid(), fio_gtod_cpumask);
fio_mutex_up(mutex);
fio_mutex_up(mutex);
+ if (ret == -1) {
+ log_err("gtod: setaffinity failed\n");
+ return NULL;
+ }
+
/*
* As long as we have jobs around, update the clock. It would be nice
* to have some way of NOT hammering that CPU with gettimeofday(),
/*
* As long as we have jobs around, update the clock. It would be nice
* to have some way of NOT hammering that CPU with gettimeofday(),
@@
-71,7
+78,7
@@
int fio_start_gtod_thread(void)
return 1;
pthread_attr_init(&attr);
return 1;
pthread_attr_init(&attr);
- pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN);
+ pthread_attr_setstacksize(&attr,
2 *
PTHREAD_STACK_MIN);
ret = pthread_create(>od_thread, &attr, gtod_thread_main, mutex);
pthread_attr_destroy(&attr);
if (ret) {
ret = pthread_create(>od_thread, &attr, gtod_thread_main, mutex);
pthread_attr_destroy(&attr);
if (ret) {