summaryrefslogtreecommitdiff
path: root/src/fq.cpp
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-03-27 21:25:40 +0100
committerMartin Sustrik <sustrik@250bpm.com>2010-03-27 21:25:40 +0100
commit2f219d7c287cd518bc77b576e507d7a17c9535e9 (patch)
tree02020070a444165da6bbc43c0ea11a8a2ee98a6b /src/fq.cpp
parent842b4dd2e492459cbc0cc79ffdb34ddab8f0b528 (diff)
ZMQ_TBC renamed to ZMQ_MORE
Diffstat (limited to 'src/fq.cpp')
-rw-r--r--src/fq.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/fq.cpp b/src/fq.cpp
index 3ab1d32..9028853 100644
--- a/src/fq.cpp
+++ b/src/fq.cpp
@@ -26,7 +26,7 @@
zmq::fq_t::fq_t () :
active (0),
current (0),
- tbc (false)
+ more (false)
{
}
@@ -45,7 +45,7 @@ void zmq::fq_t::attach (reader_t *pipe_)
void zmq::fq_t::detach (reader_t *pipe_)
{
- zmq_assert (!tbc || pipes [current] != pipe_);
+ zmq_assert (!more || pipes [current] != pipe_);
// Remove the pipe from the list; adjust number of active pipes
// accordingly.
@@ -84,14 +84,14 @@ int zmq::fq_t::recv (zmq_msg_t *msg_, int flags_)
// Try to fetch new message. If we've already read part of the message
// subsequent part should be immediately available.
bool fetched = pipes [current]->read (msg_);
- zmq_assert (!(tbc && !fetched));
+ zmq_assert (!(more && !fetched));
// Note that when message is not fetched, current pipe is killed and
// replaced by another active pipe. Thus we don't have to increase
// the 'current' pointer.
if (fetched) {
- tbc = msg_->flags & ZMQ_MSG_TBC;
- if (!tbc) {
+ more = msg_->flags & ZMQ_MSG_MORE;
+ if (!more) {
current++;
if (current >= active)
current = 0;
@@ -110,7 +110,7 @@ int zmq::fq_t::recv (zmq_msg_t *msg_, int flags_)
bool zmq::fq_t::has_in ()
{
// There are subsequent parts of the partly-read message available.
- if (tbc)
+ if (more)
return true;
// Note that messing with current doesn't break the fairness of fair