Fio 3.15

[fio.git] / workqueue.c

diff --git a/workqueue.c b/workqueue.c
index 2e01b584544b7434ae68081bf4282f8afa2e8a5c..b59595124913338bc59dc20fb6a036c895b4f1f1 100644 (file)
--- a/workqueue.c
+++ b/workqueue.c
@@ -10,14 +10,14 @@
 #include "flist.h"
 #include "workqueue.h"
 #include "smalloc.h"
+#include "pshared.h"
 
 enum {
        SW_F_IDLE       = 1 << 0,
        SW_F_RUNNING    = 1 << 1,
        SW_F_EXIT       = 1 << 2,
-       SW_F_EXITED     = 1 << 3,
-       SW_F_ACCOUNTED  = 1 << 4,
-       SW_F_ERROR      = 1 << 5,
+       SW_F_ACCOUNTED  = 1 << 3,
+       SW_F_ERROR      = 1 << 4,
 };
 
 static struct submit_worker *__get_submit_worker(struct workqueue *wq,
@@ -97,7 +97,7 @@ void workqueue_flush(struct workqueue *wq)
 }
 
 /*
- * Must be serialized by caller. Returns true for queued, false for busy.
+ * Must be serialized by caller.
  */
 void workqueue_enqueue(struct workqueue *wq, struct workqueue_work *work)
 {
@@ -110,9 +110,9 @@ void workqueue_enqueue(struct workqueue *wq, struct workqueue_work *work)
        flist_add_tail(&work->list, &sw->work_list);
        sw->seq = ++wq->work_seq;
        sw->flags &= ~SW_F_IDLE;
-       pthread_mutex_unlock(&sw->lock);
 
        pthread_cond_signal(&sw->cond);
+       pthread_mutex_unlock(&sw->lock);
 }
 
 static void handle_list(struct submit_worker *sw, struct flist_head *list)
@@ -131,7 +131,7 @@ static void *worker_thread(void *data)
 {
        struct submit_worker *sw = data;
        struct workqueue *wq = sw->wq;
-       unsigned int eflags = 0, ret = 0;
+       unsigned int ret = 0;
        FLIST_HEAD(local_list);
 
        sk_out_assign(sw->sk_out);
@@ -190,8 +190,6 @@ static void *worker_thread(void *data)
                                if (wq->wake_idle)
                                        pthread_cond_signal(&wq->flush_cond);
                        }
-                       if (wq->ops.update_acct_fn)
-                               wq->ops.update_acct_fn(sw);
 
                        pthread_cond_wait(&sw->cond, &sw->lock);
                } else {
@@ -200,15 +198,11 @@ handle_work:
                }
                pthread_mutex_unlock(&sw->lock);
                handle_list(sw, &local_list);
+               if (wq->ops.update_acct_fn)
+                       wq->ops.update_acct_fn(sw);
        }
 
-       if (wq->ops.update_acct_fn)
-               wq->ops.update_acct_fn(sw);
-
 done:
-       pthread_mutex_lock(&sw->lock);
-       sw->flags |= (SW_F_EXITED | eflags);
-       pthread_mutex_unlock(&sw->lock);
        sk_out_drop();
        return NULL;
 }
@@ -327,6 +321,8 @@ int workqueue_init(struct thread_data *td, struct workqueue *wq,
                goto err;
 
        wq->workers = smalloc(wq->max_workers * sizeof(struct submit_worker));
+       if (!wq->workers)
+               goto err;
 
        for (i = 0; i < wq->max_workers; i++)
                if (start_worker(wq, i, sk_out))