projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.kernel.dk/data/git/fio
[fio.git]
/
gettime.c
diff --git
a/gettime.c
b/gettime.c
index 72968c55c86c80e37cb2d320dc3a2a8b7159e8c6..6863ce3f97cef140e967990b9b8a7dc0bf3b0126 100644
(file)
--- a/
gettime.c
+++ b/
gettime.c
@@
-477,12
+477,20
@@
static void *clock_thread_fn(void *data)
uint32_t last_seq;
int i;
uint32_t last_seq;
int i;
- memset(&cpu_mask, 0, sizeof(cpu_mask));
+ if (fio_cpuset_init(&cpu_mask)) {
+ int __err = errno;
+
+ log_err("clock cpuset init failed: %s\n", strerror(__err));
+ goto err_out;
+ }
+
fio_cpu_set(&cpu_mask, t->cpu);
if (fio_setaffinity(gettid(), cpu_mask) == -1) {
fio_cpu_set(&cpu_mask, t->cpu);
if (fio_setaffinity(gettid(), cpu_mask) == -1) {
- log_err("clock setaffinity failed\n");
- return (void *) 1;
+ int __err = errno;
+
+ log_err("clock setaffinity failed: %s\n", strerror(__err));
+ goto err;
}
pthread_mutex_lock(&t->lock);
}
pthread_mutex_lock(&t->lock);
@@
-518,9
+526,14
@@
static void *clock_thread_fn(void *data)
* indefinitely. Check for that and return failure.
*/
if (!t->entries[i - 1].tsc && !t->entries[0].tsc)
* indefinitely. Check for that and return failure.
*/
if (!t->entries[i - 1].tsc && !t->entries[0].tsc)
-
return (void *) 1
;
+
goto err
;
+ fio_cpuset_exit(&cpu_mask);
return NULL;
return NULL;
+err:
+ fio_cpuset_exit(&cpu_mask);
+err_out:
+ return (void *) 1;
}
static int clock_cmp(const void *p1, const void *p2)
}
static int clock_cmp(const void *p1, const void *p2)