X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=workqueue.c;h=841dbb9ffffa6de6252990592e7d750e876442b5;hp=013087e10561128bfb6f51b03abc32f63a9d3964;hb=refs%2Ftags%2Ffio-3.11;hpb=d22042d2117b78e16b06bab0880422c417007d37 diff --git a/workqueue.c b/workqueue.c index 013087e1..841dbb9f 100644 --- a/workqueue.c +++ b/workqueue.c @@ -10,6 +10,7 @@ #include "flist.h" #include "workqueue.h" #include "smalloc.h" +#include "pshared.h" enum { SW_F_IDLE = 1 << 0, @@ -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) @@ -323,6 +324,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))