qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject [qpid-proton] 01/02: PROTON-985: [go] Update pn_proton_tick() return type.
Date Tue, 18 Dec 2018 20:07:49 GMT
This is an automated email from the ASF dual-hosted git repository.

aconway pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git

commit f1fa9f72b8a217d66db5c5b9d9c87c5c40a6400f
Author: Alan Conway <aconway@redhat.com>
AuthorDate: Tue Dec 18 13:03:00 2018 -0500

    PROTON-985: [go] Update pn_proton_tick() return type.
---
 c/include/proton/transport.h | 9 +++++----
 c/src/core/transport.c       | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/c/include/proton/transport.h b/c/include/proton/transport.h
index e9f3288..72dc6c8 100644
--- a/c/include/proton/transport.h
+++ b/c/include/proton/transport.h
@@ -683,13 +683,14 @@ PN_EXTERN bool pn_transport_closed(pn_transport_t *transport);
  * @param[in] now A monotonically-increasing time value in milliseconds.
  *   Does not need to be wall-clock time or a valid AMQP timestamp, but must increase montonically.
  *
- * @return if non-zero, then the expiration time of the next pending timer event for the
- * transport.  The caller must invoke pn_transport_tick again at least once at or before
- * this deadline occurs.
+ * @return If non-zero, then the monotonic expiration time of the next pending
+ * timer event for the transport.  The caller must invoke pn_transport_tick
+ * again at least once at or before this deadline occurs. If 0 there are no
+ * pending events.
  *
  * @internal XXX Deprecate when tick is added to connection driver
  */
-PN_EXTERN pn_timestamp_t pn_transport_tick(pn_transport_t *transport, int64_t now);
+PN_EXTERN int64_t pn_transport_tick(pn_transport_t *transport, int64_t now);
 
 /**
  * **Deprecated** - No replacement.
diff --git a/c/src/core/transport.c b/c/src/core/transport.c
index 87c9351..50bce64 100644
--- a/c/src/core/transport.c
+++ b/c/src/core/transport.c
@@ -2909,7 +2909,7 @@ pn_millis_t pn_transport_get_remote_idle_timeout(pn_transport_t *transport)
   return transport->remote_idle_timeout;
 }
 
-pn_timestamp_t pn_transport_tick(pn_transport_t *transport, int64_t now)
+int64_t pn_transport_tick(pn_transport_t *transport, int64_t now)
 {
   pn_timestamp_t r = 0;
   for (int i = 0; i<PN_IO_LAYER_CT; ++i) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message