3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-31 01:43:02 +08:00
Code Issues Projects Releases Wiki Activity

obsolete 'active' flag removed from session_t

Browse Source
This commit is contained in:
Martin Sustrik 2010-09-19 08:39:53 +02:00
parent 4c6d07d366
commit 5153b6368b
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/session.cpp
View File

@ -31,7 +31,6 @@ zmq::session_t::session_t (class io_thread_t *io_thread_,
options (options_),
in_pipe (NULL),
incomplete_in (false),
active (true),
out_pipe (NULL),
engine (NULL),
socket (socket_),
@ -60,13 +59,11 @@ void zmq::session_t::terminate ()
bool zmq::session_t::read (::zmq_msg_t *msg_)
{
if (!in_pipe || !active)
if (!in_pipe)
return false;
if (!in_pipe->read (msg_)) {
active = false;
if (!in_pipe->read (msg_))
return false;
}
incomplete_in = msg_->flags & ZMQ_MSG_MORE;
return true;
@ -117,7 +114,6 @@ void zmq::session_t::attach_pipes (class reader_t *inpipe_,
if (inpipe_) {
zmq_assert (!in_pipe);
in_pipe = inpipe_;
active = true;
in_pipe->set_event_sink (this);
}
@ -133,7 +129,6 @@ void zmq::session_t::attach_pipes (class reader_t *inpipe_,
void zmq::session_t::terminated (reader_t *pipe_)
{
active = false;
in_pipe = NULL;
finalise ();
}
@ -147,7 +142,7 @@ void zmq::session_t::terminated (writer_t *pipe_)
void zmq::session_t::activated (reader_t *pipe_)
{
zmq_assert (in_pipe == pipe_);
active = true;
if (engine)
engine->activate_out ();
}

3
src/session.hpp
View File

@ -104,9 +104,6 @@ namespace zmq
// is still in the in pipe.
bool incomplete_in;
// If true, in_pipe is active. Otherwise there are no messages to get.
bool active;
// Outbound pipe, i.e. one the socket is sending messages to.
class writer_t *out_pipe;