aboutsummaryrefslogtreecommitdiff
path: root/src/core/msgqueue.c
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2018-08-20 09:00:46 -0700
committerGarrett D'Amore <garrett@damore.org>2018-08-20 09:26:20 -0700
commit6e5f6a26beec0a44d25625cacb5095cdc7a94146 (patch)
tree7d6ef720b239a30d4906f1f2303fed77707b2761 /src/core/msgqueue.c
parent3e70013111b70f1439b2f9991211c887a8eefff3 (diff)
downloadnng-6e5f6a26beec0a44d25625cacb5095cdc7a94146.tar.gz
nng-6e5f6a26beec0a44d25625cacb5095cdc7a94146.tar.bz2
nng-6e5f6a26beec0a44d25625cacb5095cdc7a94146.zip
fixes #664 aio cancellation could be better
This changes the signature of the aio cancellation routines to take the argument for cancellation directly, so we do not need to lookup the argument using the nni_aio_get_prov_data. We should probably consider eliminating nni_aio_get_prov_data, and co, and changing the prov_extra to reflect prov_data. Later.
Diffstat (limited to 'src/core/msgqueue.c')
-rw-r--r--src/core/msgqueue.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/msgqueue.c b/src/core/msgqueue.c
index e58fe6f5..62a3893b 100644
--- a/src/core/msgqueue.c
+++ b/src/core/msgqueue.c
@@ -315,9 +315,9 @@ nni_msgq_run_notify(nni_msgq *mq)
}
static void
-nni_msgq_cancel(nni_aio *aio, int rv)
+nni_msgq_cancel(nni_aio *aio, void *arg, int rv)
{
- nni_msgq *mq = nni_aio_get_prov_data(aio);
+ nni_msgq *mq = arg;
nni_mtx_lock(&mq->mq_lock);
if (nni_aio_list_active(aio)) {