3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2301 from bluca/set_peer_unsafe

Browse Source 
Problems: modifying pipe from different thread is not safe and HWM always boosted by 1
This commit is contained in:
Constantin Rack 2017-01-10 21:13:25 +01:00 committed by GitHub
commit 4fc313d152
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
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),
hwm (outhwm_),
lwm (compute_lwm (inhwm_)),
inhwmboost(1),
outhwmboost(1),
inhwmboost(-1),
outhwmboost(-1),
msgs_read (0),
msgs_written (0),
peers_msgs_read (0),
@ -508,25 +508,20 @@ void zmq::pipe_t::hiccup ()
void zmq::pipe_t::set_hwms (int inhwm_, int outhwm_)
{
int in = inhwm_ + inhwmboost;
int out = outhwm_ + outhwmboost;
int in = inhwm_ + (inhwmboost > 0 ? inhwmboost : 0);
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 (inhwm_ <= 0 || inhwmboost <= 0)
if (inhwm_ <= 0 || inhwmboost == 0)
in = 0;
if (outhwm_ <= 0 || outhwmboost <= 0)
if (outhwm_ <= 0 || outhwmboost == 0)
out = 0;
lwm = compute_lwm(in);
hwm = out;
}
void zmq::pipe_t::set_peer_hwms (int inhwm_, int outhwm_)
{
peer->set_hwms(inhwm_, outhwm_);
}
void zmq::pipe_t::set_hwms_boost(int inhwmboost_, int outhwmboost_)
{
inhwmboost = inhwmboost_;

3
src/pipe.hpp
View File

@ -133,9 +133,6 @@ namespace zmq
// Set the high water marks.
void set_hwms (int inhwm_, int outhwm_);
// Set the high water marks for peer.
void set_peer_hwms (int inhwm_, int outhwm_);
// Set the boost to high water marks, used by inproc sockets so total hwm are sum of connect and bind sockets watermarks
void set_hwms_boost(int inhwmboost_, int outhwmboost_);

1
src/socket_base.cpp
View File

@ -1414,7 +1414,6 @@ void zmq::socket_base_t::update_pipe_options(int option_)
for (pipes_t::size_type i = 0; i != pipes.size(); ++i)
{
pipes[i]->set_hwms(options.rcvhwm, options.sndhwm);
pipes[i]->set_peer_hwms(options.sndhwm, options.rcvhwm);
}
}