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

Destruction of session is delayed till both in & out pipes are closed

Browse Source
This commit is contained in:
Martin Sustrik 2010-08-06 20:55:37 +02:00
parent 05d908492d
commit f77edfce26
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pipe.cpp
View File

@ -130,11 +130,6 @@ void zmq::reader_t::terminate ()
send_pipe_term (writer); send_pipe_term (writer);
} }
bool zmq::reader_t::is_terminating ()
{
return terminating;
}
void zmq::reader_t::process_revive () void zmq::reader_t::process_revive ()
{ {
// Forward the event to the sink (either socket or session). // Forward the event to the sink (either socket or session).

4
src/pipe.hpp
View File

@ -67,10 +67,6 @@ namespace zmq
// Ask pipe to terminate. // Ask pipe to terminate.
void terminate (); void terminate ();
// Returns true if the pipe is already terminating
// (say if delimiter was already read).
bool is_terminating ();
private: private:
reader_t (class object_t *parent_, pipe_t *pipe_, uint64_t lwm_); reader_t (class object_t *parent_, pipe_t *pipe_, uint64_t lwm_);

7
src/session.cpp
View File

@ -71,7 +71,8 @@ zmq::session_t::~session_t ()
bool zmq::session_t::is_terminable () bool zmq::session_t::is_terminable ()
{ {
return in_pipe->is_terminating (); // The session won't send term_ack until both in & out pipe are closed.
return !in_pipe && !out_pipe;
} }
bool zmq::session_t::read (::zmq_msg_t *msg_) bool zmq::session_t::read (::zmq_msg_t *msg_)
@ -81,8 +82,6 @@ bool zmq::session_t::read (::zmq_msg_t *msg_)
if (!in_pipe->read (msg_)) { if (!in_pipe->read (msg_)) {
active = false; active = false;
if (in_pipe->is_terminating ())
finalise ();
return false; return false;
} }
@ -179,11 +178,13 @@ void zmq::session_t::terminated (reader_t *pipe_)
{ {
active = false; active = false;
in_pipe = NULL; in_pipe = NULL;
finalise ();
} }
void zmq::session_t::terminated (writer_t *pipe_) void zmq::session_t::terminated (writer_t *pipe_)
{ {
out_pipe = NULL; out_pipe = NULL;
finalise ();
} }
void zmq::session_t::activated (reader_t *pipe_) void zmq::session_t::activated (reader_t *pipe_)