diff options
| author | Garrett D'Amore <garrett@damore.org> | 2017-03-06 11:21:32 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2017-03-06 11:21:32 -0800 |
| commit | 68586f0090419def344debf970402750332af098 (patch) | |
| tree | bff6f606ed2f5bdf448b904725a0baaf805fbc57 /src/core | |
| parent | 44a6de38d240143ec2b4bb6f6457bae81271820a (diff) | |
| download | nng-68586f0090419def344debf970402750332af098.tar.gz nng-68586f0090419def344debf970402750332af098.tar.bz2 nng-68586f0090419def344debf970402750332af098.zip | |
Pub/Sub now callback driven.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/list.c | 4 | ||||
| -rw-r--r-- | src/core/msgqueue.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/list.c b/src/core/list.c index 1a5a4eb1..1d00171b 100644 --- a/src/core/list.c +++ b/src/core/list.c @@ -90,7 +90,7 @@ nni_list_insert_before(nni_list *list, void *item, void *before) nni_list_node *where = NODE(list, before); if ((node->ln_next != NULL) || (node->ln_prev != NULL)) { - nni_panic("prepending node already on a list or not inited"); + nni_panic("inserting node already on a list or not inited"); } node->ln_next = where; node->ln_prev = where->ln_prev; @@ -106,7 +106,7 @@ nni_list_insert_after(nni_list *list, void *item, void *after) nni_list_node *where = NODE(list, after); if ((node->ln_next != NULL) || (node->ln_prev != NULL)) { - nni_panic("prepending node already on a list or not inited"); + nni_panic("inserting node already on a list or not inited"); } node->ln_prev = where; node->ln_next = where->ln_next; diff --git a/src/core/msgqueue.c b/src/core/msgqueue.c index 147c0e20..9607f562 100644 --- a/src/core/msgqueue.c +++ b/src/core/msgqueue.c @@ -172,6 +172,7 @@ nni_msgq_fini(nni_msgq *mq) if (mq == NULL) { return; } + nni_timer_cancel(&mq->mq_timer); nni_thr_fini(&mq->mq_notify_thr); nni_cv_fini(&mq->mq_drained); nni_cv_fini(&mq->mq_writeable); |