projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
axmap: remove unused 'data' argument to topdown handler
[fio.git]
/
workqueue.c
diff --git
a/workqueue.c
b/workqueue.c
index 2e01b584544b7434ae68081bf4282f8afa2e8a5c..841dbb9ffffa6de6252990592e7d750e876442b5 100644
(file)
--- a/
workqueue.c
+++ b/
workqueue.c
@@
-10,14
+10,14
@@
#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,
SW_F_RUNNING = 1 << 1,
SW_F_EXIT = 1 << 2,
enum {
SW_F_IDLE = 1 << 0,
SW_F_RUNNING = 1 << 1,
SW_F_EXIT = 1 << 2,
- SW_F_EXITED = 1 << 3,
- SW_F_ACCOUNTED = 1 << 4,
- SW_F_ERROR = 1 << 5,
+ SW_F_ACCOUNTED = 1 << 3,
+ SW_F_ERROR = 1 << 4,
};
static struct submit_worker *__get_submit_worker(struct workqueue *wq,
};
static struct submit_worker *__get_submit_worker(struct workqueue *wq,
@@
-110,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)
@@
-131,7
+131,7
@@
static void *worker_thread(void *data)
{
struct submit_worker *sw = data;
struct workqueue *wq = sw->wq;
{
struct submit_worker *sw = data;
struct workqueue *wq = sw->wq;
- unsigned int
eflags = 0,
ret = 0;
+ unsigned int ret = 0;
FLIST_HEAD(local_list);
sk_out_assign(sw->sk_out);
FLIST_HEAD(local_list);
sk_out_assign(sw->sk_out);
@@
-206,9
+206,6
@@
handle_work:
wq->ops.update_acct_fn(sw);
done:
wq->ops.update_acct_fn(sw);
done:
- pthread_mutex_lock(&sw->lock);
- sw->flags |= (SW_F_EXITED | eflags);
- pthread_mutex_unlock(&sw->lock);
sk_out_drop();
return NULL;
}
sk_out_drop();
return NULL;
}
@@
-327,6
+324,8
@@
int workqueue_init(struct thread_data *td, struct workqueue *wq,
goto err;
wq->workers = smalloc(wq->max_workers * sizeof(struct submit_worker));
goto err;
wq->workers = smalloc(wq->max_workers * sizeof(struct submit_worker));
+ if (!wq->workers)
+ goto err;
for (i = 0; i < wq->max_workers; i++)
if (start_worker(wq, i, sk_out))
for (i = 0; i < wq->max_workers; i++)
if (start_worker(wq, i, sk_out))