projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/mingnus/fio
[fio.git]
/
workqueue.c
diff --git
a/workqueue.c
b/workqueue.c
index 1131400fd23a5acc8479c813fef0135c4987cf30..b59595124913338bc59dc20fb6a036c895b4f1f1 100644
(file)
--- a/
workqueue.c
+++ b/
workqueue.c
@@
-10,6
+10,7
@@
#include "flist.h"
#include "workqueue.h"
#include "smalloc.h"
#include "flist.h"
#include "workqueue.h"
#include "smalloc.h"
+#include "pshared.h"
enum {
SW_F_IDLE = 1 << 0,
enum {
SW_F_IDLE = 1 << 0,
@@
-96,7
+97,7
@@
void workqueue_flush(struct workqueue *wq)
}
/*
}
/*
- * Must be serialized by caller.
Returns true for queued, false for busy.
+ * Must be serialized by caller.
*/
void workqueue_enqueue(struct workqueue *wq, struct workqueue_work *work)
{
*/
void workqueue_enqueue(struct workqueue *wq, struct workqueue_work *work)
{
@@
-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;
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_cond_signal(&sw->cond);
+ pthread_mutex_unlock(&sw->lock);
}
static void handle_list(struct submit_worker *sw, struct flist_head *list)
}
static void handle_list(struct submit_worker *sw, struct flist_head *list)
@@
-189,8
+190,6
@@
static void *worker_thread(void *data)
if (wq->wake_idle)
pthread_cond_signal(&wq->flush_cond);
}
if (wq->wake_idle)
pthread_cond_signal(&wq->flush_cond);
}
- if (wq->ops.update_acct_fn)
- wq->ops.update_acct_fn(sw);
pthread_cond_wait(&sw->cond, &sw->lock);
} else {
pthread_cond_wait(&sw->cond, &sw->lock);
} else {
@@
-199,11
+198,10
@@
handle_work:
}
pthread_mutex_unlock(&sw->lock);
handle_list(sw, &local_list);
}
pthread_mutex_unlock(&sw->lock);
handle_list(sw, &local_list);
+ if (wq->ops.update_acct_fn)
+ wq->ops.update_acct_fn(sw);
}
}
- if (wq->ops.update_acct_fn)
- wq->ops.update_acct_fn(sw);
-
done:
sk_out_drop();
return NULL;
done:
sk_out_drop();
return NULL;