You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/07/30 06:20:01 UTC
git commit: TS-1685 Fix indentation before TS_MICRO removal
Updated Branches:
refs/heads/master 1e0aba26d -> d779cf80f
TS-1685 Fix indentation before TS_MICRO removal
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d779cf80
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d779cf80
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d779cf80
Branch: refs/heads/master
Commit: d779cf80fc5f9a9099ad7eb17b41aafff9cf75f8
Parents: 1e0aba2
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Jul 30 06:19:26 2013 +0200
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Jul 30 06:19:33 2013 +0200
----------------------------------------------------------------------
configure.ac | 2 +-
iocore/cluster/ClusterMachine.cc | 33 +++++-----
iocore/cluster/P_ClusterMachine.h | 1 +
iocore/eventsystem/I_IOBuffer.h | 10 ++-
iocore/hostdb/include/Machine.h | 5 +-
iocore/net/Net.cc | 44 ++++---------
proxy/CacheControl.cc | 33 +++-------
proxy/CacheControl.h | 13 ++--
proxy/ControlMatcher.cc | 57 ++++++++--------
proxy/ControlMatcher.h | 102 ++++++++++-------------------
proxy/http/HttpPages.cc | 10 +--
proxy/http/HttpSessionManager.h | 15 +++--
proxy/logging/LogBuffer.h | 54 ++++++---------
proxy/logging/LogCollationClientSM.cc | 36 +++++-----
proxy/logging/LogFile.h | 16 ++---
proxy/logging/LogFormat.cc | 4 +-
proxy/logging/LogHost.cc | 35 +++++-----
proxy/logging/LogObject.cc | 18 ++---
18 files changed, 212 insertions(+), 276 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index a64b475..10f1277 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR([build/aux])
AC_CONFIG_SRCDIR([proxy/Main.cc])
AC_CONFIG_MACRO_DIR([build])
-AM_INIT_AUTOMAKE([-Wall -Werror tar-ustar foreign no-installinfo no-installman 1.9.2])
+AM_INIT_AUTOMAKE([-Wall -Werror tar-ustar subdir-objects foreign no-installinfo no-installman 1.9.2])
AC_CONFIG_HEADERS([lib/ts/ink_autoconf.h])
# Configure with --disable-silent-rules to get verbose output. For more info, see
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/iocore/cluster/ClusterMachine.cc
----------------------------------------------------------------------
diff --git a/iocore/cluster/ClusterMachine.cc b/iocore/cluster/ClusterMachine.cc
index dfb1e27..c41bbe8 100644
--- a/iocore/cluster/ClusterMachine.cc
+++ b/iocore/cluster/ClusterMachine.cc
@@ -64,18 +64,18 @@ create_this_cluster_machine()
cluster_machine = NEW(new ClusterMachine);
}
-ClusterMachine::ClusterMachine(char *ahostname, unsigned int aip, int aport):
-dead(false),
-hostname(ahostname),
-ip(aip),
-cluster_port(aport),
-num_connections(0),
-now_connections(0),
-free_connections(0),
-rr_count(0),
-msg_proto_major(0),
-msg_proto_minor(0),
-clusterHandlers(0)
+ClusterMachine::ClusterMachine(char *ahostname, unsigned int aip, int aport)
+ : dead(false),
+ hostname(ahostname),
+ ip(aip),
+ cluster_port(aport),
+ num_connections(0),
+ now_connections(0),
+ free_connections(0),
+ rr_count(0),
+ msg_proto_major(0),
+ msg_proto_minor(0),
+ clusterHandlers(0)
{
EThread *thread = this_ethread();
ProxyMutex *mutex = thread->mutex;
@@ -131,8 +131,7 @@ clusterHandlers(0)
ip = aip;
ink_gethostbyaddr_r_data data;
- struct hostent *r = ink_gethostbyaddr_r((char *) &ip, sizeof(int),
- AF_INET, &data);
+ struct hostent *r = ink_gethostbyaddr_r((char *) &ip, sizeof(int), AF_INET, &data);
if (r == NULL) {
unsigned char x[4];
@@ -185,9 +184,11 @@ struct MachineTimeoutContinuation: public Continuation
(void) e;
delete m;
delete this;
- return EVENT_DONE;
+ return EVENT_DONE;
}
- MachineTimeoutContinuation(ClusterMachine * am):Continuation(NULL), m(am)
+
+ MachineTimeoutContinuation(ClusterMachine * am)
+ : Continuation(NULL), m(am)
{
SET_HANDLER((McTimeoutContHandler) & MachineTimeoutContinuation::dieEvent);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/iocore/cluster/P_ClusterMachine.h
----------------------------------------------------------------------
diff --git a/iocore/cluster/P_ClusterMachine.h b/iocore/cluster/P_ClusterMachine.h
index 61aee3a..85cf7d4 100644
--- a/iocore/cluster/P_ClusterMachine.h
+++ b/iocore/cluster/P_ClusterMachine.h
@@ -92,6 +92,7 @@ struct MachineListElement
unsigned int ip;
int port;
};
+
struct MachineList
{
int n;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/iocore/eventsystem/I_IOBuffer.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_IOBuffer.h b/iocore/eventsystem/I_IOBuffer.h
index baa1c54..730895c 100644
--- a/iocore/eventsystem/I_IOBuffer.h
+++ b/iocore/eventsystem/I_IOBuffer.h
@@ -59,9 +59,15 @@ extern int64_t default_large_iobuffer_size; // matched to size of OS buffers
#endif
enum AllocType
-{ NO_ALLOC, FAST_ALLOCATED, XMALLOCED, MEMALIGNED,
- DEFAULT_ALLOC, CONSTANT
+{
+ NO_ALLOC,
+ FAST_ALLOCATED,
+ XMALLOCED,
+ MEMALIGNED,
+ DEFAULT_ALLOC,
+ CONSTANT
};
+
#ifndef TS_MICRO
#if TS_USE_RECLAIMABLE_FREELIST
#define DEFAULT_BUFFER_NUMBER 64
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/iocore/hostdb/include/Machine.h
----------------------------------------------------------------------
diff --git a/iocore/hostdb/include/Machine.h b/iocore/hostdb/include/Machine.h
index f85c270..2c49995 100644
--- a/iocore/hostdb/include/Machine.h
+++ b/iocore/hostdb/include/Machine.h
@@ -59,7 +59,7 @@
class ClusterHandler; // Leave this a class - VC++ gets very anal ~SR
-struct Machine:Server
+struct Machine: Server
{
bool dead;
char *hostname;
@@ -91,6 +91,7 @@ struct MachineListElement
unsigned int ip;
int port;
};
+
struct MachineList
{
int n;
@@ -107,7 +108,7 @@ MachineList *read_MachineList(char *filename, int test_fd = -1);
void free_MachineList(MachineList * l);
#ifdef FIXME_CONFIG
-struct clusterConfigFile:configFile
+struct clusterConfigFile: configFile
{
#ifndef INK_NO_CLUSTER
char *parseFile(int fd)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/iocore/net/Net.cc
----------------------------------------------------------------------
diff --git a/iocore/net/Net.cc b/iocore/net/Net.cc
index 2e3a782..0014bf4 100644
--- a/iocore/net/Net.cc
+++ b/iocore/net/Net.cc
@@ -45,7 +45,6 @@ configure_net(void)
static inline void
register_net_stats()
{
-
//
// Register statistics
//
@@ -59,76 +58,61 @@ register_net_stats()
RecRegisterRawStat(net_rsb, RECT_PROCESS, "proxy.process.net.write_bytes",
RECD_INT, RECP_NULL, (int) net_write_bytes_stat, RecRawStatSyncSum);
- RecRegisterRawStat(net_rsb, RECT_PROCESS,
- "proxy.process.net.connections_currently_open",
+ RecRegisterRawStat(net_rsb, RECT_PROCESS, "proxy.process.net.connections_currently_open",
RECD_INT, RECP_NON_PERSISTENT, (int) net_connections_currently_open_stat, RecRawStatSyncSum);
NET_CLEAR_DYN_STAT(net_connections_currently_open_stat);
- RecRegisterRawStat(net_rsb, RECT_PROCESS,
- "proxy.process.net.accepts_currently_open",
+ RecRegisterRawStat(net_rsb, RECT_PROCESS, "proxy.process.net.accepts_currently_open",
RECD_INT, RECP_NON_PERSISTENT, (int) net_accepts_currently_open_stat, RecRawStatSyncSum);
NET_CLEAR_DYN_STAT(net_accepts_currently_open_stat);
- RecRegisterRawStat(net_rsb, RECT_PROCESS,
- "proxy.process.net.calls_to_readfromnet",
+ RecRegisterRawStat(net_rsb, RECT_PROCESS, "proxy.process.net.calls_to_readfromnet",
RECD_INT, RECP_NULL, (int) net_calls_to_readfromnet_stat, RecRawStatSyncSum);
NET_CLEAR_DYN_STAT(net_calls_to_readfromnet_stat);
- RecRegisterRawStat(net_rsb, RECT_PROCESS,
- "proxy.process.net.calls_to_readfromnet_afterpoll",
+ RecRegisterRawStat(net_rsb, RECT_PROCESS, "proxy.process.net.calls_to_readfromnet_afterpoll",
RECD_INT, RECP_NULL, (int) net_calls_to_readfromnet_afterpoll_stat, RecRawStatSyncSum);
NET_CLEAR_DYN_STAT(net_calls_to_readfromnet_afterpoll_stat);
- RecRegisterRawStat(net_rsb, RECT_PROCESS,
- "proxy.process.net.calls_to_read",
+ RecRegisterRawStat(net_rsb, RECT_PROCESS, "proxy.process.net.calls_to_read",
RECD_INT, RECP_NULL, (int) net_calls_to_read_stat, RecRawStatSyncSum);
NET_CLEAR_DYN_STAT(net_calls_to_read_stat);
- RecRegisterRawStat(net_rsb, RECT_PROCESS,
- "proxy.process.net.calls_to_read_nodata",
+ RecRegisterRawStat(net_rsb, RECT_PROCESS, "proxy.process.net.calls_to_read_nodata",
RECD_INT, RECP_NULL, (int) net_calls_to_read_nodata_stat, RecRawStatSyncSum);
NET_CLEAR_DYN_STAT(net_calls_to_read_nodata_stat);
- RecRegisterRawStat(net_rsb, RECT_PROCESS,
- "proxy.process.net.calls_to_writetonet",
+ RecRegisterRawStat(net_rsb, RECT_PROCESS, "proxy.process.net.calls_to_writetonet",
RECD_INT, RECP_NULL, (int) net_calls_to_writetonet_stat, RecRawStatSyncSum);
NET_CLEAR_DYN_STAT(net_calls_to_writetonet_stat);
- RecRegisterRawStat(net_rsb, RECT_PROCESS,
- "proxy.process.net.calls_to_writetonet_afterpoll",
+ RecRegisterRawStat(net_rsb, RECT_PROCESS, "proxy.process.net.calls_to_writetonet_afterpoll",
RECD_INT, RECP_NULL, (int) net_calls_to_writetonet_afterpoll_stat, RecRawStatSyncSum);
NET_CLEAR_DYN_STAT(net_calls_to_writetonet_afterpoll_stat);
- RecRegisterRawStat(net_rsb, RECT_PROCESS,
- "proxy.process.net.calls_to_write",
+ RecRegisterRawStat(net_rsb, RECT_PROCESS, "proxy.process.net.calls_to_write",
RECD_INT, RECP_NULL, (int) net_calls_to_write_stat, RecRawStatSyncSum);
NET_CLEAR_DYN_STAT(net_calls_to_write_stat);
- RecRegisterRawStat(net_rsb, RECT_PROCESS,
- "proxy.process.net.calls_to_write_nodata",
+ RecRegisterRawStat(net_rsb, RECT_PROCESS, "proxy.process.net.calls_to_write_nodata",
RECD_INT, RECP_NULL, (int) net_calls_to_write_nodata_stat, RecRawStatSyncSum);
NET_CLEAR_DYN_STAT(net_calls_to_write_nodata_stat);
#ifndef INK_NO_SOCKS
- RecRegisterRawStat(net_rsb, RECT_PROCESS,
- "proxy.process.socks.connections_successful",
+ RecRegisterRawStat(net_rsb, RECT_PROCESS, "proxy.process.socks.connections_successful",
RECD_INT, RECP_NULL, (int) socks_connections_successful_stat, RecRawStatSyncSum);
- RecRegisterRawStat(net_rsb, RECT_PROCESS,
- "proxy.process.socks.connections_unsuccessful",
+ RecRegisterRawStat(net_rsb, RECT_PROCESS, "proxy.process.socks.connections_unsuccessful",
RECD_INT, RECP_NULL, (int) socks_connections_unsuccessful_stat, RecRawStatSyncSum);
- RecRegisterRawStat(net_rsb, RECT_PROCESS,
- "proxy.process.socks.connections_currently_open",
+ RecRegisterRawStat(net_rsb, RECT_PROCESS, "proxy.process.socks.connections_currently_open",
RECD_INT, RECP_NON_PERSISTENT, (int) socks_connections_currently_open_stat, RecRawStatSyncSum);
NET_CLEAR_DYN_STAT(socks_connections_currently_open_stat);
#endif
- RecRegisterRawStat(net_rsb, RECT_PROCESS,
- "proxy.process.net.inactivity_cop_lock_acquire_failure",
+ RecRegisterRawStat(net_rsb, RECT_PROCESS, "proxy.process.net.inactivity_cop_lock_acquire_failure",
RECD_INT, RECP_NULL, (int) inactivity_cop_lock_acquire_failure_stat,
RecRawStatSyncSum);
-
}
void
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/proxy/CacheControl.cc
----------------------------------------------------------------------
diff --git a/proxy/CacheControl.cc b/proxy/CacheControl.cc
index 837da97..91913b2 100644
--- a/proxy/CacheControl.cc
+++ b/proxy/CacheControl.cc
@@ -94,7 +94,7 @@ struct CC_FreerContinuation: public Continuation
Debug("cache_control", "Deleting old table");
delete p;
delete this;
- return EVENT_DONE;
+ return EVENT_DONE;
}
CC_FreerContinuation(CC_table * ap):Continuation(NULL), p(ap)
{
@@ -114,7 +114,7 @@ struct CC_UpdateContinuation: public Continuation
{
reloadCacheControl();
delete this;
- return EVENT_DONE;
+ return EVENT_DONE;
}
CC_UpdateContinuation(ProxyMutex * m):Continuation(m)
{
@@ -208,6 +208,7 @@ getClusterCacheLocal(URL *url, char * /* hostname ATS_UNUSED */)
req_hdr.clear();
return result.cluster_cache_local;
}
+
//
// End API functions
//
@@ -221,7 +222,8 @@ void
CacheControlResult::Print()
{
printf("\t reval: %d, never-cache: %d, pin: %d, cluster-cache-c: %d ignore-c: %d ignore-s: %d\n",
- revalidate_after, never_cache, pin_in_cache_for, cluster_cache_local, ignore_client_no_cache, ignore_server_no_cache);
+ revalidate_after, never_cache, pin_in_cache_for, cluster_cache_local, ignore_client_no_cache,
+ ignore_server_no_cache);
}
// void CacheControlRecord::Print()
@@ -247,7 +249,6 @@ CacheControlRecord::Print()
case CC_NEVER_CACHE:
case CC_STANDARD_CACHE:
case CC_IGNORE_NO_CACHE:
- // case CC_CACHE_AUTH_CONTENT:
printf("\t\tDirective: %s\n", CC_directive_str[this->directive]);
break;
case CC_INVALID:
@@ -296,10 +297,8 @@ CacheControlRecord::Init(matcher_line * line_info)
int v = strtol(val, &ptr, 0);
if (!ptr || v < 0 || v > 4) {
errBuf = static_cast<char*>(ats_malloc(errBufLen * sizeof(char)));
- snprintf(errBuf, errBufLen,
- "Value for " TWEAK_CACHE_RESPONSES_TO_COOKIES
- " must be an integer in the range 0..4"
- );
+ snprintf(errBuf, errBufLen, "Value for " TWEAK_CACHE_RESPONSES_TO_COOKIES
+ " must be an integer in the range 0..4");
return errBuf;
} else {
cache_responses_to_cookies = v;
@@ -342,9 +341,6 @@ CacheControlRecord::Init(matcher_line * line_info)
} else if (strcasecmp(val, "ignore-server-no-cache") == 0) {
directive = CC_IGNORE_SERVER_NO_CACHE;
d_found = true;
- //} else if (strcasecmp(val, "cache-auth-content") == 0) {
- // directive = CC_CACHE_AUTH_CONTENT;
- // d_found = true;
} else {
errBuf = (char *)ats_malloc(errBufLen * sizeof(char));
snprintf(errBuf, errBufLen, "%s Invalid action at line %d in cache.config", modulePrefix, line_num);
@@ -481,13 +477,6 @@ CacheControlRecord::UpdateMatch(CacheControlResult * result, RequestData * rdata
match = true;
}
break;
-// case CC_CACHE_AUTH_CONTENT:
- // if (this->CheckForMatch(h_rdata, result->cache_auth_line) == true) {
- // result->cache_auth_content = true;
- // result->cache_auth_line = this->line_num;
- // match = true;
- // }
- // break;
case CC_INVALID:
case CC_NUM_TYPES:
default:
@@ -504,14 +493,12 @@ CacheControlRecord::UpdateMatch(CacheControlResult * result, RequestData * rdata
char crtc_debug[80];
if (result->cache_responses_to_cookies >= 0)
snprintf(crtc_debug, sizeof(crtc_debug), " [" TWEAK_CACHE_RESPONSES_TO_COOKIES "=%d]",
- result->cache_responses_to_cookies
- );
+ result->cache_responses_to_cookies);
else
crtc_debug[0] = 0;
- Debug("cache_control", "Matched with for %s at line %d%s",
- CC_directive_str[this->directive], this->line_num, crtc_debug
- );
+ Debug("cache_control", "Matched with for %s at line %d%s", CC_directive_str[this->directive],
+ this->line_num, crtc_debug);
}
}
#else
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/proxy/CacheControl.h
----------------------------------------------------------------------
diff --git a/proxy/CacheControl.h b/proxy/CacheControl.h
index 4685633..1bbe380 100644
--- a/proxy/CacheControl.h
+++ b/proxy/CacheControl.h
@@ -54,7 +54,6 @@ enum CacheControlType
CC_IGNORE_NO_CACHE,
CC_CLUSTER_CACHE_LOCAL,
CC_IGNORE_CLIENT_NO_CACHE,
- //CC_IGNORE_SERVER_NO_CACHE,CC_PIN_IN_CACHE, CC_TTL_IN_CACHE, CC_CACHE_AUTH_CONTENT, CC_NUM_TYPES
CC_IGNORE_SERVER_NO_CACHE,
CC_PIN_IN_CACHE,
CC_TTL_IN_CACHE,
@@ -83,7 +82,6 @@ public:
bool ignore_server_no_cache;
bool ignore_client_cc_max_age;
int cache_responses_to_cookies; ///< Override for caching cookied responses.
-// bool cache_auth_content;
// Data for internal use only
//
@@ -100,7 +98,6 @@ public:
int cluster_cache_local_line;
int ignore_client_line;
int ignore_server_line;
- // int cache_auth_line;
};
inline
@@ -114,7 +111,6 @@ CacheControlResult::CacheControlResult()
ignore_server_no_cache(false),
ignore_client_cc_max_age(true),
cache_responses_to_cookies(-1), // do not change value
- //cache_auth_content(false),
reval_line(-1),
never_line(-1),
pin_line(-1),
@@ -122,7 +118,6 @@ CacheControlResult::CacheControlResult()
cluster_cache_local_line(-1),
ignore_client_line(-1),
ignore_server_line(-1)
- //cache_auth_line(-1)
{ }
class CacheControlRecord : public ControlBase
@@ -139,9 +134,8 @@ public:
inline
CacheControlRecord::CacheControlRecord()
- : ControlBase(), directive(CC_INVALID), time_arg(0)
- , cache_responses_to_cookies(-1)
-{}
+ : ControlBase(), directive(CC_INVALID), time_arg(0) , cache_responses_to_cookies(-1)
+{ }
//
// API to outside world
@@ -158,4 +152,5 @@ inkcoreapi bool ip_rule_in_CacheControlTable();
void initCacheControl();
void reloadCacheControl();
-#endif
+
+#endif /* _CACHE_CONTROL_H_ */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/proxy/ControlMatcher.cc
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.cc b/proxy/ControlMatcher.cc
index 018a1c3..8bd98a6 100644
--- a/proxy/ControlMatcher.cc
+++ b/proxy/ControlMatcher.cc
@@ -85,15 +85,18 @@ HttpRequestData::get_client_ip()
* Begin class HostMatcher
*************************************************************/
-template<class Data, class Result> HostMatcher<Data, Result>::HostMatcher(const char *name, const char *filename):
-data_array(NULL), array_len(-1), num_el(-1), matcher_name(name), file_name(filename)
+template<class Data, class Result> HostMatcher<Data, Result>::HostMatcher(const char *name, const char *filename)
+ : data_array(NULL),
+ array_len(-1),
+ num_el(-1),
+ matcher_name(name),
+ file_name(filename)
{
host_lookup = NEW(new HostLookup(name));
}
template<class Data, class Result> HostMatcher<Data, Result>::~HostMatcher()
{
-
delete host_lookup;
delete[]data_array;
}
@@ -147,7 +150,6 @@ template<class Data, class Result> void HostMatcher<Data, Result>::AllocateSpace
//
template<class Data, class Result> void HostMatcher<Data, Result>::Match(RequestData * rdata, Result * result)
{
-
void *opaque_ptr;
Data *data_ptr;
bool r;
@@ -183,7 +185,6 @@ template<class Data, class Result> void HostMatcher<Data, Result>::Match(Request
//
template<class Data, class Result> char *HostMatcher<Data, Result>::NewEntry(matcher_line * line_info)
{
-
Data *cur_d;
char *errBuf;
char *match_data;
@@ -228,8 +229,11 @@ template<class Data, class Result> char *HostMatcher<Data, Result>::NewEntry(mat
//
// UrlMatcher<Data,Result>::UrlMatcher()
//
-template<class Data, class Result> UrlMatcher<Data, Result>::UrlMatcher(const char *name, const char *filename):
-url_ht(NULL), num_el(-1), matcher_name(name), file_name(filename)
+template<class Data, class Result> UrlMatcher<Data, Result>::UrlMatcher(const char *name, const char *filename)
+ : url_ht(NULL),
+ num_el(-1),
+ matcher_name(name),
+ file_name(filename)
{
url_ht = ink_hash_table_create(InkHashTableKeyType_String);
}
@@ -283,7 +287,6 @@ template<class Data, class Result> void UrlMatcher<Data, Result>::AllocateSpace(
//
template<class Data, class Result> char *UrlMatcher<Data, Result>::NewEntry(matcher_line * line_info)
{
-
Data *cur_d;
char *errBuf;
char *pattern;
@@ -362,8 +365,14 @@ template<class Data, class Result> void UrlMatcher<Data, Result>::Match(RequestD
//
// RegexMatcher<Data,Result>::RegexMatcher()
//
-template<class Data, class Result> RegexMatcher<Data, Result>::RegexMatcher(const char *name, const char *filename):
-re_array(NULL), re_str(NULL), data_array(NULL), array_len(-1), num_el(-1), matcher_name(name), file_name(filename)
+template<class Data, class Result> RegexMatcher<Data, Result>::RegexMatcher(const char *name, const char *filename)
+ : re_array(NULL),
+ re_str(NULL),
+ data_array(NULL),
+ array_len(-1),
+ num_el(-1),
+ matcher_name(name),
+ file_name(filename)
{
}
@@ -420,7 +429,6 @@ template<class Data, class Result> void RegexMatcher<Data, Result>::AllocateSpac
//
template<class Data, class Result> char *RegexMatcher<Data, Result>::NewEntry(matcher_line * line_info)
{
-
Data *cur_d;
char *errBuf;
char *pattern;
@@ -520,11 +528,8 @@ template<class Data, class Result> void RegexMatcher<Data, Result>::Match(Reques
// HostRegexMatcher<Data,Result>::HostRegexMatcher()
//
template<class Data, class Result>
- HostRegexMatcher<Data, Result>::HostRegexMatcher(const char *name, const char *filename)
- :
- RegexMatcher <
- Data,
-Result > (name, filename)
+HostRegexMatcher<Data, Result>::HostRegexMatcher(const char *name, const char *filename)
+ : RegexMatcher <Data, Result>(name, filename)
{
}
@@ -568,12 +573,12 @@ template<class Data, class Result> void HostRegexMatcher<Data, Result>::Match(Re
//
// IpMatcher<Data,Result>::IpMatcher()
//
-template<class Data, class Result> IpMatcher<Data, Result>::IpMatcher(const char *name, const char *filename):
-data_array(NULL),
-array_len(-1),
-num_el(-1),
-matcher_name(name),
-file_name(filename)
+template<class Data, class Result> IpMatcher<Data, Result>::IpMatcher(const char *name, const char *filename)
+ : data_array(NULL),
+ array_len(-1),
+ num_el(-1),
+ matcher_name(name),
+ file_name(filename)
{
}
@@ -661,7 +666,7 @@ template<class Data, class Result> char *IpMatcher<Data, Result>::NewEntry(match
// 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, RequestData * rdata, Result * result)
+void IpMatcher<Data, Result>::Match(sockaddr const* addr, RequestData * rdata, Result * result)
{
void* raw;
if (ip_map.contains(addr, &raw)) {
@@ -686,8 +691,8 @@ template<class Data, class Result> void IpMatcher<Data, Result>::Print()
}
template<class Data, class Result>
- ControlMatcher<Data, Result>::ControlMatcher(const char *file_var, const char *name,
- const matcher_tags * tags, int flags_in)
+ControlMatcher<Data, Result>::ControlMatcher(const char *file_var, const char *name, const matcher_tags * tags,
+ int flags_in)
{
char *config_file = NULL;
@@ -765,7 +770,6 @@ template<class Data, class Result> void ControlMatcher<Data, Result>::Print()
//
template<class Data, class Result> void ControlMatcher<Data, Result>::Match(RequestData * rdata, Result * result)
{
-
if (hostMatch != NULL) {
hostMatch->Match(rdata, result);
}
@@ -957,7 +961,6 @@ template<class Data, class Result> int ControlMatcher<Data, Result>::BuildTableF
template<class Data, class Result> int ControlMatcher<Data, Result>::BuildTable()
{
-
// File I/O Locals
char *file_buf;
int ret;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/proxy/ControlMatcher.h
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.h b/proxy/ControlMatcher.h
index bbf779e..8063e58 100644
--- a/proxy/ControlMatcher.h
+++ b/proxy/ControlMatcher.h
@@ -124,12 +124,15 @@ public:
virtual sockaddr const* get_ip() = 0;
virtual sockaddr const* get_client_ip() = 0;
+
enum RD_Type
- { RD_NULL, RD_HTTP, RD_CONGEST_ENTRY };
- virtual RD_Type data_type(void)
{
- return RD_NULL;
- }
+ RD_NULL,
+ RD_HTTP,
+ RD_CONGEST_ENTRY
+ };
+
+ virtual RD_Type data_type(void) { return RD_NULL; }
};
class HttpRequestData:public RequestData
@@ -141,8 +144,7 @@ public:
inkcoreapi sockaddr const* get_client_ip();
HttpRequestData()
- : hdr(NULL), hostname_str(NULL), api_info(NULL),
- xact_start(0), incoming_port(0), tag(NULL)
+ : hdr(NULL), hostname_str(NULL), api_info(NULL), xact_start(0), incoming_port(0), tag(NULL)
{
ink_zero(src_ip);
ink_zero(dest_ip);
@@ -167,14 +169,10 @@ public:
void AllocateSpace(int num_entries);
char *NewEntry(matcher_line * line_info);
void Print();
- int getNumElements()
- {
- return num_el;
- };
- Data *getDataArray()
- {
- return data_array;
- };
+
+ int getNumElements() { return num_el; }
+ Data *getDataArray() { return data_array; }
+
#ifndef TS_MICRO
protected:
#endif
@@ -197,14 +195,10 @@ public:
void AllocateSpace(int num_entries);
char *NewEntry(matcher_line * line_info);
void Print();
- int getNumElements()
- {
- return num_el;
- };
- Data *getDataArray()
- {
- return data_array;
- };
+
+ int getNumElements() { return num_el; }
+ Data *getDataArray() { return data_array; }
+
#ifndef TS_MICRO
protected:
#endif
@@ -231,18 +225,11 @@ public:
void AllocateSpace(int num_entries);
char *NewEntry(matcher_line * line_info);
void Print();
- int getNumElements()
- {
- return num_el;
- };
- Data *getDataArray()
- {
- return data_array;
- };
- HostLookup *getHLookup()
- {
- return host_lookup;
- };
+
+ int getNumElements() { return num_el; }
+ Data *getDataArray() { return data_array; }
+ HostLookup *getHLookup() { return host_lookup; }
+
#ifndef TS_MICRO
private:
#endif
@@ -263,19 +250,12 @@ public:
void AllocateSpace(int num_entries);
char *NewEntry(matcher_line * line_info);
void Print();
- int getNumElements()
- {
- return num_el;
- };
- Data *getDataArray()
- {
- return data_array;
- };
- //private:
- //void MatchArray(in_addr_t addr, RequestData* rdata, Result* result, void* array);
+ int getNumElements() { return num_el; }
+ Data *getDataArray() { return data_array; }
+
static void PrintFunc(void *opaque_data);
- IpMap ip_map; // Data structure to do lookups
+ IpMap ip_map; // Data structure to do lookups
Data *data_array; // array of the data lements with in the table
int array_len; // size of the arrays
int num_el; // number of elements in the table
@@ -295,32 +275,22 @@ template<class Data, class Result> class ControlMatcher {
public:
// Parameter name must not be deallocated before this
// object is
- ControlMatcher(const char *file_var, const char *name, const matcher_tags * tags, int flags_in = (ALLOW_HOST_TABLE | ALLOW_IP_TABLE | ALLOW_REGEX_TABLE | ALLOW_HOST_REGEX_TABLE | ALLOW_URL_TABLE));
+ ControlMatcher(const char *file_var, const char *name, const matcher_tags * tags,
+ int flags_in = (ALLOW_HOST_TABLE | ALLOW_IP_TABLE | ALLOW_REGEX_TABLE |
+ ALLOW_HOST_REGEX_TABLE | ALLOW_URL_TABLE));
~ControlMatcher();
int BuildTable();
int BuildTableFromString(char *str);
void Match(RequestData * rdata, Result * result);
void Print();
char *config_file_var; // temporary: until config is integerated
- int getEntryCount()
- {
- return m_numEntries;
- }
- HostMatcher<Data, Result> *getHostMatcher() {
- return hostMatch;
- }
- RegexMatcher<Data, Result> *getReMatcher() {
- return reMatch;
- }
- UrlMatcher<Data, Result> *getUrlMatcher() {
- return urlMatch;
- }
- IpMatcher<Data, Result> *getIPMatcher() {
- return ipMatch;
- }
- HostRegexMatcher<Data, Result> *getHrMatcher() {
- return hrMatch;
- }
+
+ int getEntryCount() { return m_numEntries; }
+ HostMatcher<Data, Result> *getHostMatcher() { return hostMatch; }
+ RegexMatcher<Data, Result> *getReMatcher() { return reMatch; }
+ UrlMatcher<Data, Result> *getUrlMatcher() { return urlMatch; }
+ IpMatcher<Data, Result> *getIPMatcher() { return ipMatch; }
+ HostRegexMatcher<Data, Result> *getHrMatcher() { return hrMatch; }
//private:
RegexMatcher<Data, Result> *reMatch;
@@ -335,4 +305,4 @@ public:
const char *matcher_name; // Used for Debug/Warning/Error messages
};
-#endif
+#endif /* _CONTROL_MATCHER_H_ */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/proxy/http/HttpPages.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpPages.cc b/proxy/http/HttpPages.cc
index 025272d..699fc45 100644
--- a/proxy/http/HttpPages.cc
+++ b/proxy/http/HttpPages.cc
@@ -38,7 +38,11 @@
HttpSMListBucket HttpSMList[HTTP_LIST_BUCKETS];
HttpPagesHandler::HttpPagesHandler(Continuation * cont, HTTPHdr * header)
-:BaseStatPagesHandler(new_ProxyMutex()), request(NULL), list_bucket(0), state(HP_INIT), sm_id(0)
+ : BaseStatPagesHandler(new_ProxyMutex()),
+ request(NULL),
+ list_bucket(0),
+ state(HP_INIT),
+ sm_id(0)
{
action = cont;
@@ -115,7 +119,6 @@ HttpPagesHandler::dump_hdr(HTTPHdr *hdr, const char *desc)
void
HttpPagesHandler::dump_tunnel_info(HttpSM * sm)
{
-
HttpTunnel *t = sm->get_tunnel();
resp_add("<h4> Tunneling Info </h4>");
@@ -214,9 +217,7 @@ HttpPagesHandler::dump_tunnel_info(HttpSM * sm)
void
HttpPagesHandler::dump_history(HttpSM * sm)
{
-
resp_add("<h4> History</h4>");
-
resp_begin_table(1, 3, 60);
int size;
@@ -253,7 +254,6 @@ HttpPagesHandler::dump_history(HttpSM * sm)
int
HttpPagesHandler::dump_sm(HttpSM * sm)
{
-
// Dump the current state
const char *sm_state = HttpDebugNames::get_action_name(sm->t_state.next_action);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/proxy/http/HttpSessionManager.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSessionManager.h b/proxy/http/HttpSessionManager.h
index 281142b..ba4361e 100644
--- a/proxy/http/HttpSessionManager.h
+++ b/proxy/http/HttpSessionManager.h
@@ -61,20 +61,23 @@ public:
};
enum HSMresult_t
-{ HSM_DONE, HSM_RETRY, HSM_NOT_FOUND };
+{
+ HSM_DONE,
+ HSM_RETRY,
+ HSM_NOT_FOUND
+};
class HttpSessionManager
{
public:
HttpSessionManager()
- { }
+ { }
~HttpSessionManager()
- { }
+ { }
- HSMresult_t acquire_session(Continuation *cont,
- sockaddr const* addr,
- const char *hostname, HttpClientSession *ua_session, HttpSM *sm);
+ HSMresult_t acquire_session(Continuation *cont, sockaddr const* addr, const char *hostname,
+ HttpClientSession *ua_session, HttpSM *sm);
HSMresult_t release_session(HttpServerSession *to_release);
void purge_keepalives();
void init();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/proxy/logging/LogBuffer.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogBuffer.h b/proxy/logging/LogBuffer.h
index 31a81c0..fc33374 100644
--- a/proxy/logging/LogBuffer.h
+++ b/proxy/logging/LogBuffer.h
@@ -148,43 +148,32 @@ public:
size_t buf_align = LB_DEFAULT_ALIGN, size_t write_align = INK_MIN_ALIGN);
LogBuffer(LogObject * owner, LogBufferHeader * header);
~LogBuffer();
+
char &operator [] (int idx)
{
ink_assert(idx >= 0);
ink_assert((size_t) idx < m_size);
return m_buffer[idx];
- };
+ }
int switch_state(LB_State & old_state, LB_State & new_state)
{
INK_WRITE_MEMORY_BARRIER;
return (ink_atomic_cas( & m_state.ival, old_state.ival, new_state.ival));
- };
+ }
LB_ResultCode checkout_write(size_t * write_offset, size_t write_size);
LB_ResultCode checkin_write(size_t write_offset);
void force_full();
- LogBufferHeader *header()
- {
- return m_header;
- }
- long expiration_time()
- {
- return m_expiration_time;
- }
+ LogBufferHeader *header() { return m_header; }
+ long expiration_time() { return m_expiration_time; }
// this should only be called when buffer is ready to be flushed
void update_header_data();
- uint32_t get_id()
- {
- return m_id;
- };
- LogObject *get_owner() const
- {
- return m_owner;
- };
+ uint32_t get_id() { return m_id; }
+ LogObject *get_owner() const { return m_owner; }
LINK(LogBuffer, link);;
@@ -193,16 +182,14 @@ public:
// static functions
static size_t max_entry_bytes();
- static int to_ascii(
- LogEntryHeader * entry, LogFormatType type,
- char *buf, int max_len, char *symbol_str, char *printf_str,
- unsigned buffer_version, char *alt_format = NULL);
- static int resolve_custom_entry(
- LogFieldList * fieldlist,
- char *printf_str, char *read_from, char *write_to,
- int write_to_len, long timestamp, long timestamp_us,
- unsigned buffer_version, LogFieldList * alt_fieldlist = NULL,
- char *alt_printf_str = NULL);
+ static int to_ascii(LogEntryHeader * entry, LogFormatType type,
+ char *buf, int max_len, char *symbol_str, char *printf_str,
+ unsigned buffer_version, char *alt_format = NULL);
+ static int resolve_custom_entry(LogFieldList * fieldlist,
+ char *printf_str, char *read_from, char *write_to,
+ int write_to_len, long timestamp, long timestamp_us,
+ unsigned buffer_version, LogFieldList * alt_fieldlist = NULL,
+ char *alt_printf_str = NULL);
private:
char *m_unaligned_buffer; // the unaligned buffer
@@ -298,10 +285,10 @@ private:
inline
LogBufferIterator::LogBufferIterator(LogBufferHeader * header, bool in_network_order)
-: m_in_network_order(in_network_order),
- m_next(0),
- m_iter_entry_count(0),
- m_buffer_entry_count(0)
+ : m_in_network_order(in_network_order),
+ m_next(0),
+ m_iter_entry_count(0),
+ m_buffer_entry_count(0)
{
ink_assert(header);
@@ -323,8 +310,7 @@ LogBufferIterator::LogBufferIterator(LogBufferHeader * header, bool in_network_o
-------------------------------------------------------------------------*/
inline
-LogBufferIterator::~
-LogBufferIterator()
+LogBufferIterator::~LogBufferIterator()
{
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/proxy/logging/LogCollationClientSM.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogCollationClientSM.cc b/proxy/logging/LogCollationClientSM.cc
index 155e928..426a84d 100644
--- a/proxy/logging/LogCollationClientSM.cc
+++ b/proxy/logging/LogCollationClientSM.cc
@@ -59,19 +59,23 @@ int LogCollationClientSM::ID = 0;
// LogCollationClientSM::LogCollationClientSM
//-------------------------------------------------------------------------
-LogCollationClientSM::LogCollationClientSM(LogHost * log_host):
- Continuation(new_ProxyMutex()),
- m_host_vc(NULL),
- m_host_vio(NULL),
- m_auth_buffer(NULL),
- m_auth_reader(NULL),
- m_send_buffer(NULL),
- m_send_reader(NULL),
- m_pending_action(NULL),
- m_pending_event(NULL),
- m_abort_vio(NULL),
- m_abort_buffer(NULL),
- m_buffer_send_list(NULL), m_buffer_in_iocore(NULL), m_flow(LOG_COLL_FLOW_ALLOW), m_log_host(log_host), m_id(ID++)
+LogCollationClientSM::LogCollationClientSM(LogHost * log_host)
+ : Continuation(new_ProxyMutex()),
+ m_host_vc(NULL),
+ m_host_vio(NULL),
+ m_auth_buffer(NULL),
+ m_auth_reader(NULL),
+ m_send_buffer(NULL),
+ m_send_reader(NULL),
+ m_pending_action(NULL),
+ m_pending_event(NULL),
+ m_abort_vio(NULL),
+ m_abort_buffer(NULL),
+ m_buffer_send_list(NULL),
+ m_buffer_in_iocore(NULL),
+ m_flow(LOG_COLL_FLOW_ALLOW),
+ m_log_host(log_host),
+ m_id(ID++)
{
Debug("log-coll", "[%d]client::constructor", m_id);
@@ -292,17 +296,16 @@ LogCollationClientSM::client_auth(int event, VIO * /* vio ATS_UNUSED */)
int
LogCollationClientSM::client_dns(int event, HostDBInfo * hostdb_info)
{
-
Debug("log-coll", "[%d]client::client_dns", m_id);
switch (event) {
-
case LOG_COLL_EVENT_SWITCH:
m_client_state = LOG_COLL_CLIENT_DNS;
if (m_log_host->m_name == 0) {
return client_done(LOG_COLL_EVENT_SWITCH, NULL);
}
- hostDBProcessor.getbyname_re(this, m_log_host->m_name, 0, HostDBProcessor::Options().setFlags(HostDBProcessor::HOSTDB_FORCE_DNS_RELOAD));
+ hostDBProcessor.getbyname_re(this, m_log_host->m_name, 0,
+ HostDBProcessor::Options().setFlags(HostDBProcessor::HOSTDB_FORCE_DNS_RELOAD));
return EVENT_CONT;
case EVENT_HOST_DB_LOOKUP:
@@ -403,7 +406,6 @@ LogCollationClientSM::client_fail(int event, void * /* data ATS_UNUSED */)
Debug("log-coll", "[%d]client::client_fail", m_id);
switch (event) {
-
case LOG_COLL_EVENT_SWITCH:
Debug("log-coll", "[%d]client::client_fail - SWITCH", m_id);
m_client_state = LOG_COLL_CLIENT_FAIL;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/proxy/logging/LogFile.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFile.h b/proxy/logging/LogFile.h
index 30ae31a..f3d6912 100644
--- a/proxy/logging/LogFile.h
+++ b/proxy/logging/LogFile.h
@@ -76,21 +76,22 @@ private:
void _build_name(const char *filename);
public:
- MetaInfo(char *filename):_flags(0)
+ MetaInfo(char *filename)
+ : _flags(0)
{
_build_name(filename);
_read_from_file();
}
- MetaInfo(char *filename, time_t creation, uint64_t signature):_creation_time(creation),
- _log_object_signature(signature), _flags(VALID_CREATION_TIME | VALID_SIGNATURE)
+ MetaInfo(char *filename, time_t creation, uint64_t signature)
+ : _creation_time(creation), _log_object_signature(signature), _flags(VALID_CREATION_TIME | VALID_SIGNATURE)
{
-
_build_name(filename);
_write_to_file();
}
- ~MetaInfo() {
+ ~MetaInfo()
+ {
ats_free(_filename);
}
@@ -170,10 +171,7 @@ public:
int do_filesystem_checks() { return 0; }; // TODO: this need to be tidy up when to redo the file checking
private:
- bool is_open()
- {
- return (m_fd >= 0);
- };
+ bool is_open() { return (m_fd >= 0); }
void close_file();
void check_fd();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/proxy/logging/LogFormat.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFormat.cc b/proxy/logging/LogFormat.cc
index 9a1ac43..e95872c 100644
--- a/proxy/logging/LogFormat.cc
+++ b/proxy/logging/LogFormat.cc
@@ -136,7 +136,6 @@ int32_t LogFormat::id_from_name(const char *name)
void
LogFormat::init_variables(const char *name, const char *fieldlist_str, const char *printf_str, unsigned interval_sec)
{
-
m_field_count = parse_symbol_string(fieldlist_str, &m_field_list, &m_aggregate);
if (m_field_count == 0) {
@@ -691,7 +690,8 @@ LogFormat::parse_format_string(const char *format_str, char **printf_str, char *
(*fields_str)[fields_pos] = '\0';
(*printf_str)[printf_pos] = '\0';
- Debug("log-format", "LogFormat::parse_format_string: field_count=%d, \"%s\", \"%s\"", field_count, *fields_str, *printf_str);
+ Debug("log-format", "LogFormat::parse_format_string: field_count=%d, \"%s\", \"%s\"", field_count, *fields_str,
+ *printf_str);
return field_count;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/proxy/logging/LogHost.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogHost.cc b/proxy/logging/LogHost.cc
index 9b8db0c..3f7bef9 100644
--- a/proxy/logging/LogHost.cc
+++ b/proxy/logging/LogHost.cc
@@ -54,14 +54,14 @@
-------------------------------------------------------------------------*/
LogHost::LogHost(char *object_filename, uint64_t object_signature)
- : m_object_filename(ats_strdup(object_filename))
- , m_object_signature(object_signature)
- , m_port(0)
- , m_name(NULL)
- , m_sock(NULL)
- , m_sock_fd(-1)
- , m_connected(false)
- , m_orphan_file(NULL)
+ : m_object_filename(ats_strdup(object_filename)),
+ m_object_signature(object_signature),
+ m_port(0),
+ m_name(NULL),
+ m_sock(NULL),
+ m_sock_fd(-1),
+ m_connected(false),
+ m_orphan_file(NULL)
#if defined (IOCORE_LOG_COLLATION)
, m_log_collation_client_sm(NULL)
#endif
@@ -71,15 +71,15 @@ LogHost::LogHost(char *object_filename, uint64_t object_signature)
}
LogHost::LogHost(const LogHost & rhs)
- : m_object_filename(ats_strdup(rhs.m_object_filename))
- , m_object_signature(rhs.m_object_signature)
- , m_ip(rhs.m_ip)
- , m_port(0)
- , m_name(ats_strdup(rhs.m_name))
- , m_sock(NULL)
- , m_sock_fd(-1)
- , m_connected(false)
- , m_orphan_file(NULL)
+ : m_object_filename(ats_strdup(rhs.m_object_filename)),
+ m_object_signature(rhs.m_object_signature),
+ m_ip(rhs.m_ip),
+ m_port(0),
+ m_name(ats_strdup(rhs.m_name)),
+ m_sock(NULL),
+ m_sock_fd(-1),
+ m_connected(false),
+ m_orphan_file(NULL)
#if defined (IOCORE_LOG_COLLATION)
, m_log_collation_client_sm(NULL)
#endif
@@ -101,7 +101,6 @@ LogHost::~LogHost()
// - by specifying a hostname and a port (as separate arguments).
// - by specifying an ip and a port (as separate arguments).
//
-
int
LogHost::set_name_port(char *hostname, unsigned int pt)
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d779cf80/proxy/logging/LogObject.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogObject.cc b/proxy/logging/LogObject.cc
index 5bfa631..fcde79d 100644
--- a/proxy/logging/LogObject.cc
+++ b/proxy/logging/LogObject.cc
@@ -75,15 +75,15 @@ LogBufferManager::flush_buffers(LogBufferSink *sink) {
LogObject::LogObject(LogFormat *format, const char *log_dir,
const char *basename, LogFileFormat file_format,
const char *header, int rolling_enabled,
- int rolling_interval_sec, int rolling_offset_hr, int rolling_size_mb):
- m_alt_filename (NULL),
- m_flags (0),
- m_signature (0),
- m_rolling_interval_sec (rolling_interval_sec),
- m_rolling_offset_hr (rolling_offset_hr),
- m_rolling_size_mb (rolling_size_mb),
- m_last_roll_time(0),
- m_ref_count (0)
+ int rolling_interval_sec, int rolling_offset_hr, int rolling_size_mb)
+ : m_alt_filename (NULL),
+ m_flags (0),
+ m_signature (0),
+ m_rolling_interval_sec (rolling_interval_sec),
+ m_rolling_offset_hr (rolling_offset_hr),
+ m_rolling_size_mb (rolling_size_mb),
+ m_last_roll_time(0),
+ m_ref_count (0)
{
ink_assert (format != NULL);
m_format = new LogFormat(*format);
Re: git commit: TS-1685 Fix indentation before TS_MICRO removal
Posted by Igor Galić <i....@brainsware.org>.
----- Original Message -----
> Updated Branches:
> refs/heads/master 1e0aba26d -> d779cf80f
>
>
> TS-1685 Fix indentation before TS_MICRO removal
> @@ -141,8 +144,7 @@ public:
> inkcoreapi sockaddr const* get_client_ip();
>
> HttpRequestData()
> - : hdr(NULL), hostname_str(NULL), api_info(NULL),
> - xact_start(0), incoming_port(0), tag(NULL)
> + : hdr(NULL), hostname_str(NULL), api_info(NULL), xact_start(0),
> incoming_port(0), tag(NULL)
> {
> ink_zero(src_ip);
> ink_zero(dest_ip);
> @@ -167,14 +169,10 @@ public:
> void AllocateSpace(int num_entries);
> char *NewEntry(matcher_line * line_info);
> void Print();
> - int getNumElements()
> - {
> - return num_el;
> - };
> - Data *getDataArray()
> - {
> - return data_array;
> - };
> +
> + int getNumElements() { return num_el; }
> + Data *getDataArray() { return data_array; }
> +
> #ifndef TS_MICRO
> protected:
> #endif
I didn't realize the extent of TS_MICRO, altering
public/private/protected behaviour sounds like a recipe for pain..
> @@ -197,14 +195,10 @@ public:
> void AllocateSpace(int num_entries);
> char *NewEntry(matcher_line * line_info);
> void Print();
> - int getNumElements()
> - {
> - return num_el;
> - };
> - Data *getDataArray()
> - {
> - return data_array;
> - };
> +
> + int getNumElements() { return num_el; }
> + Data *getDataArray() { return data_array; }
> +
> #ifndef TS_MICRO
> protected:
> #endif
> @@ -231,18 +225,11 @@ public:
> void AllocateSpace(int num_entries);
> char *NewEntry(matcher_line * line_info);
> void Print();
> - int getNumElements()
> - {
> - return num_el;
> - };
> - Data *getDataArray()
> - {
> - return data_array;
> - };
> - HostLookup *getHLookup()
> - {
> - return host_lookup;
> - };
> +
> + int getNumElements() { return num_el; }
> + Data *getDataArray() { return data_array; }
> + HostLookup *getHLookup() { return host_lookup; }
> +
> #ifndef TS_MICRO
> private:
> #endif
> @@ -263,19 +250,12 @@ public:
> void AllocateSpace(int num_entries);
> char *NewEntry(matcher_line * line_info);
> void Print();
> - int getNumElements()
> - {
> - return num_el;
> - };
> - Data *getDataArray()
> - {
> - return data_array;
> - };
>
> - //private:
> - //void MatchArray(in_addr_t addr, RequestData* rdata, Result*
> result, void* array);
> + int getNumElements() { return num_el; }
> + Data *getDataArray() { return data_array; }
> +
> static void PrintFunc(void *opaque_data);
> - IpMap ip_map; // Data structure to do lookups
> + IpMap ip_map; // Data structure to do lookups
> Data *data_array; // array of the data lements with in
> the table
> int array_len; // size of the arrays
> int num_el; // number of elements in the table
> @@ -295,32 +275,22 @@ template<class Data, class Result> class
> ControlMatcher {
> public:
> // Parameter name must not be deallocated before this
> // object is
> - ControlMatcher(const char *file_var, const char *name, const
> matcher_tags * tags, int flags_in = (ALLOW_HOST_TABLE |
> ALLOW_IP_TABLE | ALLOW_REGEX_TABLE | ALLOW_HOST_REGEX_TABLE |
> ALLOW_URL_TABLE));
> + ControlMatcher(const char *file_var, const char *name, const
> matcher_tags * tags,
> + int flags_in = (ALLOW_HOST_TABLE | ALLOW_IP_TABLE |
> ALLOW_REGEX_TABLE |
> + ALLOW_HOST_REGEX_TABLE |
> ALLOW_URL_TABLE));
> ~ControlMatcher();
> int BuildTable();
> int BuildTableFromString(char *str);
> void Match(RequestData * rdata, Result * result);
> void Print();
> char *config_file_var; // temporary: until config is
> integerated
> - int getEntryCount()
> - {
> - return m_numEntries;
> - }
> - HostMatcher<Data, Result> *getHostMatcher() {
> - return hostMatch;
> - }
> - RegexMatcher<Data, Result> *getReMatcher() {
> - return reMatch;
> - }
> - UrlMatcher<Data, Result> *getUrlMatcher() {
> - return urlMatch;
> - }
> - IpMatcher<Data, Result> *getIPMatcher() {
> - return ipMatch;
> - }
> - HostRegexMatcher<Data, Result> *getHrMatcher() {
> - return hrMatch;
> - }
> +
> + int getEntryCount() { return m_numEntries; }
> + HostMatcher<Data, Result> *getHostMatcher() { return hostMatch; }
> + RegexMatcher<Data, Result> *getReMatcher() { return reMatch; }
> + UrlMatcher<Data, Result> *getUrlMatcher() { return urlMatch; }
> + IpMatcher<Data, Result> *getIPMatcher() { return ipMatch; }
> + HostRegexMatcher<Data, Result> *getHrMatcher() { return hrMatch; }
>
> //private:
> RegexMatcher<Data, Result> *reMatch;
--
Igor Galić
Tel: +43 (0) 664 886 22 883
Mail: i.galic@brainsware.org
URL: http://brainsware.org/
GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE