generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-13 02:42:58 +01:00
Code Issues Projects Releases Wiki Activity

Problem: xwrite_activated duplicated between stream_t and router_t

Browse Source 
Solution: pull up into routing_socket_base_t
This commit is contained in:
Simon Giesecke 2018-05-29 11:40:40 +02:00
parent c9d6ef3035
commit 09fab930b3
6 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/router.cpp
View File

@ -176,18 +176,6 @@ void zmq::router_t::xread_activated (pipe_t *pipe_)
}
}
void zmq::router_t::xwrite_activated (pipe_t *pipe_)
{
out_pipes_t::iterator it;
for (it = _out_pipes.begin (); it != _out_pipes.end (); ++it)
if (it->second.pipe == pipe_)
break;
zmq_assert (it != _out_pipes.end ());
zmq_assert (!it->second.active);
it->second.active = true;
}
int zmq::router_t::xsend (msg_t *msg_)
{
// If this is the first part of the message it's the ID of the

1
src/router.hpp
View File

@ -59,7 +59,6 @@ class router_t : public routing_socket_base_t
bool xhas_in ();
bool xhas_out ();
void xread_activated (zmq::pipe_t *pipe_);
void xwrite_activated (zmq::pipe_t *pipe_);
void xpipe_terminated (zmq::pipe_t *pipe_);
int get_peer_state (const void *identity_, size_t identity_size_) const;

12
src/socket_base.cpp
View File

@ -1789,6 +1789,18 @@ int zmq::routing_socket_base_t::xsetsockopt (int option_,
return -1;
}
void zmq::routing_socket_base_t::xwrite_activated (pipe_t *pipe_)
{
out_pipes_t::iterator it;
for (it = _out_pipes.begin (); it != _out_pipes.end (); ++it)
if (it->second.pipe == pipe_)
break;
zmq_assert (it != _out_pipes.end ());
zmq_assert (!it->second.active);
it->second.active = true;
}
std::string zmq::routing_socket_base_t::extract_connect_routing_id ()
{
std::string res = ZMQ_MOVE (_connect_routing_id);

5
src/socket_base.hpp
View File

@ -306,11 +306,14 @@ class routing_socket_base_t : public socket_base_t
virtual int
xsetsockopt (int option_, const void *optval_, size_t optvallen_);
void xwrite_activated (pipe_t *pipe_);
std::string extract_connect_routing_id ();
struct out_pipe_t
{
zmq::pipe_t *pipe;
pipe_t *pipe;
bool active;
};

14
src/stream.cpp
View File

@ -74,6 +74,8 @@ void zmq::stream_t::xpipe_terminated (pipe_t *pipe_)
zmq_assert (it != _out_pipes.end ());
_out_pipes.erase (it);
_fq.pipe_terminated (pipe_);
// TODO router_t calls pipe_->rollback() here; should this be done here as
// well? then xpipe_terminated could be pulled up to routing_socket_base_t
if (pipe_ == _current_out)
_current_out = NULL;
}
@ -83,18 +85,6 @@ void zmq::stream_t::xread_activated (pipe_t *pipe_)
_fq.activated (pipe_);
}
void zmq::stream_t::xwrite_activated (pipe_t *pipe_)
{
out_pipes_t::iterator it;
for (it = _out_pipes.begin (); it != _out_pipes.end (); ++it)
if (it->second.pipe == pipe_)
break;
zmq_assert (it != _out_pipes.end ());
zmq_assert (!it->second.active);
it->second.active = true;
}
int zmq::stream_t::xsend (msg_t *msg_)
{
// If this is the first part of the message it's the ID of the

1
src/stream.hpp
View File

@ -52,7 +52,6 @@ class stream_t : public routing_socket_base_t
bool xhas_in ();
bool xhas_out ();
void xread_activated (zmq::pipe_t *pipe_);
void xwrite_activated (zmq::pipe_t *pipe_);
void xpipe_terminated (zmq::pipe_t *pipe_);
int xsetsockopt (int option_, const void *optval_, size_t optvallen_);