Commit 9f1ba60f authored by Luca Boccassi's avatar Luca Boccassi

Problem: modifying pipe from different thread is not safe

Solution: revert change from #2299 to avoid bugs while we look for an
alternative and thread-safe solution
parent 598befc1
......@@ -522,11 +522,6 @@ void zmq::pipe_t::set_hwms (int inhwm_, int outhwm_)
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_;
......
......@@ -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_);
......
......@@ -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);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment