You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/07/17 06:05:35 UTC
[2/2] git commit: Remove the RD typedef.
Remove the RD typedef.
RD is a typedef for RequestData. Remove it, because it's a terrible,
unmemorable, meaningless type name.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/230a9bcf
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/230a9bcf
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/230a9bcf
Branch: refs/heads/master
Commit: 230a9bcfc7591bd27cc0f75dedf1ac43bd7902e4
Parents: 7ba777f
Author: James Peach <jp...@apache.org>
Authored: Tue Jul 16 21:03:55 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Tue Jul 16 21:03:55 2013 -0700
----------------------------------------------------------------------
iocore/cache/CacheHosting.cc | 4 ++--
iocore/dns/P_SplitDNSProcessor.h | 5 ++---
iocore/dns/SplitDNS.cc | 4 ++--
proxy/CacheControl.cc | 6 +++---
proxy/CacheControl.h | 3 +--
proxy/ControlMatcher.cc | 20 ++++++++++----------
proxy/ControlMatcher.h | 13 ++++++-------
proxy/ParentSelection.cc | 6 +++---
proxy/ParentSelection.h | 9 ++++-----
proxy/congest/Congestion.cc | 4 ++--
proxy/congest/Congestion.h | 5 ++---
11 files changed, 37 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/230a9bcf/iocore/cache/CacheHosting.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheHosting.cc b/iocore/cache/CacheHosting.cc
index e139858..93ba8e6 100644
--- a/iocore/cache/CacheHosting.cc
+++ b/iocore/cache/CacheHosting.cc
@@ -98,7 +98,7 @@ CacheHostMatcher::AllocateSpace(int num_entries)
num_el = 0;
}
-// void CacheHostMatcher::Match(RD* rdata, Result* result)
+// void CacheHostMatcher::Match(RequestData* rdata, Result* result)
//
// Searches our tree and updates argresult for each element matching
// arg hostname
@@ -234,7 +234,7 @@ CacheHostTable::Print()
}
-// void ControlMatcher<Data, Result>::Match(RD* rdata
+// void ControlMatcher<Data, Result>::Match(RequestData* rdata
// Result* result)
//
// Queries each table for the Result*
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/230a9bcf/iocore/dns/P_SplitDNSProcessor.h
----------------------------------------------------------------------
diff --git a/iocore/dns/P_SplitDNSProcessor.h b/iocore/dns/P_SplitDNSProcessor.h
index 092fda5..6785db1 100644
--- a/iocore/dns/P_SplitDNSProcessor.h
+++ b/iocore/dns/P_SplitDNSProcessor.h
@@ -46,7 +46,6 @@
void ink_split_dns_init(ModuleVersion version);
struct RequestData;
-typedef RequestData RD;
struct matcher_line;
@@ -98,7 +97,7 @@ struct SplitDNS:public ConfigInfo
~SplitDNS();
void *getDNSRecord(const char *hostname);
- void findServer(RD * rdata, SplitDNSResult * result);
+ void findServer(RequestData * rdata, SplitDNSResult * result);
DNS_table *m_DNSSrvrTable;
@@ -242,7 +241,7 @@ public:
const char *ProcessDomainSrchList(char *val);
const char *ProcessDefDomain(char *val);
- void UpdateMatch(SplitDNSResult * result, RD * rdata);
+ void UpdateMatch(SplitDNSResult * result, RequestData * rdata);
void Print();
DNSServer m_servers;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/230a9bcf/iocore/dns/SplitDNS.cc
----------------------------------------------------------------------
diff --git a/iocore/dns/SplitDNS.cc b/iocore/dns/SplitDNS.cc
index fde76a4..b00c89f 100644
--- a/iocore/dns/SplitDNS.cc
+++ b/iocore/dns/SplitDNS.cc
@@ -228,7 +228,7 @@ SplitDNS::getDNSRecord(const char *hostname)
SplitDNS::findServer()
-------------------------------------------------------------- */
void
-SplitDNS::findServer(RD * rdata, SplitDNSResult * result)
+SplitDNS::findServer(RequestData * rdata, SplitDNSResult * result)
{
DNS_table *tablePtr = m_DNSSrvrTable;
SplitDNSRecord *rec;
@@ -556,7 +556,7 @@ SplitDNSRecord::Init(matcher_line * line_info)
SplitDNSRecord::UpdateMatch()
-------------------------------------------------------------- */
void
-SplitDNSRecord::UpdateMatch(SplitDNSResult * result, RD * /* rdata ATS_UNUSED */)
+SplitDNSRecord::UpdateMatch(SplitDNSResult * result, RequestData * /* rdata ATS_UNUSED */)
{
int last_number = result->m_line_number;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/230a9bcf/proxy/CacheControl.cc
----------------------------------------------------------------------
diff --git a/proxy/CacheControl.cc b/proxy/CacheControl.cc
index 6223544..837da97 100644
--- a/proxy/CacheControl.cc
+++ b/proxy/CacheControl.cc
@@ -403,13 +403,13 @@ CacheControlRecord::Init(matcher_line * line_info)
return NULL;
}
-// void CacheControlRecord::UpdateMatch(CacheControlResult* result, RD* rdata)
+// void CacheControlRecord::UpdateMatch(CacheControlResult* result, RequestData* rdata)
//
// Updates the parameters in result if the this element
// appears later in the file
//
void
-CacheControlRecord::UpdateMatch(CacheControlResult * result, RD * rdata)
+CacheControlRecord::UpdateMatch(CacheControlResult * result, RequestData * rdata)
{
bool match = false;
HttpRequestData *h_rdata = (HttpRequestData *) rdata;
@@ -529,7 +529,7 @@ CacheControlRecord::Init(matcher_line * line_info)
}
void
-CacheControlRecord::UpdateMatch(CacheControlResult * result, RD * rdata)
+CacheControlRecord::UpdateMatch(CacheControlResult * result, RequestData * rdata)
{
}
#endif // INK_NO_ACL
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/230a9bcf/proxy/CacheControl.h
----------------------------------------------------------------------
diff --git a/proxy/CacheControl.h b/proxy/CacheControl.h
index ae08eb0..4685633 100644
--- a/proxy/CacheControl.h
+++ b/proxy/CacheControl.h
@@ -36,7 +36,6 @@
#include "ControlBase.h"
struct RequestData;
-typedef RequestData RD;
const int CC_UNSET_TIME = -1;
@@ -134,7 +133,7 @@ public:
int time_arg;
int cache_responses_to_cookies;
char *Init(matcher_line * line_info);
- inkcoreapi void UpdateMatch(CacheControlResult * result, RD * rdata);
+ inkcoreapi void UpdateMatch(CacheControlResult * result, RequestData * rdata);
void Print();
};
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/230a9bcf/proxy/ControlMatcher.cc
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.cc b/proxy/ControlMatcher.cc
index 64d122f..1a7fc49 100644
--- a/proxy/ControlMatcher.cc
+++ b/proxy/ControlMatcher.cc
@@ -140,12 +140,12 @@ template<class Data, class Result> void HostMatcher<Data, Result>::AllocateSpace
num_el = 0;
}
-// void HostMatcher<Data,Result>::Match(RD* rdata, Result* result)
+// void HostMatcher<Data,Result>::Match(RequestData* rdata, Result* result)
//
// Searches our tree and updates argresult for each element matching
// arg hostname
//
-template<class Data, class Result> void HostMatcher<Data, Result>::Match(RD * rdata, Result * result)
+template<class Data, class Result> void HostMatcher<Data, Result>::Match(RequestData * rdata, Result * result)
{
void *opaque_ptr;
@@ -339,12 +339,12 @@ template<class Data, class Result> char *RegexMatcher<Data, Result>::NewEntry(ma
}
//
-// void RegexMatcher<Data,Result>::Match(RD* rdata, Result* result)
+// void RegexMatcher<Data,Result>::Match(RequestData* rdata, Result* result)
//
// Coduncts a linear search through the regex array and
// updates arg result for each regex that matches arg URL
//
-template<class Data, class Result> void RegexMatcher<Data, Result>::Match(RD * rdata, Result * result)
+template<class Data, class Result> void RegexMatcher<Data, Result>::Match(RequestData * rdata, Result * result)
{
char *url_str;
int r;
@@ -395,12 +395,12 @@ Result > (name, filename)
}
//
-// void HostRegexMatcher<Data,Result>::Match(RD* rdata, Result* result)
+// void HostRegexMatcher<Data,Result>::Match(RequestData* rdata, Result* result)
//
// Conducts a linear search through the regex array and
// updates arg result for each regex that matches arg host_regex
//
-template<class Data, class Result> void HostRegexMatcher<Data, Result>::Match(RD * rdata, Result * result)
+template<class Data, class Result> void HostRegexMatcher<Data, Result>::Match(RequestData * rdata, Result * result)
{
const char *url_str;
int r;
@@ -524,10 +524,10 @@ template<class Data, class Result> char *IpMatcher<Data, Result>::NewEntry(match
}
//
-// void IpMatcherData,Result>::Match(in_addr_t addr, RD* rdata, Result* result)
+// void IpMatcherData,Result>::Match(in_addr_t addr, RequestData* rdata, Result* result)
//
template<class Data, class Result>
- void IpMatcher<Data, Result>::Match(sockaddr const* addr, RD * rdata, Result * result)
+ void IpMatcher<Data, Result>::Match(sockaddr const* addr, RequestData * rdata, Result * result)
{
void* raw;
if (ip_map.contains(addr, &raw)) {
@@ -619,12 +619,12 @@ template<class Data, class Result> void ControlMatcher<Data, Result>::Print()
}
-// void ControlMatcher<Data, Result>::Match(RD* rdata
+// void ControlMatcher<Data, Result>::Match(RequestData* rdata
// Result* result)
//
// Queries each table for the Result*
//
-template<class Data, class Result> void ControlMatcher<Data, Result>::Match(RD * rdata, Result * result)
+template<class Data, class Result> void ControlMatcher<Data, Result>::Match(RequestData * rdata, Result * result)
{
if (hostMatch != NULL) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/230a9bcf/proxy/ControlMatcher.h
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.h b/proxy/ControlMatcher.h
index c06ed30..2c47f7d 100644
--- a/proxy/ControlMatcher.h
+++ b/proxy/ControlMatcher.h
@@ -131,7 +131,6 @@ public:
return RD_NULL;
}
};
-typedef RequestData RD;
class HttpRequestData:public RequestData
{
@@ -164,7 +163,7 @@ template<class Data, class Result> class RegexMatcher {
public:
RegexMatcher(const char *name, const char *filename);
~RegexMatcher();
- void Match(RD * rdata, Result * result);
+ void Match(RequestData * rdata, Result * result);
void AllocateSpace(int num_entries);
char *NewEntry(matcher_line * line_info);
void Print();
@@ -191,14 +190,14 @@ protected:
template<class Data, class Result> class HostRegexMatcher:public RegexMatcher<Data, Result> {
public:
HostRegexMatcher(const char *name, const char *filename);
- void Match(RD * rdata, Result * result);
+ void Match(RequestData * rdata, Result * result);
};
template<class Data, class Result> class HostMatcher {
public:
HostMatcher(const char *name, const char *filename);
~HostMatcher();
- void Match(RD * rdata, Result * result);
+ void Match(RequestData * rdata, Result * result);
void AllocateSpace(int num_entries);
char *NewEntry(matcher_line * line_info);
void Print();
@@ -230,7 +229,7 @@ template<class Data, class Result> class IpMatcher {
public:
IpMatcher(const char *name, const char *filename);
~IpMatcher();
- void Match(sockaddr const* ip_addr, RD * rdata, Result * result);
+ void Match(sockaddr const* ip_addr, RequestData * rdata, Result * result);
void AllocateSpace(int num_entries);
char *NewEntry(matcher_line * line_info);
void Print();
@@ -244,7 +243,7 @@ public:
};
//private:
- //void MatchArray(in_addr_t addr, RD* rdata, Result* result, void* array);
+ //void MatchArray(in_addr_t addr, RequestData* rdata, Result* result, void* array);
static void PrintFunc(void *opaque_data);
IpMap ip_map; // Data structure to do lookups
Data *data_array; // array of the data lements with in the table
@@ -269,7 +268,7 @@ public:
~ControlMatcher();
int BuildTable();
int BuildTableFromString(char *str);
- void Match(RD * rdata, Result * result);
+ void Match(RequestData * rdata, Result * result);
void Print();
char *config_file_var; // temporary: until config is integerated
int getEntryCount()
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/230a9bcf/proxy/ParentSelection.cc
----------------------------------------------------------------------
diff --git a/proxy/ParentSelection.cc b/proxy/ParentSelection.cc
index d383c85..72be4dd 100644
--- a/proxy/ParentSelection.cc
+++ b/proxy/ParentSelection.cc
@@ -476,7 +476,7 @@ ParentConfigParams::nextParent(HttpRequestData * rdata, ParentResult * result)
//
void
-ParentRecord::FindParent(bool first_call, ParentResult * result, RD * rdata, ParentConfigParams * config)
+ParentRecord::FindParent(bool first_call, ParentResult * result, RequestData * rdata, ParentConfigParams * config)
{
Debug("cdn", "Entering FindParent (the inner loop)");
int cur_index = 0;
@@ -815,13 +815,13 @@ ParentRecord::Init(matcher_line * line_info)
return NULL;
}
-// void ParentRecord::UpdateMatch(ParentResult* result, RD* rdata);
+// void ParentRecord::UpdateMatch(ParentResult* result, RequestData* rdata);
//
// Updates the record ptr in result if the this element
// appears later in the file
//
void
-ParentRecord::UpdateMatch(ParentResult * result, RD * rdata)
+ParentRecord::UpdateMatch(ParentResult * result, RequestData * rdata)
{
if (this->CheckForMatch((HttpRequestData *) rdata, result->line_number) == true) {
result->rec = this;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/230a9bcf/proxy/ParentSelection.h
----------------------------------------------------------------------
diff --git a/proxy/ParentSelection.h b/proxy/ParentSelection.h
index a6f2d2a..0a4dc77 100644
--- a/proxy/ParentSelection.h
+++ b/proxy/ParentSelection.h
@@ -41,7 +41,6 @@
#include "P_RecProcess.h"
struct RequestData;
-typedef RequestData RD;
struct matcher_line;
struct ParentResult;
@@ -88,7 +87,7 @@ struct ParentConfigParams:public ConfigInfo
ParentConfigParams();
~ParentConfigParams();
- // void findParent(RD* rdata, ParentResult* result)
+ // void findParent(RequestData* rdata, ParentResult* result)
//
// Does initial parent lookup
//
@@ -107,7 +106,7 @@ struct ParentConfigParams:public ConfigInfo
//
void recordRetrySuccess(ParentResult *result);
- // void nextParent(RD* rdata, ParentResult* result);
+ // void nextParent(RequestData* rdata, ParentResult* result);
//
// Marks the parent pointed to by result as down and attempts
// to find the next parent
@@ -188,8 +187,8 @@ public:
char *Init(matcher_line *line_info);
bool DefaultInit(char *val);
- void UpdateMatch(ParentResult *result, RD *rdata);
- void FindParent(bool firstCall, ParentResult *result, RD *rdata, ParentConfigParams *config);
+ void UpdateMatch(ParentResult *result, RequestData *rdata);
+ void FindParent(bool firstCall, ParentResult *result, RequestData *rdata, ParentConfigParams *config);
void Print();
pRecord *parents;
int num_parents;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/230a9bcf/proxy/congest/Congestion.cc
----------------------------------------------------------------------
diff --git a/proxy/congest/Congestion.cc b/proxy/congest/Congestion.cc
index 703a633..17fc6e8 100644
--- a/proxy/congest/Congestion.cc
+++ b/proxy/congest/Congestion.cc
@@ -264,7 +264,7 @@ CongestionControlRecord::Init(matcher_line * line_info)
}
void
-CongestionControlRecord::UpdateMatch(CongestionControlRule * pRule, RD * rdata)
+CongestionControlRecord::UpdateMatch(CongestionControlRule * pRule, RequestData * rdata)
{
/*
* Select the first matching rule specified in congestion.config
@@ -414,7 +414,7 @@ CongestionMatcherTable::reconfigure()
}
CongestionControlRecord *
-CongestionControlled(RD * rdata)
+CongestionControlled(RequestData * rdata)
{
if (congestionControlEnabled) {
CongestionControlRule result;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/230a9bcf/proxy/congest/Congestion.h
----------------------------------------------------------------------
diff --git a/proxy/congest/Congestion.h b/proxy/congest/Congestion.h
index 3ad1fbf..e3de2b9 100644
--- a/proxy/congest/Congestion.h
+++ b/proxy/congest/Congestion.h
@@ -43,7 +43,6 @@
#define CONGESTION_EVENT_CONTROL_LOOKUP_DONE (CONGESTION_EVENT_EVENTS_START + 4)
struct RequestData;
-typedef RequestData RD;
extern InkRand CongestionRand;
@@ -66,7 +65,7 @@ public:
CongestionControlRecord(const CongestionControlRecord & rec);
~CongestionControlRecord();
char *Init(matcher_line * line_info);
- void UpdateMatch(CongestionControlRule * pRule, RD * rdata);
+ void UpdateMatch(CongestionControlRule * pRule, RequestData * rdata);
void Print();
void cleanup();
@@ -449,7 +448,7 @@ extern int congestionControlEnabled;
extern int congestionControlLocalTime;
void initCongestionControl();
-CongestionControlRecord *CongestionControlled(RD * rdata);
+CongestionControlRecord *CongestionControlled(RequestData * rdata);
uint64_t make_key(char *hostname, int len, sockaddr const* ip, CongestionControlRecord * record);
uint64_t make_key(char *hostname, sockaddr const* ip, CongestionControlRecord * record);