From 0f10ef1b38afdecaaccf2b0c28501e55411c664f Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 5 Jun 2015 13:45:10 -0700 Subject: [PATCH] fix scope of itemsout poll indentation was correct, but poll was inside `if control`, causing it to only be called if there is a control message. This would cause proxy messages to only be delivered after a control message had been sent. --- src/proxy.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/proxy.cpp b/src/proxy.cpp index 0d2b6b16..c79aeff6 100644 --- a/src/proxy.cpp +++ b/src/proxy.cpp @@ -93,18 +93,18 @@ int zmq::proxy ( if (unlikely (rc < 0)) return -1; - // Process a control command if any - if (control_ && items [2].revents & ZMQ_POLLIN) { - rc = control_->recv (&msg, 0); - if (unlikely (rc < 0)) - return -1; - // Get the pollout separately because when combining this with pollin it maxes the CPU // because pollout shall most of the time return directly rc = zmq_poll (&itemsout [0], 2, 0); if (unlikely (rc < 0)) return -1; + // Process a control command if any + if (control_ && items [2].revents & ZMQ_POLLIN) { + rc = control_->recv (&msg, 0); + if (unlikely (rc < 0)) + return -1; + moresz = sizeof more; rc = control_->getsockopt (ZMQ_RCVMORE, &more, &moresz); if (unlikely (rc < 0) || more)