Source Format Enforcement (#763)

[thirdparty/squid.git] / src / Pipeline.cc

diff --git a/src/Pipeline.cc b/src/Pipeline.cc
index 58f2cc44487168632278a56dccc5ccae0bd97c33..03e99f6542e1ea3530f69acc01c1fff3e5a99bf9 100644 (file)
--- a/src/Pipeline.cc
+++ b/src/Pipeline.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2016 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2021 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -13,61 +13,51 @@
 #include "anyp/PortCfg.h"
 #include "client_side.h"
 #include "Debug.h"
-#include "http/StreamContext.h"
+#include "http/Stream.h"
 #include "Pipeline.h"
 
 void
-Pipeline::add(const Http::StreamContextPointer &c)
+Pipeline::add(const Http::StreamPointer &c)
 {
     requests.push_back(c);
     ++nrequests;
-    ++nactive;
     debugs(33, 3, "Pipeline " << (void*)this << " add request " << nrequests << ' ' << c);
 }
 
-Http::StreamContextPointer
+Http::StreamPointer
 Pipeline::front() const
 {
     if (requests.empty()) {
         debugs(33, 3, "Pipeline " << (void*)this << " empty");
-        return Http::StreamContextPointer();
+        return Http::StreamPointer();
     }
 
     debugs(33, 3, "Pipeline " << (void*)this << " front " << requests.front());
     return requests.front();
 }
 
-void
-Pipeline::terminateAll(int xerrno)
+Http::StreamPointer
+Pipeline::back() const
 {
-    while (!requests.empty()) {
-        Http::StreamContextPointer context = requests.front();
-        debugs(33, 3, "Pipeline " << (void*)this << " notify(" << xerrno << ") " << context);
-        context->noteIoError(xerrno);
-        context->finished();  // cleanup and self-deregister
-        assert(context != requests.front());
+    if (requests.empty()) {
+        debugs(33, 3, "Pipeline " << (void*)this << " empty");
+        return Http::StreamPointer();
     }
+
+    debugs(33, 3, "Pipeline " << (void*)this << " back " << requests.back());
+    return requests.back();
 }
 
 void
-Pipeline::popById(uint32_t which)
+Pipeline::popMe(const Http::StreamPointer &which)
 {
     if (requests.empty())
         return;
 
-    debugs(33, 3, "Pipeline " << (void*)this << " drop id=" << which);
-
-    // find the context and clear its Pointer
-    for (auto &&i : requests) {
-        if (i->id == which) {
-            i = nullptr;
-            --nactive;
-            break;
-        }
-    }
-
-    // trim closed contexts from the list head (if any)
-    while (!requests.empty() && !requests.front())
-        requests.pop_front();
+    debugs(33, 3, "Pipeline " << (void*)this << " drop " << requests.front());
+    // in reality there may be multiple contexts doing processing in parallel.
+    // XXX: pipeline still assumes HTTP/1 FIFO semantics are obeyed.
+    assert(which == requests.front());
+    requests.pop_front();
 }