workqueue: ensure that workqueue_enqueue() can't fail

[fio.git] / workqueue.c

diff --git a/workqueue.c b/workqueue.c
index 9fe7bec1a7cd6f874ee5185ebbdab9b78a6b8144..9bec0c329e742aaa64e883148247bd803fa27113 100644 (file)
--- a/workqueue.c
+++ b/workqueue.c
@@ -99,23 +99,20 @@ void workqueue_flush(struct workqueue *wq)
 /*
  * Must be serialized by caller. Returns true for queued, false for busy.
  */
-bool workqueue_enqueue(struct workqueue *wq, struct workqueue_work *work)
+void workqueue_enqueue(struct workqueue *wq, struct workqueue_work *work)
 {
        struct submit_worker *sw;
 
        sw = get_submit_worker(wq);
-       if (sw) {
-               pthread_mutex_lock(&sw->lock);
-               flist_add_tail(&work->list, &sw->work_list);
-               sw->seq = ++wq->work_seq;
-               sw->flags &= ~SW_F_IDLE;
-               pthread_mutex_unlock(&sw->lock);
+       assert(sw);
 
-               pthread_cond_signal(&sw->cond);
-               return true;
-       }
+       pthread_mutex_lock(&sw->lock);
+       flist_add_tail(&work->list, &sw->work_list);
+       sw->seq = ++wq->work_seq;
+       sw->flags &= ~SW_F_IDLE;
+       pthread_mutex_unlock(&sw->lock);
 
-       return false;
+       pthread_cond_signal(&sw->cond);
 }
 
 static void handle_list(struct submit_worker *sw, struct flist_head *list)
@@ -134,10 +131,19 @@ static void *worker_thread(void *data)
 {
        struct submit_worker *sw = data;
        struct workqueue *wq = sw->wq;
-       unsigned int eflags = 0, ret;
+       unsigned int eflags = 0, ret = 0;
        FLIST_HEAD(local_list);
 
-       ret = workqueue_init_worker(sw);
+       if (wq->ops.nice) {
+               if (nice(wq->ops.nice) < 0) {
+                       log_err("workqueue: nice %s\n", strerror(errno));
+                       ret = 1;
+               }
+       }
+
+       if (!ret)
+               ret = workqueue_init_worker(sw);
+
        pthread_mutex_lock(&sw->lock);
        sw->flags |= SW_F_RUNNING;
        if (ret)