projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
parse: fix segfault if posval option doesn't have a value
[fio.git]
/
gettime-thread.c
diff --git
a/gettime-thread.c
b/gettime-thread.c
index 3d49034a72792fc6cfc590ed545c522de4f7a999..9bf85f0212725556e59609223d66cf0f2eba3618 100644
(file)
--- a/
gettime-thread.c
+++ b/
gettime-thread.c
@@
-8,11
+8,14
@@
struct timeval *fio_tv = NULL;
int fio_gtod_offload = 0;
struct timeval *fio_tv = NULL;
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)
{
+ if (fio_tv)
+ return;
+
fio_tv = smalloc(sizeof(struct timeval));
if (!fio_tv)
log_err("fio: smalloc pool exhausted\n");
fio_tv = smalloc(sizeof(struct timeval));
if (!fio_tv)
log_err("fio: smalloc pool exhausted\n");
@@
-20,14
+23,27
@@
void fio_gtod_init(void)
static void fio_gtod_update(void)
{
static void fio_gtod_update(void)
{
- if (fio_tv)
- gettimeofday(fio_tv, NULL);
+ if (fio_tv) {
+ struct timeval __tv;
+
+ gettimeofday(&__tv, NULL);
+ fio_tv->tv_sec = __tv.tv_sec;
+ write_barrier();
+ fio_tv->tv_usec = __tv.tv_usec;
+ 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);
/*
@@
-56,7
+72,7
@@
int fio_start_gtod_thread(void)
pthread_attr_init(&attr);
pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN);
pthread_attr_init(&attr);
pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN);
- ret = pthread_create(>od_thread, &attr, gtod_thread_main,
NULL
);
+ ret = pthread_create(>od_thread, &attr, gtod_thread_main,
mutex
);
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));
@@
-77,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
+}