projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes_1290' of https://github.com/rthardin/fio
[fio.git]
/
gettime-thread.c
diff --git
a/gettime-thread.c
b/gettime-thread.c
index c1b4b0967c28f354b8a3e6c9ad82fc2845c41e56..86c2e2efdcdcd796bd280951b5f0170ebe5a8db8 100644
(file)
--- a/
gettime-thread.c
+++ b/
gettime-thread.c
@@
-1,34
+1,56
@@
-#include <unistd.h>
-#include <math.h>
#include <sys/time.h>
#include <time.h>
#include "fio.h"
#include <sys/time.h>
#include <time.h>
#include "fio.h"
+#include "lib/seqlock.h"
#include "smalloc.h"
#include "smalloc.h"
-struct
timeval *fio_tv
;
+struct
fio_ts *fio_ts
;
int fio_gtod_offload = 0;
int fio_gtod_offload = 0;
-int fio_gtod_cpu = -1;
static pthread_t gtod_thread;
static pthread_t gtod_thread;
+static os_cpu_mask_t fio_gtod_cpumask;
void fio_gtod_init(void)
{
void fio_gtod_init(void)
{
- fio_tv = smalloc(sizeof(struct timeval));
- if (!fio_tv)
- log_err("fio: smalloc pool exhausted\n");
+ if (fio_ts)
+ return;
+
+ fio_ts = smalloc(sizeof(*fio_ts));
}
static void fio_gtod_update(void)
{
}
static void fio_gtod_update(void)
{
- if (fio_tv)
- gettimeofday(fio_tv, NULL);
+ struct timeval __tv;
+
+ if (!fio_ts)
+ return;
+
+ gettimeofday(&__tv, NULL);
+
+ write_seqlock_begin(&fio_ts->seqlock);
+ fio_ts->ts.tv_sec = __tv.tv_sec;
+ fio_ts->ts.tv_nsec = __tv.tv_usec * 1000;
+ write_seqlock_end(&fio_ts->seqlock);
}
}
+struct gtod_cpu_data {
+ struct fio_sem *sem;
+ unsigned int cpu;
+};
+
static void *gtod_thread_main(void *data)
{
static void *gtod_thread_main(void *data)
{
- struct fio_mutex *mutex = data;
+ struct fio_sem *sem = data;
+ int ret;
- fio_mutex_up(mutex);
+ ret = fio_setaffinity(gettid(), fio_gtod_cpumask);
+
+ fio_sem_up(sem);
+
+ 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
/*
* As long as we have jobs around, update the clock. It would be nice
@@
-36,7
+58,7
@@
static void *gtod_thread_main(void *data)
* but I'm not sure what to use outside of a simple CPU nop to relax
* it - we don't want to lose precision.
*/
* but I'm not sure what to use outside of a simple CPU nop to relax
* it - we don't want to lose precision.
*/
- while (
thread
s) {
+ while (
nr_segment
s) {
fio_gtod_update();
nop;
}
fio_gtod_update();
nop;
}
@@
-46,17
+68,17
@@
static void *gtod_thread_main(void *data)
int fio_start_gtod_thread(void)
{
int fio_start_gtod_thread(void)
{
- struct fio_
mutex *mutex
;
+ struct fio_
sem *sem
;
pthread_attr_t attr;
int ret;
pthread_attr_t attr;
int ret;
-
mutex = fio_mutex_init(FIO_MUTEX
_LOCKED);
- if (!
mutex
)
+
sem = fio_sem_init(FIO_SEM
_LOCKED);
+ if (!
sem
)
return 1;
pthread_attr_init(&attr);
return 1;
pthread_attr_init(&attr);
- pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN);
- ret = pthread_create(>od_thread, &attr, gtod_thread_main,
NULL
);
+ pthread_attr_setstacksize(&attr,
2 *
PTHREAD_STACK_MIN);
+ ret = pthread_create(>od_thread, &attr, gtod_thread_main,
sem
);
pthread_attr_destroy(&attr);
if (ret) {
log_err("Can't create gtod thread: %s\n", strerror(ret));
pthread_attr_destroy(&attr);
if (ret) {
log_err("Can't create gtod thread: %s\n", strerror(ret));
@@
-65,16
+87,21
@@
int fio_start_gtod_thread(void)
ret = pthread_detach(gtod_thread);
if (ret) {
ret = pthread_detach(gtod_thread);
if (ret) {
- log_err("Can't deta
t
ch gtod thread: %s\n", strerror(ret));
+ log_err("Can't detach gtod thread: %s\n", strerror(ret));
goto err;
}
goto err;
}
- dprint(FD_MUTEX, "wait on startup_
mutex
\n");
- fio_
mutex_down(mutex
);
- dprint(FD_MUTEX, "done waiting on startup_
mutex
\n");
+ dprint(FD_MUTEX, "wait on startup_
sem
\n");
+ fio_
sem_down(sem
);
+ dprint(FD_MUTEX, "done waiting on startup_
sem
\n");
err:
err:
- fio_
mutex_remove(mutex
);
+ fio_
sem_remove(sem
);
return ret;
}
return ret;
}
-
+void fio_gtod_set_cpu(unsigned int cpu)
+{
+#ifdef FIO_HAVE_CPU_AFFINITY
+ fio_cpu_set(&fio_gtod_cpumask, cpu);
+#endif
+}