iolog: cleanup data wait

[fio.git] / workqueue.h

diff --git a/workqueue.h b/workqueue.h
index 3119ff1782ad7b4dba99ebfccddcc4965db61d23..46a3979fde6190cc5d23603703334158f1267cf0 100644 (file)
--- a/workqueue.h
+++ b/workqueue.h
@@ -19,13 +19,13 @@ struct submit_worker {
        void *private;
 };
 
-typedef void (workqueue_work_fn)(struct submit_worker *, struct workqueue_work *);
+typedef int (workqueue_work_fn)(struct submit_worker *, struct workqueue_work *);
 typedef bool (workqueue_pre_sleep_flush_fn)(struct submit_worker *);
 typedef void (workqueue_pre_sleep_fn)(struct submit_worker *);
 typedef int (workqueue_alloc_worker_fn)(struct submit_worker *);
 typedef void (workqueue_free_worker_fn)(struct submit_worker *);
 typedef int (workqueue_init_worker_fn)(struct submit_worker *);
-typedef void (workqueue_exit_worker_fn)(struct submit_worker *);
+typedef void (workqueue_exit_worker_fn)(struct submit_worker *, unsigned int *);
 typedef void (workqueue_update_acct_fn)(struct submit_worker *);
 
 struct workqueue_ops {
@@ -40,6 +40,8 @@ struct workqueue_ops {
 
        workqueue_init_worker_fn *init_worker_fn;
        workqueue_exit_worker_fn *exit_worker_fn;
+
+       unsigned int nice;
 };
 
 struct workqueue {
@@ -61,7 +63,7 @@ struct workqueue {
 int workqueue_init(struct thread_data *td, struct workqueue *wq, struct workqueue_ops *ops, unsigned int max_workers);
 void workqueue_exit(struct workqueue *wq);
 
-bool workqueue_enqueue(struct workqueue *wq, struct workqueue_work *work);
+void workqueue_enqueue(struct workqueue *wq, struct workqueue_work *work);
 void workqueue_flush(struct workqueue *wq);
 
 static inline bool workqueue_pre_sleep_check(struct submit_worker *sw)
@@ -92,13 +94,18 @@ static inline int workqueue_init_worker(struct submit_worker *sw)
        return wq->ops.init_worker_fn(sw);
 }
 
-static inline void workqueue_exit_worker(struct submit_worker *sw)
+static inline void workqueue_exit_worker(struct submit_worker *sw,
+                                        unsigned int *sum_cnt)
 {
        struct workqueue *wq = sw->wq;
+       unsigned int tmp = 1;
 
        if (!wq->ops.exit_worker_fn)
                return;
 
-       wq->ops.exit_worker_fn(sw);
+       if (!sum_cnt)
+               sum_cnt = &tmp;
+
+       wq->ops.exit_worker_fn(sw, sum_cnt);
 }
 #endif