[trafficserver] branch master updated: Fix the wrong pop in Http2DependencyTree deactive

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 1c135f6  Fix the wrong pop in Http2DependencyTree deactive
1c135f6 is described below

commit 1c135f6bdfce44dd072a33cfd5330272b48b5e11
Author: scw00 <sc...@apache.org>
AuthorDate: Tue Aug 1 08:48:16 2017 +0800

    Fix the wrong pop in Http2DependencyTree deactive
---
 lib/ts/PriorityQueue.h            |  4 +++
 lib/ts/test_PriorityQueue.cc      | 63 +++++++++++++++++++++++++++++++++++++++
 proxy/http2/Http2DependencyTree.h |  2 +-
 3 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/lib/ts/PriorityQueue.h b/lib/ts/PriorityQueue.h
index c0d2d11..c233670 100644
--- a/lib/ts/PriorityQueue.h
+++ b/lib/ts/PriorityQueue.h
@@ -110,7 +110,9 @@ PriorityQueue<T, Comp>::pop()
     return;
   }
 
+  const uint32_t original_index = _v[0]->index;
   _swap(0, _v.length() - 1);
+  _v[_v.length() - 1]->index = original_index;
   _v.pop();
   _bubble_down(0);
 }
@@ -128,6 +130,8 @@ PriorityQueue<T, Comp>::erase(PriorityQueueEntry<T> *entry)
   if (original_index != (_v.length() - 1)) {
     // Move the erased item to the end to be popped off
     _swap(original_index, _v.length() - 1);
+    // Fix the index before we pop it
+    _v[_v.length() - 1]->index = original_index;
     _v.pop();
     _bubble_down(original_index);
     _bubble_up(original_index);
diff --git a/lib/ts/test_PriorityQueue.cc b/lib/ts/test_PriorityQueue.cc
index 73b20f8..aa13e9f 100644
--- a/lib/ts/test_PriorityQueue.cc
+++ b/lib/ts/test_PriorityQueue.cc
@@ -367,12 +367,26 @@ REGRESSION_TEST(PriorityQueue_6)(RegressionTest *t, int /* atype ATS_UNUSED */,
   pq->push(entry_b);
   pq->push(entry_c);
 
+  uint32_t index;
+
   box.check(pq->top() == entry_a, "top should be entry_a");
+
+  index = entry_a->index;
   pq->erase(entry_a);
+  box.check(entry_a->index == index, "index should be the same");
+
   box.check(pq->top() == entry_b, "top should be entry_b");
+
+  index = entry_c->index;
   pq->erase(entry_c);
+  box.check(entry_c->index == index, "index should be the same");
+
   box.check(pq->top() == entry_b, "top should be entry_b");
+
+  index = entry_b->index;
   pq->erase(entry_b);
+  box.check(entry_b->index == index, "index should be the same");
+
   box.check(pq->top() == nullptr, "top should be NULL");
   box.check(pq->empty(), "should be empty");
 
@@ -461,3 +475,52 @@ REGRESSION_TEST(PriorityQueue_7)(RegressionTest *t, int /* atype ATS_UNUSED */,
   delete entry_y;
   delete entry_z;
 }
+
+// Test erase and pop method to ensure the index entries are correctly
+REGRESSION_TEST(PriorityQueue_pop_and_erase)(RegressionTest *t, int /* atype ATS_UNUSED */, int *pstatus)
+{
+  TestBox box(t, pstatus);
+  box = REGRESSION_TEST_PASSED;
+
+  PQ *pq1 = new PQ();
+  PQ *pq2 = new PQ();
+
+  N *x = new N(20, "X");
+  N *y = new N(30, "Y");
+  N *z = new N(40, "Z");
+
+  Entry *entry_x = new Entry(x);
+  Entry *entry_y = new Entry(y);
+  Entry *entry_z = new Entry(z);
+
+  pq2->push(entry_z);
+  pq2->push(entry_y);
+  pq2->push(entry_x);
+
+  x->weight = 40;
+  y->weight = 30;
+  z->weight = 20;
+
+  pq1->push(pq2->top());
+  pq2->pop();
+  box.check(pq1->top()->index == 0, "Top index should be zero, but got %d", pq1->top()->index);
+
+  pq1->push(pq2->top());
+  pq2->pop();
+  box.check(pq1->top()->index == 0, "Top index should be zero, but got %d", pq1->top()->index);
+
+  pq1->push(pq2->top());
+  pq2->pop();
+  box.check(pq1->top()->index == 0, "Top index should be zero, but got %d", pq1->top()->index);
+
+  delete pq1;
+  delete pq2;
+
+  delete x;
+  delete y;
+  delete z;
+
+  delete entry_x;
+  delete entry_y;
+  delete entry_z;
+}
diff --git a/proxy/http2/Http2DependencyTree.h b/proxy/http2/Http2DependencyTree.h
index 007603b..526b9fc 100644
--- a/proxy/http2/Http2DependencyTree.h
+++ b/proxy/http2/Http2DependencyTree.h
@@ -316,7 +316,7 @@ Http2DependencyTree<T>::deactivate(Node *node, uint32_t sent)
   node->active = false;
 
   while (node->queue->empty() && node->parent != NULL) {
-    node->parent->queue->pop();
+    node->parent->queue->erase(node->entry);
     node->queued = false;
 
     node = node->parent;

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].