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
The following commit(s) were added to refs/heads/master by this push: new a051803 PROTON-985: Modify pn_transport_tick to use a monotonic clock. a051803 is described below commit a051803e0fb25cef2f25e829bac6c516ab0aab7c Author: Alan Conway <acon...@redhat.com> AuthorDate: Fri Dec 14 14:02:37 2018 -0500 PROTON-985: Modify pn_transport_tick to use a monotonic clock. --- c/include/proton/transport.h | 5 +++-- c/src/core/transport.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/c/include/proton/transport.h b/c/include/proton/transport.h index cf965c5..e9f3288 100644 --- a/c/include/proton/transport.h +++ b/c/include/proton/transport.h @@ -680,7 +680,8 @@ PN_EXTERN bool pn_transport_closed(pn_transport_t *transport); * * * @param[in] transport the transport to process. - * @param[in] now the current time + * @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 @@ -688,7 +689,7 @@ PN_EXTERN bool pn_transport_closed(pn_transport_t *transport); * * @internal XXX Deprecate when tick is added to connection driver */ -PN_EXTERN pn_timestamp_t pn_transport_tick(pn_transport_t *transport, pn_timestamp_t now); +PN_EXTERN pn_timestamp_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 545897a..87c9351 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, pn_timestamp_t now) +pn_timestamp_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-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org