diff options
author | Martin Sustrik <sustrik@250bpm.com> | 2011-05-22 17:26:53 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@250bpm.com> | 2011-05-22 17:26:53 +0200 |
commit | acf0b0e515515e51ad32ba7a2d147ce703579478 (patch) | |
tree | d2032009cf46c23aa0f677c2216914f718ab968a /src/xrep.hpp | |
parent | 9e6b39925603f9e64db08c469bd628d7ef9465de (diff) |
Introduces bi-directional pipes
So far, there was a pair of unidirectional pipes between a socket
and a session (or an inproc peer). This resulted in complex
problems with half-closed states and tracking which inpipe
corresponds to which outpipe.
This patch doesn't add any functionality in itself, but is
essential for further work on features like subscription
forwarding.
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/xrep.hpp')
-rw-r--r-- | src/xrep.hpp | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/xrep.hpp b/src/xrep.hpp index 7ca138c..d0378c2 100644 --- a/src/xrep.hpp +++ b/src/xrep.hpp @@ -35,8 +35,7 @@ namespace zmq // TODO: This class uses O(n) scheduling. Rewrite it to use O(1) algorithm. class xrep_t : public socket_base_t, - public i_reader_events, - public i_writer_events + public i_pipe_events { public: @@ -44,8 +43,7 @@ namespace zmq ~xrep_t (); // Overloads of functions from socket_base_t. - void xattach_pipes (reader_t *inpipe_, writer_t *outpipe_, - const blob_t &peer_identity_); + void xattach_pipe (class pipe_t *pipe_, const blob_t &peer_identity_); int xsend (class msg_t *msg_, int flags_); int xrecv (class msg_t *msg_, int flags_); bool xhas_in (); @@ -61,18 +59,14 @@ namespace zmq // Hook into the termination process. void process_term (int linger_); - // i_reader_events interface implementation. - void activated (reader_t *pipe_); - void terminated (reader_t *pipe_); - void delimited (reader_t *pipe_); - - // i_writer_events interface implementation. - void activated (writer_t *pipe_); - void terminated (writer_t *pipe_); + // i_pipe_events interface implementation. + void read_activated (pipe_t *pipe_); + void write_activated (pipe_t *pipe_); + void terminated (pipe_t *pipe_); struct inpipe_t { - class reader_t *reader; + class pipe_t *pipe; blob_t identity; bool active; }; @@ -95,7 +89,7 @@ namespace zmq struct outpipe_t { - class writer_t *writer; + class pipe_t *pipe; bool active; }; @@ -104,7 +98,7 @@ namespace zmq outpipes_t outpipes; // The pipe we are currently writing to. - class writer_t *current_out; + class pipe_t *current_out; // If true, more outgoing message parts are expected. bool more_out; |