Present pipeline via class Server

diff --git a/src/Makefile.am b/src/Makefile.am
index 9da154bf39fb840c59d8b10cd2caa388c31b8d54..c961fb46d036203347c71491a0def16ab17f6010 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -411,6 +411,8 @@ squid_SOURCES = \
        PeerPoolMgr.cc \
        PeerSelectState.h \
        PingData.h \
+       Pipeline.cc \
+       Pipeline.h \
        protos.h \
        redirect.h \
        redirect.cc \
@@ -1379,6 +1381,8 @@ tests_testCacheManager_SOURCES = \
        peer_userhash.cc \
        PeerPoolMgr.h \
        PeerPoolMgr.cc \
+       Pipeline.cc \
+       Pipeline.h \
        redirect.h \
        tests/stub_redirect.cc \
        refresh.h \
@@ -1818,6 +1822,8 @@ tests_testEvent_SOURCES = \
        peer_sourcehash.cc \
        peer_userhash.h \
        peer_userhash.cc \
+       Pipeline.cc \
+       Pipeline.h \
        redirect.h \
        tests/stub_redirect.cc \
        refresh.h \
@@ -2063,6 +2069,8 @@ tests_testEventLoop_SOURCES = \
        peer_sourcehash.cc \
        peer_userhash.h \
        peer_userhash.cc \
+       Pipeline.cc \
+       Pipeline.h \
        RemovalPolicy.cc \
        redirect.h \
        tests/stub_redirect.cc \
@@ -2303,6 +2311,8 @@ tests_test_http_range_SOURCES = \
        peer_sourcehash.cc \
        peer_userhash.h \
        peer_userhash.cc \
+       Pipeline.cc \
+       Pipeline.h \
        pconn.cc \
        redirect.h \
        tests/stub_redirect.cc \
@@ -2631,6 +2641,8 @@ tests_testHttpRequest_SOURCES = \
        peer_userhash.cc \
        PeerPoolMgr.h \
        PeerPoolMgr.cc \
+       Pipeline.cc \
+       Pipeline.h \
        redirect.h \
        tests/stub_libauth_acls.cc \
        tests/stub_redirect.cc \
@@ -3492,6 +3504,8 @@ tests_testURL_SOURCES = \
        peer_sourcehash.cc \
        peer_userhash.h \
        peer_userhash.cc \
+       Pipeline.cc \
+       Pipeline.h \
        redirect.h \
        tests/stub_redirect.cc \
        refresh.h \

diff --git a/src/servers/Server.cc b/src/servers/Server.cc
index 7459967e340ab05ac5301663a7eca3a55cade5dc..09f8bcfba6dd21c85e45a12da41b1cc8986e784e 100644 (file)
--- a/src/servers/Server.cc
+++ b/src/servers/Server.cc
@@ -8,6 +8,7 @@
 
 #include "squid.h"
 #include "anyp/PortCfg.h"
+#include "client_side.h"
 #include "comm.h"
 #include "comm/Read.h"
 #include "Debug.h"

diff --git a/src/servers/Server.h b/src/servers/Server.h
index 72104b19612319638940ef37bf61822c1c931ec0..1bec3efad571a64cec33e66cc2cae1590d400bd2 100644 (file)
--- a/src/servers/Server.h
+++ b/src/servers/Server.h
@@ -17,6 +17,7 @@
 #include "BodyPipe.h"
 #include "comm/forward.h"
 #include "CommCalls.h"
+#include "Pipeline.h"
 #include "SBuf.h"
 
 /**
@@ -96,6 +97,9 @@ public:
 
     bool receivedFirstByte_; ///< true if at least one byte received on this connection
 
+    /// set of requests waiting to be serviced
+    Pipeline pipeline;
+
 protected:
     void doClientRead(const CommIoCbParams &io);
     void clientWriteDone(const CommIoCbParams &io);