nghttpx: Use std::priority_queue

ruanrj · Jan 21, 2019 · 8dc2b26 · 8dc2b26
1 parent 8d84270
commit 8dc2b26
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 314 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -163,7 +163,6 @@ if(ENABLE_APP)
       memchunk_test.cc
       template_test.cc
       base64_test.cc
-      priority_queue_test.cc
     )
     add_executable(nghttpx-unittest EXCLUDE_FROM_ALL
       ${NGHTTPX_UNITTEST_SOURCES}

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -140,8 +140,7 @@ NGHTTPX_SRCS = \
 	shrpx_dual_dns_resolver.cc shrpx_dual_dns_resolver.h \
 	shrpx_dns_tracker.cc shrpx_dns_tracker.h \
 	buffer.h memchunk.h template.h allocator.h \
-	xsi_strerror.c xsi_strerror.h \
-	priority_queue.h
+	xsi_strerror.c xsi_strerror.h
 
 if HAVE_MRUBY
 NGHTTPX_SRCS += \
@@ -187,8 +186,7 @@ nghttpx_unittest_SOURCES = shrpx-unittest.cc \
 	buffer_test.cc buffer_test.h \
 	memchunk_test.cc memchunk_test.h \
 	template_test.cc template_test.h \
-	base64_test.cc base64_test.h \
-	priority_queue_test.cc priority_queue_test.h
+	base64_test.cc base64_test.h
 nghttpx_unittest_CPPFLAGS = ${AM_CPPFLAGS} \
 	-DNGHTTP2_SRC_DIR=\"$(top_srcdir)/src\"
 nghttpx_unittest_LDADD = libnghttpx.a ${LDADD} @CUNIT_LIBS@ @TESTLDADD@

diff --git a/src/priority_queue.h b/src/priority_queue.h
diff --git a/src/priority_queue_test.cc b/src/priority_queue_test.cc
diff --git a/src/priority_queue_test.h b/src/priority_queue_test.h
diff --git a/src/shrpx-unittest.cc b/src/shrpx-unittest.cc
@@ -45,7 +45,6 @@
 #include "shrpx_config.h"
 #include "tls.h"
 #include "shrpx_router_test.h"
-#include "priority_queue_test.h"
 #include "shrpx_log.h"
 
 static int init_suite1(void) { return 0; }
@@ -218,9 +217,7 @@ int main(int argc, char *argv[]) {
       !CU_add_test(pSuite, "template_string_ref",
                    nghttp2::test_template_string_ref) ||
       !CU_add_test(pSuite, "base64_encode", nghttp2::test_base64_encode) ||
-      !CU_add_test(pSuite, "base64_decode", nghttp2::test_base64_decode) ||
-      !CU_add_test(pSuite, "priority_queue_push",
-                   nghttp2::test_priority_queue_push)) {
+      !CU_add_test(pSuite, "base64_decode", nghttp2::test_base64_decode)) {
     CU_cleanup_registry();
     return CU_get_error();
   }

diff --git a/src/shrpx_client_handler.cc b/src/shrpx_client_handler.cc
@@ -754,27 +754,29 @@ uint32_t ClientHandler::get_affinity_cookie(Downstream *downstream,
 }
 
 namespace {
-void reschedule_addr(PriorityQueue<DownstreamAddrKey, DownstreamAddr *,
-                                   DownstreamAddrKeyLess> &pq,
-                     DownstreamAddr *addr) {
+void reschedule_addr(
+    std::priority_queue<DownstreamAddrEntry, std::vector<DownstreamAddrEntry>,
+                        DownstreamAddrEntryGreater> &pq,
+    DownstreamAddr *addr) {
   auto penalty = MAX_DOWNSTREAM_ADDR_WEIGHT + addr->pending_penalty;
   addr->cycle += penalty / addr->weight;
   addr->pending_penalty = penalty % addr->weight;
 
-  pq.emplace(DownstreamAddrKey{addr->cycle, addr->seq}, addr);
+  pq.push(DownstreamAddrEntry{addr, addr->seq, addr->cycle});
   addr->queued = true;
 }
 } // namespace
 
 namespace {
 void reschedule_wg(
-    PriorityQueue<DownstreamAddrKey, WeightGroup *, DownstreamAddrKeyLess> &pq,
+    std::priority_queue<WeightGroupEntry, std::vector<WeightGroupEntry>,
+                        WeightGroupEntryGreater> &pq,
     WeightGroup *wg) {
   auto penalty = MAX_DOWNSTREAM_ADDR_WEIGHT + wg->pending_penalty;
   wg->cycle += penalty / wg->weight;
   wg->pending_penalty = penalty % wg->weight;
 
-  pq.emplace(DownstreamAddrKey{wg->cycle, wg->seq}, wg);
+  pq.push(WeightGroupEntry{wg, wg->seq, wg->cycle});
   wg->queued = true;
 }
 } // namespace
@@ -857,7 +859,7 @@ DownstreamAddr *ClientHandler::get_downstream_addr(int &err,
       return nullptr;
     }
 
-    auto wg = wgpq.top();
+    auto wg = wgpq.top().wg;
     wgpq.pop();
     wg->queued = false;
 
@@ -866,7 +868,7 @@ DownstreamAddr *ClientHandler::get_downstream_addr(int &err,
         break;
       }
 
-      auto addr = wg->pq.top();
+      auto addr = wg->pq.top().addr;
       wg->pq.pop();
       addr->queued = false;