workqueue: move private accounting to caller

[fio.git] / workqueue.h

diff --git a/workqueue.h b/workqueue.h
index 837b221d6790f0176eecbc992ea66e9ef5b4691f..3119ff1782ad7b4dba99ebfccddcc4965db61d23 100644 (file)
--- a/workqueue.h
+++ b/workqueue.h
@@ -7,14 +7,39 @@ struct workqueue_work {
        struct flist_head list;
 };
 
-typedef void (workqueue_work_fn)(struct thread_data *, struct workqueue_work *);
-typedef bool (workqueue_pre_sleep_flush_fn)(struct thread_data *);
-typedef void (workqueue_pre_sleep_fn)(struct thread_data *);
+struct submit_worker {
+       pthread_t thread;
+       pthread_mutex_t lock;
+       pthread_cond_t cond;
+       struct flist_head work_list;
+       unsigned int flags;
+       unsigned int index;
+       uint64_t seq;
+       struct workqueue *wq;
+       void *private;
+};
+
+typedef void (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_update_acct_fn)(struct submit_worker *);
 
 struct workqueue_ops {
        workqueue_work_fn *fn;
        workqueue_pre_sleep_flush_fn *pre_sleep_flush_fn;
        workqueue_pre_sleep_fn *pre_sleep_fn;
+
+       workqueue_update_acct_fn *update_acct_fn;
+
+       workqueue_alloc_worker_fn *alloc_worker_fn;
+       workqueue_free_worker_fn *free_worker_fn;
+
+       workqueue_init_worker_fn *init_worker_fn;
+       workqueue_exit_worker_fn *exit_worker_fn;
 };
 
 struct workqueue {
@@ -39,18 +64,41 @@ void workqueue_exit(struct workqueue *wq);
 bool workqueue_enqueue(struct workqueue *wq, struct workqueue_work *work);
 void workqueue_flush(struct workqueue *wq);
 
-static inline bool workqueue_pre_sleep_check(struct workqueue *wq)
+static inline bool workqueue_pre_sleep_check(struct submit_worker *sw)
 {
+       struct workqueue *wq = sw->wq;
+
        if (!wq->ops.pre_sleep_flush_fn)
                return false;
 
-       return wq->ops.pre_sleep_flush_fn(wq->td);
+       return wq->ops.pre_sleep_flush_fn(sw);
 }
 
-static inline void workqueue_pre_sleep(struct workqueue *wq)
+static inline void workqueue_pre_sleep(struct submit_worker *sw)
 {
+       struct workqueue *wq = sw->wq;
+
        if (wq->ops.pre_sleep_fn)
-               wq->ops.pre_sleep_fn(wq->td);
+               wq->ops.pre_sleep_fn(sw);
+}
+
+static inline int workqueue_init_worker(struct submit_worker *sw)
+{
+       struct workqueue *wq = sw->wq;
+
+       if (!wq->ops.init_worker_fn)
+               return 0;
+
+       return wq->ops.init_worker_fn(sw);
 }
 
+static inline void workqueue_exit_worker(struct submit_worker *sw)
+{
+       struct workqueue *wq = sw->wq;
+
+       if (!wq->ops.exit_worker_fn)
+               return;
+
+       wq->ops.exit_worker_fn(sw);
+}
 #endif