From e49115224a7957b0e5d49326bc02ae6af186eaf9 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@fastmq.commkdir>
Date: Tue, 15 Dec 2009 09:09:19 +0100
Subject: zmq_encoder/decoder are able to add/trim prefixes from messages; fair
 queueing and load balancing algorithms factorised into separate classes

---
 src/upstream.hpp | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'src/upstream.hpp')

diff --git a/src/upstream.hpp b/src/upstream.hpp
index 0e2f5ad..3c82cdb 100644
--- a/src/upstream.hpp
+++ b/src/upstream.hpp
@@ -21,7 +21,7 @@
 #define __ZMQ_UPSTREAM_HPP_INCLUDED__
 
 #include "socket_base.hpp"
-#include "yarray.hpp"
+#include "fq.hpp"
 
 namespace zmq
 {
@@ -48,16 +48,8 @@ namespace zmq
 
     private:
 
-        //  Inbound pipes.
-        typedef yarray_t <class reader_t> pipes_t;
-        pipes_t pipes;
-
-        //  Number of active pipes. All the active pipes are located at the
-        //  beginning of the pipes array.
-        pipes_t::size_type active;
-
-        //  Index of the next bound pipe to read a message from.
-        pipes_t::size_type current;
+        //  Fair queueing object for inbound pipes.
+        fq_t fq;
 
         upstream_t (const upstream_t&);
         void operator = (const upstream_t&);
-- 
cgit v1.2.3