From 132acf7ceb59aa9567a7d254686dd612a3a79dfb Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sat, 18 Jan 2020 11:25:38 -0800 Subject: TTL reads could be fewer. Specifically, we don't need to read the atomic value each loop iteration. We can just get it when a message is first received, and then use that value. This should make receiving through proxies a little more efficient. --- src/protocol/reqrep0/rep.c | 8 +++++--- src/protocol/reqrep0/xrep.c | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src/protocol/reqrep0') diff --git a/src/protocol/reqrep0/rep.c b/src/protocol/reqrep0/rep.c index 3cc1802a..b546044d 100644 --- a/src/protocol/reqrep0/rep.c +++ b/src/protocol/reqrep0/rep.c @@ -491,6 +491,7 @@ rep0_pipe_recv_cb(void *arg) nni_aio * aio; size_t len; int hops; + int ttl; if (nni_aio_result(&p->aio_recv) != 0) { nni_pipe_close(p->pipe); @@ -498,6 +499,7 @@ rep0_pipe_recv_cb(void *arg) } msg = nni_aio_get_msg(&p->aio_recv); + ttl = nni_atomic_get(&s->ttl); nni_msg_set_pipe(msg, p->id); @@ -506,7 +508,7 @@ rep0_pipe_recv_cb(void *arg) for (;;) { bool end; - if (hops > nni_atomic_get(&s->ttl)) { + if (hops > ttl) { // This isn't malformed, but it has gone // through too many hops. Do not disconnect, // because we can legitimately receive messages @@ -577,8 +579,8 @@ static int rep0_sock_set_max_ttl(void *arg, const void *buf, size_t sz, nni_opt_type t) { rep0_sock *s = arg; - int ttl; - int rv; + int ttl; + int rv; if ((rv = nni_copyin_int(&ttl, buf, sz, 1, 255, t)) == 0) { nni_atomic_set(&s->ttl, ttl); diff --git a/src/protocol/reqrep0/xrep.c b/src/protocol/reqrep0/xrep.c index e5d96f02..a036e6f6 100644 --- a/src/protocol/reqrep0/xrep.c +++ b/src/protocol/reqrep0/xrep.c @@ -283,12 +283,15 @@ xrep0_pipe_recv_cb(void *arg) xrep0_sock *s = p->rep; nni_msg * msg; int hops; + int ttl; if (nni_aio_result(&p->aio_recv) != 0) { nni_pipe_close(p->pipe); return; } + ttl = nni_atomic_get(&s->ttl); + msg = nni_aio_get_msg(&p->aio_recv); nni_aio_set_msg(&p->aio_recv, NULL); @@ -302,7 +305,7 @@ xrep0_pipe_recv_cb(void *arg) for (;;) { bool end = 0; uint8_t *body; - if (hops > (int)nni_atomic_get(&s->ttl)) { + if (hops > ttl) { // This isn't malformed, but it has gone through // too many hops. Do not disconnect, because we // can legitimately receive messages with too many -- cgit v1.2.3-70-g09d2