generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-02-20 22:31:34 +01:00
Code Issues Projects Releases Wiki Activity

lb: bugfix - never skip active pipe when sending msg

Browse Source
This commit is contained in:
Martin Hurton 2010-02-10 12:48:04 +01:00
parent 6b3c1798e7
commit bc9b7f1f54
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lb.cpp
View File

@ -46,8 +46,11 @@ void zmq::lb_t::detach (writer_t *pipe_)
{
// Remove the pipe from the list; adjust number of active pipes
// accordingly.
if (pipes.index (pipe_) < active)
if (pipes.index (pipe_) < active) {
active--;
if (current == active)
current = 0;
}
pipes.erase (pipe_);
}
@ -55,6 +58,8 @@ void zmq::lb_t::kill (writer_t *pipe_)
{
// Move the pipe to the list of inactive pipes.
active--;
if (current == active)
current = 0;
pipes.swap (pipes.index (pipe_), active);
}
@ -73,11 +78,6 @@ int zmq::lb_t::send (zmq_msg_t *msg_, int flags_)
return -1;
}
// Move to the next pipe (load-balancing).
current++;
if (current >= active)
current = 0;
// TODO: Implement this once queue limits are in-place.
zmq_assert (pipes [current]->check_write (zmq_msg_size (msg_)));
@ -89,6 +89,11 @@ int zmq::lb_t::send (zmq_msg_t *msg_, int flags_)
int rc = zmq_msg_init (msg_);
zmq_assert (rc == 0);
// Move to the next pipe (load-balancing).
current++;
if (current >= active)
current = 0;
return 0;
}