Fix occasional hangs on mutexes

[fio.git] / workqueue.c

diff --git a/workqueue.c b/workqueue.c
index 6e67f3e7df4dc8ac0910a2c96ef28d39d9e04bb2..13edafae38cadd33b69cce81cf0c7ae164044b7f 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,
@@ -263,7 +264,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);
@@ -275,10 +276,26 @@ static int start_worker(struct workqueue *wq, unsigned int index,
 {
        struct submit_worker *sw = &wq->workers[index];
        int ret;
+       pthread_condattr_t cattr;
+       pthread_mutexattr_t mattr;
 
        INIT_FLIST_HEAD(&sw->work_list);
-       pthread_cond_init(&sw->cond, NULL);
-       pthread_mutex_init(&sw->lock, NULL);
+       ret = pthread_condattr_init(&cattr);
+       if (ret)
+               return ret;
+       ret = pthread_mutexattr_init(&mattr);
+       if (ret)
+               return ret;
+#ifdef FIO_HAVE_PSHARED_MUTEX
+       ret = pthread_condattr_setpshared(&cattr, PTHREAD_PROCESS_SHARED);
+       if (ret)
+               return ret;
+       ret = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED);
+       if (ret)
+               return ret;
+#endif
+       pthread_cond_init(&sw->cond, &cattr);
+       pthread_mutex_init(&sw->lock, &mattr);
        sw->wq = wq;
        sw->index = index;
        sw->sk_out = sk_out;
@@ -307,17 +324,43 @@ int workqueue_init(struct thread_data *td, struct workqueue *wq,
 {
        unsigned int running;
        int i, error;
+       int ret;
+       pthread_condattr_t cattr;
+       pthread_mutexattr_t mattr;
 
        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 = pthread_condattr_init(&cattr);
+       if (ret) {
+               td_verror(td, ret, "pthread_condattr_init");
+               goto err;
+       }
+       ret = pthread_mutexattr_init(&mattr);
+       if (ret) {
+               td_verror(td, ret, "pthread_mutexattr_init");
+               goto err;
+       }
+#ifdef FIO_HAVE_PSHARED_MUTEX
+       ret = pthread_condattr_setpshared(&cattr, PTHREAD_PROCESS_SHARED);
+       if (ret) {
+               td_verror(td, ret, "pthread_condattr_setpshared");
+               goto err;
+       }
+       ret = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED);
+       if (ret) {
+               td_verror(td, ret, "pthread_mutexattr_setpshared");
+               goto err;
+       }
+#endif
+       pthread_cond_init(&wq->flush_cond, &cattr);
+       pthread_mutex_init(&wq->flush_lock, &mattr);
+       pthread_mutex_init(&wq->stat_lock, &mattr);
+
+       wq->workers = smalloc(wq->max_workers * sizeof(struct submit_worker));
 
        for (i = 0; i < wq->max_workers; i++)
                if (start_worker(wq, i, sk_out))