summaryrefslogtreecommitdiff
path: root/src/protocol/pair1
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2020-01-04 10:24:05 -0800
committerGarrett D'Amore <garrett@damore.org>2020-01-04 10:56:40 -0800
commit382b4cff3abd5ccb282ba420ef1f7c7d171ec91a (patch)
tree6860e1cceb52a7dab2763001eb27edf95a0e7246 /src/protocol/pair1
parentbcc3814b58e9b198344bdaf6e7a916a354841275 (diff)
downloadnng-382b4cff3abd5ccb282ba420ef1f7c7d171ec91a.tar.gz
nng-382b4cff3abd5ccb282ba420ef1f7c7d171ec91a.tar.bz2
nng-382b4cff3abd5ccb282ba420ef1f7c7d171ec91a.zip
fixes #1105 pollable can be inlined, and use atomics
This also introduces an nni_atomic_cas64 to help with lock-free designs. Some mechanical renaming was done in some of the protocols for spelling.
Diffstat (limited to 'src/protocol/pair1')
-rw-r--r--src/protocol/pair1/pair.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/protocol/pair1/pair.c b/src/protocol/pair1/pair.c
index df24d77b..2838cb5d 100644
--- a/src/protocol/pair1/pair.c
+++ b/src/protocol/pair1/pair.c
@@ -213,7 +213,7 @@ pair1_pipe_start(void *arg)
nni_mtx_unlock(&s->mtx);
// Schedule a getq. In polyamorous mode we get on the per pipe
- // sendq, as the socket distributes to us. In monogamous mode
+ // send_queue, as the socket distributes to us. In monogamous mode
// we bypass and get from the upper writeq directly (saving a
// set of context switches).
if (s->poly) {
@@ -343,7 +343,7 @@ pair1_sock_getq_cb(void *arg)
// Try a non-blocking send. If this fails we just discard the
// message. We have to do this to avoid head-of-line blocking
// for messages sent to other pipes. Note that there is some
- // buffering in the sendq.
+ // buffering in the send_queue.
if (nni_msgq_tryput(p->sendq, msg) != 0) {
nni_msg_free(msg);
}
@@ -426,7 +426,7 @@ pair1_pipe_send_cb(void *arg)
return;
}
- // In polyamorous mode, we want to get from the sendq; in
+ // In polyamorous mode, we want to get from the send_queue; in
// monogamous we get from upper writeq.
nni_msgq_aio_get(s->poly ? p->sendq : s->uwq, p->aio_getq);
}