Imported Upstream version 2.1.3upstream/2.1.3

1 files changed, 25 insertions, 13 deletions

diff --git a/src/fq.hpp b/src/fq.hpp
index 5c699ee..8c6c95c 100644
--- a/src/fq.hpp
+++ b/src/fq.hpp
@@ -1,26 +1,28 @@
 /*
-    Copyright (c) 2007-2010 iMatix Corporation
+    Copyright (c) 2007-2011 iMatix Corporation
+    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
 
     This file is part of 0MQ.
 
     0MQ is free software; you can redistribute it and/or modify it under
-    the terms of the Lesser GNU General Public License as published by
+    the terms of the GNU Lesser General Public License as published by
     the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
 
     0MQ is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    Lesser GNU General Public License for more details.
+    GNU Lesser General Public License for more details.
 
-    You should have received a copy of the Lesser GNU General Public License
+    You should have received a copy of the GNU Lesser General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef __ZMQ_FQ_HPP_INCLUDED__
 #define __ZMQ_FQ_HPP_INCLUDED__
 
-#include "yarray.hpp"
+#include "array.hpp"
+#include "pipe.hpp"
 
 namespace zmq
 {
@@ -28,24 +30,28 @@ namespace zmq
     //  Class manages a set of inbound pipes. On receive it performs fair
     //  queueing (RFC970) so that senders gone berserk won't cause denial of
     //  service for decent senders.
-    class fq_t
+    class fq_t : public i_reader_events
     {
     public:
 
-        fq_t ();
+        fq_t (class own_t *sink_);
         ~fq_t ();
 
-        void attach (class reader_t *pipe_);
-        void detach (class reader_t *pipe_);
-        void kill (class reader_t *pipe_);
-        void revive (class reader_t *pipe_);
+        void attach (reader_t *pipe_);
+        void terminate ();
+
         int recv (zmq_msg_t *msg_, int flags_);
         bool has_in ();
 
+        //  i_reader_events implementation.
+        void activated (reader_t *pipe_);
+        void terminated (reader_t *pipe_);
+        void delimited (reader_t *pipe_);
+
     private:
 
         //  Inbound pipes.
-        typedef yarray_t <class reader_t> pipes_t;
+        typedef array_t <reader_t> pipes_t;
         pipes_t pipes;
 
         //  Number of active pipes. All the active pipes are located at the
@@ -59,8 +65,14 @@ namespace zmq
         //  there are following parts still waiting in the current pipe.
         bool more;
 
+        //  Object to send events to.
+        class own_t *sink;
+
+        //  If true, termination process is already underway.
+        bool terminating;
+
         fq_t (const fq_t&);
-        void operator = (const fq_t&);
+        const fq_t &operator = (const fq_t&);
     };
 
 }