glusterfs: silence printf specifier warnings

[fio.git] / workqueue.h

diff --git a/workqueue.h b/workqueue.h
index f724f903d41e5900c8aee5d4d9437f184a32851b..e35c181a23ea359a895a51cbab1815f279686d0b 100644 (file)
--- a/workqueue.h
+++ b/workqueue.h
@@ -16,23 +16,33 @@ struct submit_worker {
        unsigned int index;
        uint64_t seq;
        struct workqueue *wq;
-       void *private;
+       void *priv;
+       struct sk_out *sk_out;
 };
 
-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 *, unsigned int *);
+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;
+
+       unsigned int nice;
 };
 
 struct workqueue {
@@ -51,10 +61,10 @@ struct workqueue {
        volatile int wake_idle;
 };
 
-int workqueue_init(struct thread_data *td, struct workqueue *wq, struct workqueue_ops *ops, unsigned int max_workers);
+int workqueue_init(struct thread_data *td, struct workqueue *wq, struct workqueue_ops *ops, unsigned int max_workers, struct sk_out *sk_out);
 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)
@@ -85,4 +95,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,
+                                        unsigned int *sum_cnt)
+{
+       struct workqueue *wq = sw->wq;
+       unsigned int tmp = 1;
+
+       if (!wq->ops.exit_worker_fn)
+               return;
+
+       if (!sum_cnt)
+               sum_cnt = &tmp;
+
+       wq->ops.exit_worker_fn(sw, sum_cnt);
+}
 #endif