aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2021-08-21 16:43:16 -0700
committerGarrett D'Amore <garrett@damore.org>2021-08-21 16:43:16 -0700
commitd4b91214c125de33d2e8d3f52fecd8eac18e476c (patch)
tree1795f05e0b4a43bd0ffe08f88068ae969adb7fea
parent9dfe06425942fdc887851d362f9f31b24935c494 (diff)
downloadnng-d4b91214c125de33d2e8d3f52fecd8eac18e476c.tar.gz
nng-d4b91214c125de33d2e8d3f52fecd8eac18e476c.tar.bz2
nng-d4b91214c125de33d2e8d3f52fecd8eac18e476c.zip
Minor cleanups.
-rw-r--r--src/core/socket.h10
-rw-r--r--src/core/sockimpl.h3
2 files changed, 6 insertions, 7 deletions
diff --git a/src/core/socket.h b/src/core/socket.h
index e653329b..57a77681 100644
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -41,11 +41,11 @@ extern uint32_t nni_sock_id(nni_sock *);
// Note that each of these should be called without any locks held, since
// the socket can reenter the protocol.
-// nni_socket_sendq obtains the upper writeq. The protocol should
+// nni_socket_sendq obtains the upper write queue. The protocol should
// receive messages from this, and place them on the appropriate pipe.
extern nni_msgq *nni_sock_sendq(nni_sock *);
-// nni_socket_recvq obtains the upper readq. The protocol should
+// nni_socket_recvq obtains the upper read queue. The protocol should
// inject incoming messages from pipes to it.
extern nni_msgq *nni_sock_recvq(nni_sock *);
@@ -54,7 +54,7 @@ extern nni_msgq *nni_sock_recvq(nni_sock *);
extern uint32_t nni_sock_flags(nni_sock *);
// This function is used by the public API to set callbacks. It is
-// one of the only cases (the only?) where the socket core understands
+// one of the few cases (the only?) where the socket core understands
// the public data types. (Other solutions might exist, but they require
// keeping extra state to support conversion between public and internal
// types.) The second argument is a mask of events for which the callback
@@ -90,10 +90,10 @@ extern void nni_ctx_close(nni_ctx *);
// nni_ctx_id returns the context ID, which can be used with nni_ctx_find.
extern uint32_t nni_ctx_id(nni_ctx *);
-// nni_ctx_recv is an asychronous receive.
+// nni_ctx_recv receives asynchronously.
extern void nni_ctx_recv(nni_ctx *, nni_aio *);
-// nni_ctx_send is an asychronous receive.
+// nni_ctx_send sends asynchronously.
extern void nni_ctx_send(nni_ctx *, nni_aio *);
// nni_ctx_getopt is used to get a context option.
diff --git a/src/core/sockimpl.h b/src/core/sockimpl.h
index c3b39ab1..22e956b0 100644
--- a/src/core/sockimpl.h
+++ b/src/core/sockimpl.h
@@ -1,5 +1,5 @@
//
-// Copyright 2020 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2021 Staysail Systems, Inc. <info@staysail.tech>
// Copyright 2018 Capitar IT Group BV <info@capitar.com>
//
// This software is supplied under the terms of the MIT License, a
@@ -36,7 +36,6 @@ struct nni_dialer {
nni_duration d_maxrtime; // maximum time for reconnect
nni_duration d_currtime; // current time for reconnect
nni_duration d_inirtime; // initial time for reconnect
- nni_time d_conntime; // time of last good connect
nni_reap_node d_reap;
#ifdef NNG_ENABLE_STATS