#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,
- 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,
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_mutex_unlock(&sw->lock);
}
static void handle_list(struct submit_worker *sw, struct flist_head *list)
{
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);
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;
}
{
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;
unsigned int running;
int i, error;
int ret;
- pthread_condattr_t cattr;
- pthread_mutexattr_t mattr;
wq->max_workers = max_workers;
wq->td = td;
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))