Fix Windows CPU count

[fio.git] / workqueue.c

diff --git a/workqueue.c b/workqueue.c
index 6e67f3e7df4dc8ac0910a2c96ef28d39d9e04bb2..841dbb9ffffa6de6252990592e7d750e876442b5 100644 (file)
--- a/workqueue.c
+++ b/workqueue.c
@@ -9,14 +9,15 @@
 #include "fio.h"
 #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,
@@ -109,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)
@@ -130,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);
@@ -205,9 +206,6 @@ handle_work:
                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;
 }
@@ -263,7 +261,7 @@ 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);
@@ -277,8 +275,11 @@ static int start_worker(struct workqueue *wq, unsigned int index,
        int ret;
 
        INIT_FLIST_HEAD(&sw->work_list);
-       pthread_cond_init(&sw->cond, NULL);
-       pthread_mutex_init(&sw->lock, NULL);
+
+       ret = mutex_cond_init_pshared(&sw->lock, &sw->cond);
+       if (ret)
+               return ret;
+
        sw->wq = wq;
        sw->index = index;
        sw->sk_out = sk_out;
@@ -307,17 +308,24 @@ int workqueue_init(struct thread_data *td, struct workqueue *wq,
 {
        unsigned int running;
        int i, error;
+       int ret;
 
        wq->max_workers = max_workers;
        wq->td = td;
        wq->ops = *ops;
        wq->work_seq = 0;
        wq->next_free_worker = 0;
-       pthread_cond_init(&wq->flush_cond, NULL);
-       pthread_mutex_init(&wq->flush_lock, NULL);
-       pthread_mutex_init(&wq->stat_lock, NULL);
 
-       wq->workers = calloc(wq->max_workers, sizeof(struct submit_worker));
+       ret = mutex_cond_init_pshared(&wq->flush_lock, &wq->flush_cond);
+       if (ret)
+               goto err;
+       ret = mutex_init_pshared(&wq->stat_lock);
+       if (ret)
+               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))