Improve logging accuracy

[fio.git] / workqueue.c

diff --git a/workqueue.c b/workqueue.c
index 06fc26310dd57a829c4b05ce5bc00cd17856ab3f..4f9c414ac1195927789d6f18f423f5ec00bacf1e 100644 (file)
--- a/workqueue.c
+++ b/workqueue.c
@@ -9,6 +9,7 @@
 #include "fio.h"
 #include "flist.h"
 #include "workqueue.h"
+#include "smalloc.h"
 
 enum {
        SW_F_IDLE       = 1 << 0,
@@ -133,6 +134,8 @@ static void *worker_thread(void *data)
        unsigned int eflags = 0, ret = 0;
        FLIST_HEAD(local_list);
 
+       sk_out_assign(sw->sk_out);
+
        if (wq->ops.nice) {
                if (nice(wq->ops.nice) < 0) {
                        log_err("workqueue: nice %s\n", strerror(errno));
@@ -206,6 +209,7 @@ done:
        pthread_mutex_lock(&sw->lock);
        sw->flags |= (SW_F_EXITED | eflags);
        pthread_mutex_unlock(&sw->lock);
+       sk_out_drop();
        return NULL;
 }
 
@@ -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);
@@ -293,12 +303,13 @@ static int start_worker(struct workqueue *wq, unsigned int index)
 }
 
 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;