projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warning from gmake on BSD
[fio.git]
/
idletime.c
diff --git
a/idletime.c
b/idletime.c
index c0bc0bfce19675e311fcbd7394540b02a7010eba..db272fe4331e5783b7c755c846e9b4a3f58d9c3d 100644
(file)
--- a/
idletime.c
+++ b/
idletime.c
@@
-43,16
+43,26
@@
static double calibrate_unit(unsigned char *data)
return tunit / CALIBRATE_SCALE;
}
return tunit / CALIBRATE_SCALE;
}
+static void free_cpu_affinity(struct idle_prof_thread *ipt)
+{
+#if defined(FIO_HAVE_CPU_AFFINITY)
+ fio_cpuset_exit(&ipt->cpu_mask);
+#endif
+}
+
static int set_cpu_affinity(struct idle_prof_thread *ipt)
{
#if defined(FIO_HAVE_CPU_AFFINITY)
static int set_cpu_affinity(struct idle_prof_thread *ipt)
{
#if defined(FIO_HAVE_CPU_AFFINITY)
- os_cpu_mask_t cpu_mask;
+ if (fio_cpuset_init(&ipt->cpu_mask)) {
+ log_err("fio: cpuset init failed\n");
+ return -1;
+ }
- memset(&cpu_mask, 0, sizeof(cpu_mask));
- fio_cpu_set(&cpu_mask, ipt->cpu);
+ fio_cpu_set(&ipt->cpu_mask, ipt->cpu);
- if (fio_setaffinity(gettid(), cpu_mask)) {
+ if (fio_setaffinity(gettid(),
ipt->
cpu_mask)) {
log_err("fio: fio_setaffinity failed\n");
log_err("fio: fio_setaffinity failed\n");
+ fio_cpuset_exit(&ipt->cpu_mask);
return -1;
}
return -1;
}
@@
-73,8
+83,10
@@
static void *idle_prof_thread_fn(void *data)
pthread_mutex_lock(&ipt->init_lock);
/* exit if any other thread failed to start */
pthread_mutex_lock(&ipt->init_lock);
/* exit if any other thread failed to start */
- if (ipc.status == IDLE_PROF_STATUS_ABORT)
+ if (ipc.status == IDLE_PROF_STATUS_ABORT) {
+ pthread_mutex_unlock(&ipt->init_lock);
return NULL;
return NULL;
+ }
retval = set_cpu_affinity(ipt);
if (retval == -1) {
retval = set_cpu_affinity(ipt);
if (retval == -1) {
@@
-96,7
+108,7
@@
static void *idle_prof_thread_fn(void *data)
if (retval == -1) {
ipt->state = TD_EXITED;
pthread_mutex_unlock(&ipt->init_lock);
if (retval == -1) {
ipt->state = TD_EXITED;
pthread_mutex_unlock(&ipt->init_lock);
-
return NULL
;
+
goto do_exit
;
}
ipt->state = TD_INITIALIZED;
}
ipt->state = TD_INITIALIZED;
@@
-109,12
+121,16
@@
static void *idle_prof_thread_fn(void *data)
pthread_mutex_lock(&ipt->start_lock);
/* exit if other threads failed to initialize */
pthread_mutex_lock(&ipt->start_lock);
/* exit if other threads failed to initialize */
- if (ipc.status == IDLE_PROF_STATUS_ABORT)
- return NULL;
+ if (ipc.status == IDLE_PROF_STATUS_ABORT) {
+ pthread_mutex_unlock(&ipt->start_lock);
+ goto do_exit;
+ }
/* exit if we are doing calibration only */
/* exit if we are doing calibration only */
- if (ipc.status == IDLE_PROF_STATUS_CALI_STOP)
- return NULL;
+ if (ipc.status == IDLE_PROF_STATUS_CALI_STOP) {
+ pthread_mutex_unlock(&ipt->start_lock);
+ goto do_exit;
+ }
fio_gettime(&ipt->tps, NULL);
ipt->state = TD_RUNNING;
fio_gettime(&ipt->tps, NULL);
ipt->state = TD_RUNNING;
@@
-137,6
+153,8
@@
idle_prof_done:
ipt->state = TD_EXITED;
pthread_mutex_unlock(&ipt->start_lock);
ipt->state = TD_EXITED;
pthread_mutex_unlock(&ipt->start_lock);
+do_exit:
+ free_cpu_affinity(ipt);
return NULL;
}
return NULL;
}
@@
-336,7
+354,10
@@
void fio_idle_prof_stop(void)
/* calculate idleness */
if (ipc.cali_mean != 0.0) {
runt = utime_since(&ipt->tps, &ipt->tpe);
/* calculate idleness */
if (ipc.cali_mean != 0.0) {
runt = utime_since(&ipt->tps, &ipt->tpe);
- ipt->idleness = ipt->loops * ipc.cali_mean / runt;
+ if (runt)
+ ipt->idleness = ipt->loops * ipc.cali_mean / runt;
+ else
+ ipt->idleness = 0.0;
} else
ipt->idleness = 0.0;
}
} else
ipt->idleness = 0.0;
}