You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2012/11/14 21:11:58 UTC
svn commit: r1409361 - in /qpid/proton/trunk/proton-c/src: driver.c
engine/engine.c util.c util.h
Author: kgiusti
Date: Wed Nov 14 20:11:57 2012
New Revision: 1409361
URL: http://svn.apache.org/viewvc?rev=1409361&view=rev
Log:
PROTON-111: minor cleanups
Modified:
qpid/proton/trunk/proton-c/src/driver.c
qpid/proton/trunk/proton-c/src/engine/engine.c
qpid/proton/trunk/proton-c/src/util.c
qpid/proton/trunk/proton-c/src/util.h
Modified: qpid/proton/trunk/proton-c/src/driver.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/driver.c?rev=1409361&r1=1409360&r2=1409361&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/driver.c (original)
+++ qpid/proton/trunk/proton-c/src/driver.c Wed Nov 14 20:11:57 2012
@@ -722,7 +722,7 @@ static void pn_driver_rebuild(pn_driver_
for (int i = 0; i < d->connector_count; i++)
{
if (!c->closed) {
- d->wakeup = pn_timestamp_next_expire(d->wakeup, c->wakeup);
+ d->wakeup = pn_timestamp_min(d->wakeup, c->wakeup);
d->fds[d->nfds].fd = c->fd;
d->fds[d->nfds].events = (c->status & PN_SEL_RD ? POLLIN : 0) | (c->status & PN_SEL_WR ? POLLOUT : 0);
d->fds[d->nfds].revents = 0;
Modified: qpid/proton/trunk/proton-c/src/engine/engine.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/engine/engine.c?rev=1409361&r1=1409360&r2=1409361&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine.c Wed Nov 14 20:11:57 2012
@@ -1876,16 +1876,17 @@ static pn_timestamp_t pn_process_tick(pn
if (transport->remote_idle_timeout && !transport->close_sent) {
if (transport->keepalive_deadline == 0 ||
transport->last_bytes_output != transport->bytes_output) {
- transport->keepalive_deadline = now + (transport->remote_idle_timeout/2.0);
- transport->last_bytes_output = transport->bytes_output;
- } else if (transport->keepalive_deadline <= now) {
- transport->keepalive_deadline = now + (transport->remote_idle_timeout/2.0);
- if (transport->disp->available == 0) { // no outbound data ready
- pn_post_frame(transport->disp, 0, ""); // so send empty frame
- transport->last_bytes_output += 8; // and account for it!
+ transport->keepalive_deadline = now + (transport->remote_idle_timeout/2.0);
+ transport->last_bytes_output = transport->bytes_output;
+ } else if (transport->keepalive_deadline <= now) {
+ transport->keepalive_deadline = now + (transport->remote_idle_timeout/2.0);
+ if (transport->disp->available == 0) { // no outbound data pending
+ // so send empty frame (and account for it!)
+ pn_post_frame(transport->disp, 0, "");
+ transport->last_bytes_output += transport->disp->available;
}
}
- timeout = pn_timestamp_next_expire( timeout, transport->keepalive_deadline );
+ timeout = pn_timestamp_min( timeout, transport->keepalive_deadline );
}
return timeout;
Modified: qpid/proton/trunk/proton-c/src/util.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/util.c?rev=1409361&r1=1409360&r2=1409361&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/util.c (original)
+++ qpid/proton/trunk/proton-c/src/util.c Wed Nov 14 20:11:57 2012
@@ -169,7 +169,7 @@ char *pn_strndup(const char *src, size_t
}
// which timestamp will expire next, or zero if none set
-pn_timestamp_t pn_timestamp_next_expire( pn_timestamp_t a, pn_timestamp_t b )
+pn_timestamp_t pn_timestamp_min( pn_timestamp_t a, pn_timestamp_t b )
{
if (a && b) return pn_min(a, b);
if (a) return a;
Modified: qpid/proton/trunk/proton-c/src/util.h
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/util.h?rev=1409361&r1=1409360&r2=1409361&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/util.h (original)
+++ qpid/proton/trunk/proton-c/src/util.h Wed Nov 14 20:11:57 2012
@@ -34,7 +34,7 @@ ssize_t pn_quote_data(char *dst, size_t
void pn_fprint_data(FILE *stream, const char *bytes, size_t size);
void pn_print_data(const char *bytes, size_t size);
bool pn_env_bool(const char *name);
-pn_timestamp_t pn_timestamp_next_expire(pn_timestamp_t a, pn_timestamp_t b);
+pn_timestamp_t pn_timestamp_min(pn_timestamp_t a, pn_timestamp_t b);
#define DIE_IFR(EXPR, STRERR) \
do { \
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org