projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cygwin-build-error' of https://github.com/vincentkfu/fio
[fio.git]
/
idletime.c
diff --git
a/idletime.c
b/idletime.c
index bc8097680d69f37b139495b61f56287b588c9693..2f59f5104b4152c7b156a1bd255f898eb1ba7c72 100644
(file)
--- a/
idletime.c
+++ b/
idletime.c
@@
-1,4
+1,5
@@
#include <math.h>
#include <math.h>
+#include "fio.h"
#include "json.h"
#include "idletime.h"
#include "json.h"
#include "idletime.h"
@@
-11,7
+12,7
@@
static volatile struct idle_prof_common ipc;
static double calibrate_unit(unsigned char *data)
{
unsigned long t, i, j, k;
static double calibrate_unit(unsigned char *data)
{
unsigned long t, i, j, k;
- struct time
val
tps;
+ struct time
spec
tps;
double tunit = 0.0;
for (i = 0; i < CALIBRATE_RUNS; i++) {
double tunit = 0.0;
for (i = 0; i < CALIBRATE_RUNS; i++) {
@@
-43,16
+44,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
+84,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
+109,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
+122,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
+154,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;
}
@@
-165,7
+184,6
@@
static void calibration_stats(void)
void fio_idle_prof_init(void)
{
int i, ret;
void fio_idle_prof_init(void)
{
int i, ret;
- struct timeval tp;
struct timespec ts;
pthread_attr_t tattr;
struct idle_prof_thread *ipt;
struct timespec ts;
pthread_attr_t tattr;
struct idle_prof_thread *ipt;
@@
-242,7
+260,7
@@
void fio_idle_prof_init(void)
if ((ret = pthread_detach(ipt->thread))) {
/* log error and let the thread spin */
if ((ret = pthread_detach(ipt->thread))) {
/* log error and let the thread spin */
- log_err("fio: pthread_deta
t
ch %s\n", strerror(ret));
+ log_err("fio: pthread_detach %s\n", strerror(ret));
}
}
}
}
@@
-264,9
+282,8
@@
void fio_idle_prof_init(void)
pthread_mutex_lock(&ipt->init_lock);
while ((ipt->state != TD_EXITED) &&
(ipt->state!=TD_INITIALIZED)) {
pthread_mutex_lock(&ipt->init_lock);
while ((ipt->state != TD_EXITED) &&
(ipt->state!=TD_INITIALIZED)) {
- fio_gettime(&tp, NULL);
- ts.tv_sec = tp.tv_sec + 1;
- ts.tv_nsec = tp.tv_usec * 1000;
+ fio_gettime(&ts, NULL);
+ ts.tv_sec += 1;
pthread_cond_timedwait(&ipt->cond, &ipt->init_lock, &ts);
}
pthread_mutex_unlock(&ipt->init_lock);
pthread_cond_timedwait(&ipt->cond, &ipt->init_lock, &ts);
}
pthread_mutex_unlock(&ipt->init_lock);
@@
-307,7
+324,6
@@
void fio_idle_prof_stop(void)
{
int i;
uint64_t runt;
{
int i;
uint64_t runt;
- struct timeval tp;
struct timespec ts;
struct idle_prof_thread *ipt;
struct timespec ts;
struct idle_prof_thread *ipt;
@@
-325,9
+341,8
@@
void fio_idle_prof_stop(void)
pthread_mutex_lock(&ipt->start_lock);
while ((ipt->state != TD_EXITED) &&
(ipt->state!=TD_NOT_CREATED)) {
pthread_mutex_lock(&ipt->start_lock);
while ((ipt->state != TD_EXITED) &&
(ipt->state!=TD_NOT_CREATED)) {
- fio_gettime(&tp, NULL);
- ts.tv_sec = tp.tv_sec + 1;
- ts.tv_nsec = tp.tv_usec * 1000;
+ fio_gettime(&ts, NULL);
+ ts.tv_sec += 1;
/* timed wait in case a signal is not received */
pthread_cond_timedwait(&ipt->cond, &ipt->start_lock, &ts);
}
/* timed wait in case a signal is not received */
pthread_cond_timedwait(&ipt->cond, &ipt->start_lock, &ts);
}
@@
-382,7
+397,7
@@
static double fio_idle_prof_cpu_stat(int cpu)
return p * 100.0;
}
return p * 100.0;
}
-
static
void fio_idle_prof_cleanup(void)
+void fio_idle_prof_cleanup(void)
{
if (ipc.ipts) {
free(ipc.ipts);
{
if (ipc.ipts) {
free(ipc.ipts);
@@
-410,7
+425,7
@@
int fio_idle_prof_parse_opt(const char *args)
fio_idle_prof_init();
fio_idle_prof_start();
fio_idle_prof_stop();
fio_idle_prof_init();
fio_idle_prof_start();
fio_idle_prof_stop();
- show_idle_prof_stats(FIO_OUTPUT_NORMAL, NULL);
+ show_idle_prof_stats(FIO_OUTPUT_NORMAL, NULL
, NULL
);
return 1;
} else if (strcmp("system", args) == 0) {
ipc.opt = IDLE_PROF_OPT_SYSTEM;
return 1;
} else if (strcmp("system", args) == 0) {
ipc.opt = IDLE_PROF_OPT_SYSTEM;
@@
-428,7
+443,8
@@
int fio_idle_prof_parse_opt(const char *args)
#endif
}
#endif
}
-void show_idle_prof_stats(int output, struct json_object *parent)
+void show_idle_prof_stats(int output, struct json_object *parent,
+ struct buf_output *out)
{
int i, nr_cpus = ipc.nr_cpus;
struct json_object *tmp;
{
int i, nr_cpus = ipc.nr_cpus;
struct json_object *tmp;
@@
-436,33
+452,29
@@
void show_idle_prof_stats(int output, struct json_object *parent)
if (output == FIO_OUTPUT_NORMAL) {
if (ipc.opt > IDLE_PROF_OPT_CALI)
if (output == FIO_OUTPUT_NORMAL) {
if (ipc.opt > IDLE_PROF_OPT_CALI)
- log_
info(
"\nCPU idleness:\n");
+ log_
buf(out,
"\nCPU idleness:\n");
else if (ipc.opt == IDLE_PROF_OPT_CALI)
else if (ipc.opt == IDLE_PROF_OPT_CALI)
- log_
info(
"CPU idleness:\n");
+ log_
buf(out,
"CPU idleness:\n");
if (ipc.opt >= IDLE_PROF_OPT_SYSTEM)
if (ipc.opt >= IDLE_PROF_OPT_SYSTEM)
- log_
info(
" system: %3.2f%%\n", fio_idle_prof_cpu_stat(-1));
+ log_
buf(out,
" system: %3.2f%%\n", fio_idle_prof_cpu_stat(-1));
if (ipc.opt == IDLE_PROF_OPT_PERCPU) {
if (ipc.opt == IDLE_PROF_OPT_PERCPU) {
- log_
info(
" percpu: %3.2f%%", fio_idle_prof_cpu_stat(0));
+ log_
buf(out,
" percpu: %3.2f%%", fio_idle_prof_cpu_stat(0));
for (i = 1; i < nr_cpus; i++)
for (i = 1; i < nr_cpus; i++)
- log_
info(
", %3.2f%%", fio_idle_prof_cpu_stat(i));
- log_
info(
"\n");
+ log_
buf(out,
", %3.2f%%", fio_idle_prof_cpu_stat(i));
+ log_
buf(out,
"\n");
}
if (ipc.opt >= IDLE_PROF_OPT_CALI) {
}
if (ipc.opt >= IDLE_PROF_OPT_CALI) {
- log_
info(
" unit work: mean=%3.2fus,", ipc.cali_mean);
- log_
info(
" stddev=%3.2f\n", ipc.cali_stddev);
+ log_
buf(out,
" unit work: mean=%3.2fus,", ipc.cali_mean);
+ log_
buf(out,
" stddev=%3.2f\n", ipc.cali_stddev);
}
}
- /* dynamic mem allocations can now be freed */
- if (ipc.opt != IDLE_PROF_OPT_NONE)
- fio_idle_prof_cleanup();
-
return;
}
return;
}
- if ((ipc.opt != IDLE_PROF_OPT_NONE) && (output
==
FIO_OUTPUT_JSON)) {
+ if ((ipc.opt != IDLE_PROF_OPT_NONE) && (output
&
FIO_OUTPUT_JSON)) {
if (!parent)
return;
if (!parent)
return;
@@
-482,7
+494,5
@@
void show_idle_prof_stats(int output, struct json_object *parent)
json_object_add_value_float(tmp, "unit_mean", ipc.cali_mean);
json_object_add_value_float(tmp, "unit_stddev", ipc.cali_stddev);
json_object_add_value_float(tmp, "unit_mean", ipc.cali_mean);
json_object_add_value_float(tmp, "unit_stddev", ipc.cali_stddev);
-
- fio_idle_prof_cleanup();
}
}
}
}