[trafficserver] branch master updated: Remove ParentResult::epoch field.

[jp...@apache.org]

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

jpeach pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  296cae5   Remove ParentResult::epoch field.
296cae5 is described below

commit 296cae5378d48ab1debb77be2ac4d750c6a32cae
Author: James Peach <jp...@apache.org>
AuthorDate: Tue Apr 26 21:25:36 2016 -0700

    Remove ParentResult::epoch field.
    
    ParentResult::epoch was set but never used for anything other than
    logging. Let's remove it to save some space and improve clarity.
    
    This closes #604.
---
 proxy/ParentSelection.cc | 11 ++++-------
 proxy/ParentSelection.h  |  3 +--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/proxy/ParentSelection.cc b/proxy/ParentSelection.cc
index 8f5b227..9526074 100644
--- a/proxy/ParentSelection.cc
+++ b/proxy/ParentSelection.cc
@@ -124,7 +124,6 @@ ParentConfigParams::findParent(HttpRequestData *rdata, ParentResult *result)
   }
   // Initialize the result structure
   result->rec = NULL;
-  result->epoch = tablePtr;
   result->line_number = 0xffffffff;
   result->wrap_around = false;
   result->start_parent = 0;
@@ -137,7 +136,6 @@ ParentConfigParams::findParent(HttpRequestData *rdata, ParentResult *result)
     result->hostname = rdata->api_info->parent_proxy_name;
     result->port = rdata->api_info->parent_proxy_port;
     result->rec = extApiRecord;
-    result->epoch = NULL;
     result->start_parent = 0;
     result->last_parent = 0;
 
@@ -194,8 +192,8 @@ ParentConfigParams::nextParent(HttpRequestData *rdata, ParentResult *result)
 {
   P_table *tablePtr = parent_table;
 
-  Debug("parent_select", "ParentConfigParams::nextParent(): parent_table: %p, result->rec: %p, result->epoch: %p", parent_table,
-        result->rec, result->epoch);
+  Debug("parent_select", "ParentConfigParams::nextParent(): parent_table: %p, result->rec: %p",
+      parent_table, result->rec);
 
   //  Make sure that we are being called back with a
   //   result structure with a parent
@@ -211,9 +209,8 @@ ParentConfigParams::nextParent(HttpRequestData *rdata, ParentResult *result)
     result->r = PARENT_FAIL;
     return;
   }
-  Debug("parent_select", "ParentConfigParams::nextParent(): result->r: %d, tablePtr: %p, result->epoch: %p", result->r, tablePtr,
-        result->epoch);
-  ink_release_assert(tablePtr == result->epoch);
+  Debug("parent_select", "ParentConfigParams::nextParent(): result->r: %d, tablePtr: %p",
+      result->r, tablePtr);
 
   // Find the next parent in the array
   Debug("parent_select", "Calling selectParent() from nextParent");
diff --git a/proxy/ParentSelection.h b/proxy/ParentSelection.h
index 62b67ff..b52cabd 100644
--- a/proxy/ParentSelection.h
+++ b/proxy/ParentSelection.h
@@ -159,7 +159,7 @@ ParentRecord *const extApiRecord = (ParentRecord *)0xeeeeffff;
 
 struct ParentResult {
   ParentResult()
-    : r(PARENT_UNDEFINED), hostname(NULL), port(0), retry(false), line_number(0), epoch(NULL), rec(NULL), last_parent(0),
+    : r(PARENT_UNDEFINED), hostname(NULL), port(0), retry(false), line_number(0), rec(NULL), last_parent(0),
       start_parent(0), wrap_around(false), last_lookup(0)
   {
   }
@@ -173,7 +173,6 @@ struct ParentResult {
   // Internal use only
   //   Not to be modified by HTTP
   int line_number;
-  P_table *epoch; // A pointer to the table used.
   ParentRecord *rec;
   uint32_t last_parent;
   uint32_t start_parent;

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