generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-18 03:29:49 +02:00
Code Issues Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Martin Hurton
2014-09-11 16:00:48 +02:00
parent 41a9968c2e
commit 5a497d7d0c
3 changed files with 18 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/session_base.cpp
View File

@@ -38,7 +38,6 @@ zmq::session_base_t *zmq::session_base_t::create (class io_thread_t *io_thread_,
bool active_, class socket_base_t *socket_, const options_t &options_, bool active_, class socket_base_t *socket_, const options_t &options_,
address_t *addr_) address_t *addr_)
{ {
session_base_t *s = NULL; session_base_t *s = NULL;
switch (options_.type) { switch (options_.type) {
case ZMQ_REQ: case ZMQ_REQ:
@@ -228,8 +227,10 @@ void zmq::session_base_t::pipe_terminated (pipe_t *pipe_)
// If we are waiting for pending messages to be sent, at this point // If we are waiting for pending messages to be sent, at this point
// we are sure that there will be no more messages and we can proceed // we are sure that there will be no more messages and we can proceed
// with termination safely. // with termination safely.
if (pending && !pipe && !zap_pipe && terminating_pipes.empty ()) if (pending && !pipe && !zap_pipe && terminating_pipes.empty ()) {
proceed_with_term (); pending = false;
own_t::process_term (0);
}
} }
void zmq::session_base_t::read_activated (pipe_t *pipe_) void zmq::session_base_t::read_activated (pipe_t *pipe_)
@@ -354,7 +355,7 @@ void zmq::session_base_t::process_attach (i_engine *engine_)
// Remember the local end of the pipe. // Remember the local end of the pipe.
zmq_assert (!pipe); zmq_assert (!pipe);
pipe = pipes [0]; pipe = pipes [0];
// Store engine assoc_fd for lilnking pipe to fd // Store engine assoc_fd for linking pipe to fd
pipe->assoc_fd = engine_->get_assoc_fd (); pipe->assoc_fd = engine_->get_assoc_fd ();
pipes [1]->assoc_fd = pipe->assoc_fd; pipes [1]->assoc_fd = pipe->assoc_fd;
// Ask socket to plug into the remote end of the pipe. // Ask socket to plug into the remote end of the pipe.
@@ -409,8 +410,8 @@ void zmq::session_base_t::process_term (int linger_)
// If the termination of the pipe happens before the term command is // If the termination of the pipe happens before the term command is
// delivered there's nothing much to do. We can proceed with the // delivered there's nothing much to do. We can proceed with the
// standard termination immediately. // standard termination immediately.
if (!pipe && !zap_pipe) { if (!pipe && !zap_pipe && terminating_pipes.empty ()) {
proceed_with_term (); own_t::process_term (0);
return; return;
} }
@@ -440,15 +441,6 @@ void zmq::session_base_t::process_term (int linger_)
zap_pipe->terminate (false); zap_pipe->terminate (false);
} }
void zmq::session_base_t::proceed_with_term ()
{
// The pending phase has just ended.
pending = false;
// Continue with standard termination.
own_t::process_term (0);
}
void zmq::session_base_t::timer_event (int id_) void zmq::session_base_t::timer_event (int id_)
{ {
// Linger period expired. We can proceed with termination even though // Linger period expired. We can proceed with termination even though
@@ -580,8 +572,7 @@ void zmq::session_base_t::start_connecting (bool wait_)
#endif #endif
#ifdef ZMQ_HAVE_NORM #ifdef ZMQ_HAVE_NORM
if (addr->protocol == "norm") if (addr->protocol == "norm") {
{
// At this point we'll create message pipes to the session straight // At this point we'll create message pipes to the session straight
// away. There's no point in delaying it as no concept of 'connect' // away. There's no point in delaying it as no concept of 'connect'
// exists with NORM anyway. // exists with NORM anyway.

5
src/session_base.hpp
View File

@@ -112,12 +112,9 @@ namespace zmq
// Call this function when engine disconnect to get rid of leftovers. // Call this function when engine disconnect to get rid of leftovers.
void clean_pipes (); void clean_pipes ();
// Call this function to move on with the delayed process_term.
void proceed_with_term ();
// If true, this session (re)connects to the peer. Otherwise, it's // If true, this session (re)connects to the peer. Otherwise, it's
// a transient session created by the listener. // a transient session created by the listener.
bool active; const bool active;
// Pipe connecting the session to its socket. // Pipe connecting the session to its socket.
zmq::pipe_t *pipe; zmq::pipe_t *pipe;

4
src/xpub.cpp
View File

@@ -27,10 +27,10 @@
zmq::xpub_t::xpub_t (class ctx_t *parent_, uint32_t tid_, int sid_) : zmq::xpub_t::xpub_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
socket_base_t (parent_, tid_, sid_), socket_base_t (parent_, tid_, sid_),
verbose (false), verbose (false),
more (false) more (false),
lossy (true)
{ {
options.type = ZMQ_XPUB; options.type = ZMQ_XPUB;
lossy = true;
} }
zmq::xpub_t::~xpub_t () zmq::xpub_t::~xpub_t ()