projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
plot: add gnuplot 5 support
[fio.git]
/
workqueue.c
diff --git
a/workqueue.c
b/workqueue.c
index 6e67f3e7df4dc8ac0910a2c96ef28d39d9e04bb2..2e01b584544b7434ae68081bf4282f8afa2e8a5c 100644
(file)
--- a/
workqueue.c
+++ b/
workqueue.c
@@
-9,6
+9,7
@@
#include "fio.h"
#include "flist.h"
#include "workqueue.h"
#include "fio.h"
#include "flist.h"
#include "workqueue.h"
+#include "smalloc.h"
enum {
SW_F_IDLE = 1 << 0,
enum {
SW_F_IDLE = 1 << 0,
@@
-263,7
+264,7
@@
void workqueue_exit(struct workqueue *wq)
}
} while (shutdown && shutdown != wq->max_workers);
}
} while (shutdown && shutdown != wq->max_workers);
- free(wq->workers);
+
s
free(wq->workers);
wq->workers = NULL;
pthread_mutex_destroy(&wq->flush_lock);
pthread_cond_destroy(&wq->flush_cond);
wq->workers = NULL;
pthread_mutex_destroy(&wq->flush_lock);
pthread_cond_destroy(&wq->flush_cond);
@@
-277,8
+278,11
@@
static int start_worker(struct workqueue *wq, unsigned int index,
int ret;
INIT_FLIST_HEAD(&sw->work_list);
int ret;
INIT_FLIST_HEAD(&sw->work_list);
- pthread_cond_init(&sw->cond, NULL);
- pthread_mutex_init(&sw->lock, NULL);
+
+ ret = mutex_cond_init_pshared(&sw->lock, &sw->cond);
+ if (ret)
+ return ret;
+
sw->wq = wq;
sw->index = index;
sw->sk_out = sk_out;
sw->wq = wq;
sw->index = index;
sw->sk_out = sk_out;
@@
-307,17
+311,22
@@
int workqueue_init(struct thread_data *td, struct workqueue *wq,
{
unsigned int running;
int i, error;
{
unsigned int running;
int i, error;
+ int ret;
wq->max_workers = max_workers;
wq->td = td;
wq->ops = *ops;
wq->work_seq = 0;
wq->next_free_worker = 0;
wq->max_workers = max_workers;
wq->td = td;
wq->ops = *ops;
wq->work_seq = 0;
wq->next_free_worker = 0;
- pthread_cond_init(&wq->flush_cond, NULL);
- pthread_mutex_init(&wq->flush_lock, NULL);
- pthread_mutex_init(&wq->stat_lock, NULL);
- wq->workers = calloc(wq->max_workers, sizeof(struct submit_worker));
+ ret = mutex_cond_init_pshared(&wq->flush_lock, &wq->flush_cond);
+ if (ret)
+ goto err;
+ ret = mutex_init_pshared(&wq->stat_lock);
+ if (ret)
+ goto err;
+
+ wq->workers = smalloc(wq->max_workers * sizeof(struct submit_worker));
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))