Improve logging accuracy

[fio.git] / workqueue.c

diff --git a/workqueue.c b/workqueue.c
index 484d3a9213152f3ef555c27a4ffd955d7580a3f8..4f9c414ac1195927789d6f18f423f5ec00bacf1e 100644 (file)
--- a/workqueue.c
+++ b/workqueue.c
@@ -1,5 +1,5 @@
 /*
- * Rated submission helpers
+ * Generic workqueue offload mechanism
  *
  * Copyright (C) 2015 Jens Axboe <axboe@kernel.dk>
  *
@@ -9,7 +9,7 @@
 #include "fio.h"
 #include "flist.h"
 #include "workqueue.h"
-#include "lib/getrusage.h"
+#include "smalloc.h"
 
 enum {
        SW_F_IDLE       = 1 << 0,
@@ -99,23 +99,20 @@ void workqueue_flush(struct workqueue *wq)
 /*
  * Must be serialized by caller. Returns true for queued, false for busy.
  */
-bool workqueue_enqueue(struct workqueue *wq, struct workqueue_work *work)
+void workqueue_enqueue(struct workqueue *wq, struct workqueue_work *work)
 {
        struct submit_worker *sw;
 
        sw = get_submit_worker(wq);
-       if (sw) {
-               pthread_mutex_lock(&sw->lock);
-               flist_add_tail(&work->list, &sw->work_list);
-               sw->seq = ++wq->work_seq;
-               sw->flags &= ~SW_F_IDLE;
-               pthread_mutex_unlock(&sw->lock);
+       assert(sw);
 
-               pthread_cond_signal(&sw->cond);
-               return true;
-       }
+       pthread_mutex_lock(&sw->lock);
+       flist_add_tail(&work->list, &sw->work_list);
+       sw->seq = ++wq->work_seq;
+       sw->flags &= ~SW_F_IDLE;
+       pthread_mutex_unlock(&sw->lock);
 
-       return false;
+       pthread_cond_signal(&sw->cond);
 }
 
 static void handle_list(struct submit_worker *sw, struct flist_head *list)
@@ -134,10 +131,21 @@ static void *worker_thread(void *data)
 {
        struct submit_worker *sw = data;
        struct workqueue *wq = sw->wq;
-       unsigned int eflags = 0, ret;
+       unsigned int eflags = 0, ret = 0;
        FLIST_HEAD(local_list);
 
-       ret = workqueue_init_worker(sw);
+       sk_out_assign(sw->sk_out);
+
+       if (wq->ops.nice) {
+               if (nice(wq->ops.nice) < 0) {
+                       log_err("workqueue: nice %s\n", strerror(errno));
+                       ret = 1;
+               }
+       }
+
+       if (!ret)
+               ret = workqueue_init_worker(sw);
+
        pthread_mutex_lock(&sw->lock);
        sw->flags |= SW_F_RUNNING;
        if (ret)
@@ -201,14 +209,15 @@ done:
        pthread_mutex_lock(&sw->lock);
        sw->flags |= (SW_F_EXITED | eflags);
        pthread_mutex_unlock(&sw->lock);
+       sk_out_drop();
        return NULL;
 }
 
-static void free_worker(struct submit_worker *sw)
+static void free_worker(struct submit_worker *sw, unsigned int *sum_cnt)
 {
        struct workqueue *wq = sw->wq;
 
-       workqueue_exit_worker(sw);
+       workqueue_exit_worker(sw, sum_cnt);
 
        pthread_cond_destroy(&sw->cond);
        pthread_mutex_destroy(&sw->lock);
@@ -219,13 +228,8 @@ static void free_worker(struct submit_worker *sw)
 
 static void shutdown_worker(struct submit_worker *sw, unsigned int *sum_cnt)
 {
-       struct thread_data *parent = sw->wq->td;
-       struct thread_data *td = sw->private;
-
        pthread_join(sw->thread, NULL);
-       (*sum_cnt)++;
-       sum_thread_stats(&parent->ts, &td->ts, *sum_cnt == 1);
-       free_worker(sw);
+       free_worker(sw, sum_cnt);
 }
 
 void workqueue_exit(struct workqueue *wq)
@@ -234,6 +238,9 @@ void workqueue_exit(struct workqueue *wq)
        struct submit_worker *sw;
        int i;
 
+       if (!wq->workers)
+               return;
+
        for (i = 0; i < wq->max_workers; i++) {
                sw = &wq->workers[i];
 
@@ -257,13 +264,15 @@ void workqueue_exit(struct workqueue *wq)
                }
        } while (shutdown && shutdown != wq->max_workers);
 
-       free(wq->workers);
+       sfree(wq->workers);
+       wq->workers = NULL;
        pthread_mutex_destroy(&wq->flush_lock);
        pthread_cond_destroy(&wq->flush_cond);
        pthread_mutex_destroy(&wq->stat_lock);
 }
 
-static int start_worker(struct workqueue *wq, unsigned int index)
+static int start_worker(struct workqueue *wq, unsigned int index,
+                       struct sk_out *sk_out)
 {
        struct submit_worker *sw = &wq->workers[index];
        int ret;
@@ -273,6 +282,7 @@ static int start_worker(struct workqueue *wq, unsigned int index)
        pthread_mutex_init(&sw->lock, NULL);
        sw->wq = wq;
        sw->index = index;
+       sw->sk_out = sk_out;
 
        if (wq->ops.alloc_worker_fn) {
                ret = wq->ops.alloc_worker_fn(sw);
@@ -288,17 +298,18 @@ static int start_worker(struct workqueue *wq, unsigned int index)
                return 0;
        }
 
-       free_worker(sw);
+       free_worker(sw, NULL);
        return 1;
 }
 
 int workqueue_init(struct thread_data *td, struct workqueue *wq,
-                  struct workqueue_ops *ops, unsigned max_pending)
+                  struct workqueue_ops *ops, unsigned int max_workers,
+                  struct sk_out *sk_out)
 {
        unsigned int running;
        int i, error;
 
-       wq->max_workers = max_pending;
+       wq->max_workers = max_workers;
        wq->td = td;
        wq->ops = *ops;
        wq->work_seq = 0;
@@ -307,10 +318,10 @@ int workqueue_init(struct thread_data *td, struct workqueue *wq,
        pthread_mutex_init(&wq->flush_lock, NULL);
        pthread_mutex_init(&wq->stat_lock, NULL);
 
-       wq->workers = calloc(wq->max_workers, sizeof(struct submit_worker));
+       wq->workers = smalloc(wq->max_workers * sizeof(struct submit_worker));
 
        for (i = 0; i < wq->max_workers; i++)
-               if (start_worker(wq, i))
+               if (start_worker(wq, i, sk_out))
                        break;
 
        wq->max_workers = i;