projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: sync "PARAMETER TYPES" section with HOWTO
[fio.git]
/
gettime-thread.c
diff --git
a/gettime-thread.c
b/gettime-thread.c
index 95f35c32e46cff25f6b43005462f608e1975fabf..cbb81dc83e9ff3c7f427e071161b92f016c1b9d1 100644
(file)
--- a/
gettime-thread.c
+++ b/
gettime-thread.c
@@
-6,35
+6,44
@@
#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;
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)
+ if (fio_ts)
+ return;
+
+ fio_ts = smalloc(sizeof(*fio_ts));
+ if (!fio_ts)
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();
}
}
+struct gtod_cpu_data {
+ struct fio_mutex *mutex;
+ unsigned int cpu;
+};
+
static void *gtod_thread_main(void *data)
{
struct fio_mutex *mutex = data;
static void *gtod_thread_main(void *data)
{
struct fio_mutex *mutex = data;
+ fio_setaffinity(gettid(), fio_gtod_cpumask);
fio_mutex_up(mutex);
/*
fio_mutex_up(mutex);
/*
@@
-62,7
+71,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) {
@@
-72,7
+81,7
@@
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;
}
@@
-84,4
+93,9
@@
err:
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
+}