#include "lib/getrusage.h"
#include "idletime.h"
-static struct fio_mutex *stat_mutex;
+struct fio_mutex *stat_mutex;
void update_rusage_stat(struct thread_data *td)
{
void show_group_stats(struct group_run_stats *rs)
{
char *p1, *p2, *p3, *p4;
- const char *ddir_str[] = { " READ", " WRITE" , " TRIM"};
+ const char *str[] = { " READ", " WRITE" , " TRIM"};
int i;
log_info("\nRun status group %d (all jobs):\n", rs->groupid);
log_info("%s: io=%s, aggrb=%s/s, minb=%s/s, maxb=%s/s,"
" mint=%llumsec, maxt=%llumsec\n",
- rs->unified_rw_rep ? " MIXED" : ddir_str[i],
+ rs->unified_rw_rep ? " MIXED" : str[i],
p1, p2, p3, p4,
(unsigned long long) rs->min_run[i],
(unsigned long long) rs->max_run[i]);
static void show_ddir_status(struct group_run_stats *rs, struct thread_stat *ts,
int ddir)
{
- const char *ddir_str[] = { "read ", "write", "trim" };
+ const char *str[] = { "read ", "write", "trim" };
unsigned long min, max, runt;
unsigned long long bw, iops;
double mean, dev;
iops_p = num2str(iops, 6, 1, 0, 0);
log_info(" %s: io=%s, bw=%s/s, iops=%s, runt=%6llumsec\n",
- rs->unified_rw_rep ? "mixed" : ddir_str[ddir],
+ rs->unified_rw_rep ? "mixed" : str[ddir],
io_p, bw_p, iops_p,
(unsigned long long) ts->runtime[ddir]);
fio_mutex_up(stat_mutex);
}
-static void __show_running_run_stats(void)
+void __show_running_run_stats(void)
{
struct thread_data *td;
unsigned long long *rt;
}
for_each_td(td, i) {
+ if (td->runstate >= TD_EXITED)
+ continue;
if (td->rusage_sem) {
td->update_rusage = 1;
fio_mutex_down(td->rusage_sem);
fio_mutex_remove(stat_mutex);
}
-static pthread_t si_thread;
-static pthread_cond_t si_cond;
-static pthread_mutex_t si_lock;
-static int si_thread_exit;
-
/*
* Called from signal handler. Wake up status thread.
*/
void show_running_run_stats(void)
{
- pthread_cond_signal(&si_cond);
-}
-
-static void *si_thread_main(void *unused)
-{
- while (!si_thread_exit) {
- pthread_cond_wait(&si_cond, &si_lock);
- if (si_thread_exit)
- break;
-
- __show_running_run_stats();
- }
-
- return NULL;
-}
-
-void create_status_interval_thread(void)
-{
- int ret;
-
- pthread_cond_init(&si_cond, NULL);
- pthread_mutex_init(&si_lock, NULL);
-
- ret = pthread_create(&si_thread, NULL, si_thread_main, NULL);
- if (ret) {
- log_err("Can't create status thread: %s\n", strerror(ret));
- return;
- }
-}
-
-void wait_for_status_interval_thread_exit(void)
-{
- void *ret;
-
- si_thread_exit = 1;
- pthread_cond_signal(&si_cond);
- pthread_join(si_thread, &ret);
- pthread_cond_destroy(&si_cond);
+ helper_do_stat = 1;
+ pthread_cond_signal(&helper_cond);
}