projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
t/zbd: Add multi-job libaio test
[fio.git]
/
gettime-thread.c
diff --git
a/gettime-thread.c
b/gettime-thread.c
index 19541b474b75878999657475f88d46178ad7c831..0a2cc6c451d533d1a5c56ce2ce857c85a7b31de2 100644
(file)
--- a/
gettime-thread.c
+++ b/
gettime-thread.c
@@
-1,50
+1,53
@@
-#include <unistd.h>
-#include <math.h>
#include <sys/time.h>
#include <time.h>
#include "fio.h"
#include "smalloc.h"
#include <sys/time.h>
#include <time.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_tv = smalloc(sizeof(struct timeval));
- if (!fio_tv)
- log_err("fio: smalloc pool exhausted\n");
+ fio_ts = smalloc(sizeof(*fio_ts));
}
static void fio_gtod_update(void)
{
}
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();
}
}
struct gtod_cpu_data {
write_barrier();
}
}
struct gtod_cpu_data {
- struct fio_
mutex *mutex
;
+ struct fio_
sem *sem
;
unsigned int cpu;
};
static void *gtod_thread_main(void *data)
{
unsigned int cpu;
};
static void *gtod_thread_main(void *data)
{
- struct fio_mutex *mutex = data;
+ struct fio_sem *sem = data;
+ int ret;
+
+ ret = fio_setaffinity(gettid(), fio_gtod_cpumask);
- fio_setaffinity(gettid(), fio_gtod_cpumask);
- fio_mutex_up(mutex);
+ 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
@@
-62,17
+65,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);
pthread_attr_setstacksize(&attr, 2 * PTHREAD_STACK_MIN);
return 1;
pthread_attr_init(&attr);
pthread_attr_setstacksize(&attr, 2 * PTHREAD_STACK_MIN);
- ret = pthread_create(>od_thread, &attr, gtod_thread_main,
mutex
);
+ 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));
@@
-85,11
+88,11
@@
int fio_start_gtod_thread(void)
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;
}