return tunit / CALIBRATE_SCALE;
}
+static int set_cpu_affinity(struct idle_prof_thread *ipt)
+{
+#if defined(FIO_HAVE_CPU_AFFINITY)
+ os_cpu_mask_t cpu_mask;
+
+ memset(&cpu_mask, 0, sizeof(cpu_mask));
+ fio_cpu_set(&cpu_mask, ipt->cpu);
+
+ if (fio_setaffinity(gettid(), cpu_mask)) {
+ log_err("fio: fio_setaffinity failed\n");
+ return -1;
+ }
+
+ return 0;
+#else
+ log_err("fio: fio_setaffinity not supported\n");
+ return -1;
+#endif
+}
+
static void *idle_prof_thread_fn(void *data)
{
int retval;
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;
+ }
-#if defined(FIO_HAVE_CPU_AFFINITY)
- os_cpu_mask_t cpu_mask;
- memset(&cpu_mask, 0, sizeof(cpu_mask));
- fio_cpu_set(&cpu_mask, ipt->cpu);
-
- if ((retval=fio_setaffinity(gettid(), cpu_mask)) == -1)
- log_err("fio: fio_setaffinity failed\n");
-#else
- retval = -1;
- log_err("fio: fio_setaffinity not supported\n");
-#endif
+ retval = set_cpu_affinity(ipt);
if (retval == -1) {
ipt->state = TD_EXITED;
pthread_mutex_unlock(&ipt->init_lock);
pthread_mutex_lock(&ipt->start_lock);
/* exit if other threads failed to initialize */
- if (ipc.status == IDLE_PROF_STATUS_ABORT)
+ if (ipc.status == IDLE_PROF_STATUS_ABORT) {
+ pthread_mutex_unlock(&ipt->start_lock);
return NULL;
+ }
/* exit if we are doing calibration only */
- if (ipc.status == IDLE_PROF_STATUS_CALI_STOP)
+ if (ipc.status == IDLE_PROF_STATUS_CALI_STOP) {
+ pthread_mutex_unlock(&ipt->start_lock);
return NULL;
+ }
fio_gettime(&ipt->tps, NULL);
ipt->state = TD_RUNNING;
/* 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;
}
return p * 100.0;
}
-void fio_idle_prof_cleanup(void)
+static void fio_idle_prof_cleanup(void)
{
if (ipc.ipts) {
free(ipc.ipts);
ipc.opt = IDLE_PROF_OPT_PERCPU;
return 0;
} else {
- log_err("fio: incorrect idle-prof option\n", args);
+ log_err("fio: incorrect idle-prof option: %s\n", args);
return -1;
}
#else