X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=workqueue.c;h=1131400fd23a5acc8479c813fef0135c4987cf30;hp=13edafae38cadd33b69cce81cf0c7ae164044b7f;hb=e8b746558dfd2c397cc8e64b211dbe44b3eb4c55;hpb=f9e5b5ee74e8282199eda9318865ffdc7645a384

diff --git a/workqueue.c b/workqueue.c
index 13edafae..1131400f 100644
--- a/workqueue.c
+++ b/workqueue.c
@@ -15,9 +15,8 @@ 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,
@@ -131,7 +130,7 @@ static void *worker_thread(void *data)
 {
 	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);
@@ -206,9 +205,6 @@ handle_work:
 		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;
 }
@@ -276,26 +272,13 @@ static int start_worker(struct workqueue *wq, unsigned int index,
 {
 	struct submit_worker *sw = &wq->workers[index];
 	int ret;
-	pthread_condattr_t cattr;
-	pthread_mutexattr_t mattr;
 
 	INIT_FLIST_HEAD(&sw->work_list);
-	ret = pthread_condattr_init(&cattr);
-	if (ret)
-		return ret;
-	ret = pthread_mutexattr_init(&mattr);
-	if (ret)
-		return ret;
-#ifdef FIO_HAVE_PSHARED_MUTEX
-	ret = pthread_condattr_setpshared(&cattr, PTHREAD_PROCESS_SHARED);
-	if (ret)
-		return ret;
-	ret = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED);
+
+	ret = mutex_cond_init_pshared(&sw->lock, &sw->cond);
 	if (ret)
 		return ret;
-#endif
-	pthread_cond_init(&sw->cond, &cattr);
-	pthread_mutex_init(&sw->lock, &mattr);
+
 	sw->wq = wq;
 	sw->index = index;
 	sw->sk_out = sk_out;
@@ -325,8 +308,6 @@ int workqueue_init(struct thread_data *td, struct workqueue *wq,
 	unsigned int running;
 	int i, error;
 	int ret;
-	pthread_condattr_t cattr;
-	pthread_mutexattr_t mattr;
 
 	wq->max_workers = max_workers;
 	wq->td = td;
@@ -334,33 +315,16 @@ int workqueue_init(struct thread_data *td, struct workqueue *wq,
 	wq->work_seq = 0;
 	wq->next_free_worker = 0;
 
-	ret = pthread_condattr_init(&cattr);
-	if (ret) {
-		td_verror(td, ret, "pthread_condattr_init");
-		goto err;
-	}
-	ret = pthread_mutexattr_init(&mattr);
-	if (ret) {
-		td_verror(td, ret, "pthread_mutexattr_init");
-		goto err;
-	}
-#ifdef FIO_HAVE_PSHARED_MUTEX
-	ret = pthread_condattr_setpshared(&cattr, PTHREAD_PROCESS_SHARED);
-	if (ret) {
-		td_verror(td, ret, "pthread_condattr_setpshared");
+	ret = mutex_cond_init_pshared(&wq->flush_lock, &wq->flush_cond);
+	if (ret)
 		goto err;
-	}
-	ret = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED);
-	if (ret) {
-		td_verror(td, ret, "pthread_mutexattr_setpshared");
+	ret = mutex_init_pshared(&wq->stat_lock);
+	if (ret)
 		goto err;
-	}
-#endif
-	pthread_cond_init(&wq->flush_cond, &cattr);
-	pthread_mutex_init(&wq->flush_lock, &mattr);
-	pthread_mutex_init(&wq->stat_lock, &mattr);
 
 	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))