stat: avoid hang with race in stat thread exit and rusage update

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index d8365811b25f8f485724c2a18cf7b43f2af77465..3aae76df431e7d9acdb56ec31a2b8a172da195a1 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -506,9 +506,7 @@ static void show_thread_status_normal(struct thread_stat *ts,
        time_t time_p;
        char time_buf[64];
 
-       if (!(ts->io_bytes[DDIR_READ] + ts->io_bytes[DDIR_WRITE] +
-           ts->io_bytes[DDIR_TRIM]) && !(ts->total_io_u[DDIR_READ] +
-           ts->total_io_u[DDIR_WRITE] + ts->total_io_u[DDIR_TRIM]))
+       if (!ddir_rw_sum(ts->io_bytes) && !ddir_rw_sum(ts->total_io_u))
                return;
 
        time(&time_p);
@@ -574,13 +572,17 @@ static void show_thread_status_normal(struct thread_stat *ts,
                                        io_u_dist[3], io_u_dist[4],
                                        io_u_dist[5], io_u_dist[6]);
        log_info("     issued    : total=r=%llu/w=%llu/d=%llu,"
-                                " short=r=%llu/w=%llu/d=%llu\n",
+                                " short=r=%llu/w=%llu/d=%llu,"
+                                " drop=r=%llu/w=%llu/d=%llu\n",
                                        (unsigned long long) ts->total_io_u[0],
                                        (unsigned long long) ts->total_io_u[1],
                                        (unsigned long long) ts->total_io_u[2],
                                        (unsigned long long) ts->short_io_u[0],
                                        (unsigned long long) ts->short_io_u[1],
-                                       (unsigned long long) ts->short_io_u[2]);
+                                       (unsigned long long) ts->short_io_u[2],
+                                       (unsigned long long) ts->drop_io_u[0],
+                                       (unsigned long long) ts->drop_io_u[1],
+                                       (unsigned long long) ts->drop_io_u[2]);
        if (ts->continue_on_error) {
                log_info("     errors    : total=%llu, first_error=%d/<%s>\n",
                                        (unsigned long long)ts->total_err_count,
@@ -703,6 +705,9 @@ static void add_ddir_status_json(struct thread_stat *ts,
        json_object_add_value_int(dir_object, "bw", bw);
        json_object_add_value_int(dir_object, "iops", iops);
        json_object_add_value_int(dir_object, "runtime", ts->runtime[ddir]);
+       json_object_add_value_int(dir_object, "total_ios", ts->total_io_u[ddir]);
+       json_object_add_value_int(dir_object, "short_ios", ts->short_io_u[ddir]);
+       json_object_add_value_int(dir_object, "drop_ios", ts->drop_io_u[ddir]);
 
        if (!calc_lat(&ts->slat_stat[ddir], &min, &max, &mean, &dev)) {
                min = max = 0;
@@ -1072,6 +1077,10 @@ void sum_group_stats(struct group_run_stats *dst, struct group_run_stats *src)
                dst->agg[i] += src->agg[i];
        }
 
+       if (!dst->kb_base)
+               dst->kb_base = src->kb_base;
+       if (!dst->unit_base)
+               dst->unit_base = src->unit_base;
 }
 
 void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src, int nr)
@@ -1123,9 +1132,11 @@ void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src, int nr)
                if (!dst->unified_rw_rep) {
                        dst->total_io_u[k] += src->total_io_u[k];
                        dst->short_io_u[k] += src->short_io_u[k];
+                       dst->drop_io_u[k] += src->drop_io_u[k];
                } else {
                        dst->total_io_u[0] += src->total_io_u[k];
                        dst->short_io_u[0] += src->short_io_u[k];
+                       dst->drop_io_u[0] += src->drop_io_u[k];
                }
        }
 
@@ -1169,7 +1180,7 @@ void init_thread_stat(struct thread_stat *ts)
        ts->groupid = -1;
 }
 
-static void __show_run_stats(void)
+void __show_run_stats(void)
 {
        struct group_run_stats *runstats, *rs;
        struct thread_data *td;
@@ -1411,7 +1422,7 @@ void show_run_stats(void)
        fio_mutex_up(stat_mutex);
 }
 
-static void *__show_running_run_stats(void *arg)
+static void __show_running_run_stats(void)
 {
        struct thread_data *td;
        unsigned long long *rt;
@@ -1440,6 +1451,8 @@ static void *__show_running_run_stats(void *arg)
        }
 
        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);
@@ -1460,34 +1473,6 @@ static void *__show_running_run_stats(void *arg)
 
        free(rt);
        fio_mutex_up(stat_mutex);
-       free(arg);
-       return NULL;
-}
-
-/*
- * Called from signal handler. It _should_ be safe to just run this inline
- * in the sig handler, but we should be disturbing the system less by just
- * creating a thread to do it.
- */
-void show_running_run_stats(void)
-{
-       pthread_t *thread;
-
-       thread = calloc(1, sizeof(*thread));
-       if (!thread)
-               return;
-
-       if (!pthread_create(thread, NULL, __show_running_run_stats, thread)) {
-               int err;
-
-               err = pthread_detach(*thread);
-               if (err)
-                       log_err("fio: DU thread detach failed: %s\n", strerror(err));
-
-               return;
-       }
-
-       free(thread);
 }
 
 static int status_interval_init;
@@ -1658,6 +1643,7 @@ void reset_io_stats(struct thread_data *td)
        for (i = 0; i < 3; i++) {
                ts->total_io_u[i] = 0;
                ts->short_io_u[i] = 0;
+               ts->drop_io_u[i] = 0;
        }
 }
 
@@ -1905,3 +1891,53 @@ void stat_exit(void)
        fio_mutex_down(stat_mutex);
        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);
+}