3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-21 15:12:03 +08:00
Code Issues Projects Releases Wiki Activity

Problem: HWM always boosted by 1

Browse Source 
Solution: initialise *hwmboost to -1 instead of 1, and use it only if
it's >= 0. The socket option code checks anyway that the
user-provided value is >= 0 so there is no risk of clashing. The
documentation also specifies that it has to be >= 0.
This commit is contained in:
Luca Boccassi 2017-01-10 11:40:14 +00:00
parent 9f1ba60f50
commit edc770d680
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pipe.cpp
View File

@ -83,8 +83,8 @@ zmq::pipe_t::pipe_t (object_t *parent_, upipe_t *inpipe_, upipe_t *outpipe_,
out_active (true), out_active (true),
hwm (outhwm_), hwm (outhwm_),
lwm (compute_lwm (inhwm_)), lwm (compute_lwm (inhwm_)),
inhwmboost(1), inhwmboost(-1),
outhwmboost(1), outhwmboost(-1),
msgs_read (0), msgs_read (0),
msgs_written (0), msgs_written (0),
peers_msgs_read (0), peers_msgs_read (0),
@ -508,14 +508,14 @@ void zmq::pipe_t::hiccup ()
void zmq::pipe_t::set_hwms (int inhwm_, int outhwm_) void zmq::pipe_t::set_hwms (int inhwm_, int outhwm_)
{ {
int in = inhwm_ + inhwmboost; int in = inhwm_ + (inhwmboost > 0 ? inhwmboost : 0);
int out = outhwm_ + outhwmboost; int out = outhwm_ + (outhwmboost > 0 ? outhwmboost : 0);
// if either send or recv side has hwm <= 0 it means infinite so we should set hwms infinite // if either send or recv side has hwm <= 0 it means infinite so we should set hwms infinite
if (inhwm_ <= 0 || inhwmboost <= 0) if (inhwm_ <= 0 || inhwmboost == 0)
in = 0; in = 0;
if (outhwm_ <= 0 || outhwmboost <= 0) if (outhwm_ <= 0 || outhwmboost == 0)
out = 0; out = 0;
lwm = compute_lwm(in); lwm = compute_lwm(in);