aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2018-03-23 09:30:13 -0700
committerGarrett D'Amore <garrett@damore.org>2018-03-30 12:38:56 -0700
commit5f69a5ba55058c7f5bfc4d5a250e72c56f31e0eb (patch)
treeb83eff910ba236f1b63069ab4b02ac39bda4f866 /src/core
parent122bd6086c0fef009f582d6c4fec5a5a3ae5e6de (diff)
downloadnng-5f69a5ba55058c7f5bfc4d5a250e72c56f31e0eb.tar.gz
nng-5f69a5ba55058c7f5bfc4d5a250e72c56f31e0eb.tar.bz2
nng-5f69a5ba55058c7f5bfc4d5a250e72c56f31e0eb.zip
fixes #316 nni_aio_set_synch() usually doesn't do anything
Diffstat (limited to 'src/core')
-rw-r--r--src/core/aio.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/aio.c b/src/core/aio.c
index 1aaffe12..f3af80d8 100644
--- a/src/core/aio.c
+++ b/src/core/aio.c
@@ -392,7 +392,15 @@ nni_aio_finish_impl(nni_aio *aio, int rv, size_t count, nni_msg *msg)
aio->a_waiting = 0;
nni_cv_wake(&aio->a_cv);
}
- nni_task_dispatch(&aio->a_task);
+
+ if (!aio->a_synch) {
+ nni_task_dispatch(&aio->a_task);
+ } else {
+ nni_mtx_unlock(&nni_aio_lk);
+ aio->a_task.task_cb(aio->a_task.task_arg);
+ nni_mtx_lock(&nni_aio_lk);
+ aio->a_synch = 0;
+ }
}
nni_mtx_unlock(&nni_aio_lk);
}