projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
io_u_queue: add debug assert check on adding too many elements
[fio.git]
/
eta.c
diff --git
a/eta.c
b/eta.c
index 0105cda605aa85d513fab2fac7f4412e77007b07..167bf5f62b215d470e1f41d1ee95ba75968589cd 100644
(file)
--- a/
eta.c
+++ b/
eta.c
@@
-10,15
+10,15
@@
static char __run_str[REAL_MAX_JOBS + 1];
static char run_str[__THREAD_RUNSTR_SZ(REAL_MAX_JOBS)];
static char __run_str[REAL_MAX_JOBS + 1];
static char run_str[__THREAD_RUNSTR_SZ(REAL_MAX_JOBS)];
-static void update_condensed_str(char *r
un_
str, char *run_str_condensed)
+static void update_condensed_str(char *rstr, char *run_str_condensed)
{
{
- if (*r
un_
str) {
- while (*r
un_
str) {
+ if (*rstr) {
+ while (*rstr) {
int nr = 1;
int nr = 1;
- *run_str_condensed++ = *r
un_
str++;
- while (*(r
un_str - 1) == *run_
str) {
- r
un_
str++;
+ *run_str_condensed++ = *rstr++;
+ while (*(r
str - 1) == *r
str) {
+ rstr++;
nr++;
}
run_str_condensed += sprintf(run_str_condensed, "(%u),", nr);
nr++;
}
run_str_condensed += sprintf(run_str_condensed, "(%u),", nr);
@@
-234,11
+234,11
@@
static int thread_eta(struct thread_data *td)
* if given, otherwise assume it'll run at the specified rate.
*/
if (td->o.timeout) {
* if given, otherwise assume it'll run at the specified rate.
*/
if (td->o.timeout) {
- uint64_t timeout = td->o.timeout;
+ uint64_t
__
timeout = td->o.timeout;
uint64_t start_delay = td->o.start_delay;
uint64_t ramp_time = td->o.ramp_time;
uint64_t start_delay = td->o.start_delay;
uint64_t ramp_time = td->o.ramp_time;
- t_eta = timeout + start_delay + ramp_time;
+ t_eta =
__
timeout + start_delay + ramp_time;
t_eta /= 1000000ULL;
if (in_ramp_time(td)) {
t_eta /= 1000000ULL;
if (in_ramp_time(td)) {
@@
-392,10
+392,9
@@
int calc_thread_status(struct jobs_eta *je, int force)
} else if (td->runstate == TD_RAMP) {
je->nr_running++;
je->nr_ramp++;
} else if (td->runstate == TD_RAMP) {
je->nr_running++;
je->nr_ramp++;
- } else if (td->runstate == TD_SETTING_UP) {
- je->nr_running++;
+ } else if (td->runstate == TD_SETTING_UP)
je->nr_setting_up++;
je->nr_setting_up++;
-
}
else if (td->runstate < TD_RUNNING)
+ else if (td->runstate < TD_RUNNING)
je->nr_pending++;
if (je->elapsed_sec >= 3)
je->nr_pending++;
if (je->elapsed_sec >= 3)
@@
-556,8
+555,7
@@
void display_thread_status(struct jobs_eta *je)
if (!eta_new_line_init) {
fio_gettime(&disp_eta_new_line, NULL);
eta_new_line_init = 1;
if (!eta_new_line_init) {
fio_gettime(&disp_eta_new_line, NULL);
eta_new_line_init = 1;
- } else if (eta_new_line &&
- mtime_since_now(&disp_eta_new_line) > eta_new_line * 1000) {
+ } else if (eta_new_line && mtime_since_now(&disp_eta_new_line) > eta_new_line) {
fio_gettime(&disp_eta_new_line, NULL);
eta_new_line_pending = 1;
}
fio_gettime(&disp_eta_new_line, NULL);
eta_new_line_pending = 1;
}
@@
-574,9
+572,11
@@
struct jobs_eta *get_jobs_eta(int force, size_t *size)
*size = sizeof(*je) + THREAD_RUNSTR_SZ;
je = malloc(*size);
*size = sizeof(*je) + THREAD_RUNSTR_SZ;
je = malloc(*size);
+ if (!je)
+ return NULL;
memset(je, 0, *size);
memset(je, 0, *size);
- if (!calc_thread_status(je,
0
)) {
+ if (!calc_thread_status(je,
force
)) {
free(je);
return NULL;
}
free(je);
return NULL;
}