projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix floating point option range formatting
[fio.git]
/
idletime.c
diff --git
a/idletime.c
b/idletime.c
index 5cc8b65f6051d6822e28ab536d8d6c675d501ddb..8762c8565ea8e66116a7e98ed5b544ddc3b1d624 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++) {
@@
-183,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;
@@
-260,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));
}
}
}
}
@@
-282,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);
@@
-325,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;
@@
-343,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);
}
@@
-481,7
+478,7
@@
void show_idle_prof_stats(int output, struct json_object *parent,
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;