generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-01 11:52:57 +01:00
Code Issues Projects Releases Wiki Activity

potential duplicate termination of pipes removed

Browse Source
This commit is contained in:
Martin Sustrik
2010-09-18 06:42:46 +02:00
parent c7b9ba3ccd
commit 0c215fada4
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/fq.cpp
View File

@@ -73,6 +73,7 @@ void zmq::fq_t::terminated (reader_t *pipe_)
void zmq::fq_t::terminate ()
{
zmq_assert (!terminating);
terminating = true;
if (pipes.empty ()) {

1
src/lb.cpp
View File

@@ -52,6 +52,7 @@ void zmq::lb_t::attach (writer_t *pipe_)
void zmq::lb_t::terminate ()
{
zmq_assert (!terminating);
terminating = true;
if (pipes.empty ()) {

10
src/socket_base.cpp
View File

@@ -703,16 +703,6 @@ void zmq::socket_base_t::process_stop ()
void zmq::socket_base_t::process_bind (reader_t *in_pipe_, writer_t *out_pipe_,
const blob_t &peer_identity_)
{
// If the socket is already being shut down, the termination process on
// the new pipes is started immediately. However, they are still attached
// as to let the process finish in a decent manner.
if (unlikely (zombie)) {
if (in_pipe_)
in_pipe_->terminate ();
if (out_pipe_)
out_pipe_->terminate ();
}
attach_pipes (in_pipe_, out_pipe_, peer_identity_);
}