You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by us...@apache.org on 2013/04/17 14:17:25 UTC
git commit: TS-1862: Remove DumpStats/http_dump dead code remnants
Updated Branches:
refs/heads/master 7431d22b4 -> db32da6b9
TS-1862: Remove DumpStats/http_dump dead code remnants
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/db32da6b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/db32da6b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/db32da6b
Branch: refs/heads/master
Commit: db32da6b9c98624e7b8f06ef6839dd3d6faf186b
Parents: 7431d22
Author: Uri Shachar <us...@apache.org>
Authored: Wed Apr 17 15:07:35 2013 +0300
Committer: Uri Shachar <us...@apache.org>
Committed: Wed Apr 17 15:07:35 2013 +0300
----------------------------------------------------------------------
CHANGES | 3 ++
proxy/TestProxy.cc | 16 ----------
proxy/http/HttpProxyServerMain.cc | 49 --------------------------------
3 files changed, 3 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/db32da6b/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 086d299..efcc8cf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
Changes with Apache Traffic Server 3.3.3
+ *) [TS-1862] Remove DumpStats/http_dump dead code
+
+
Changes with Apache Traffic Server 3.3.2
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/db32da6b/proxy/TestProxy.cc
----------------------------------------------------------------------
diff --git a/proxy/TestProxy.cc b/proxy/TestProxy.cc
index ba0f17b..dba111b 100644
--- a/proxy/TestProxy.cc
+++ b/proxy/TestProxy.cc
@@ -390,21 +390,6 @@ TestAccept():Continuation(new_ProxyMutex()) {
}
};
-struct DumpStats:Continuation
-{
- int mainEvent(int event, Event * e)
- {
- (void) event;
- (void) e;
- dump_stats();
- return EVENT_CONT;
- }
- DumpStats():Continuation(NULL)
- {
- SET_HANDLER(mainEvent);
- }
-};
-
void
redirect_test(Machine * m, void *data, int len)
{
@@ -422,6 +407,5 @@ test()
{
ptest_ClusterFunction = redirect_test;
netProcessor.proxy_accept(new TestAccept);
- // eventProcessor.schedule_every(new DumpStats,HRTIME_SECONDS(30));
}
#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/db32da6b/proxy/http/HttpProxyServerMain.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpProxyServerMain.cc b/proxy/http/HttpProxyServerMain.cc
index 55392ae..b2d31d5 100644
--- a/proxy/http/HttpProxyServerMain.cc
+++ b/proxy/http/HttpProxyServerMain.cc
@@ -36,44 +36,6 @@
#include "Tokenizer.h"
#include "P_SSLNextProtocolAccept.h"
-#ifdef DEBUG
-extern "C"
-{
- void http_dump();
-}
-///////////////////////////////////////////////////////////
-//
-// http_dump()
-//
-///////////////////////////////////////////////////////////
-void
-http_dump()
-{
-// if (diags->on("http_dump"))
- {
-// httpNetProcessor.dump();
-// HttpStateMachine::dump_state_machines();
- }
-
- return;
-}
-#endif
-struct DumpStats: public Continuation
-{
- int mainEvent(int event, void *e)
- {
- (void) event;
- (void) e;
- /* http_dump() */
-// dump_stats();
- return EVENT_CONT;
- }
- DumpStats():Continuation(NULL)
- {
- SET_HANDLER(&DumpStats::mainEvent);
- }
-};
-
HttpAccept *plugin_http_accept = NULL;
HttpAccept *plugin_http_transparent_accept = 0;
@@ -212,15 +174,9 @@ start_HttpProxyPort(const HttpProxyPort& port, unsigned nthreads)
void
start_HttpProxyServer(int accept_threads)
{
- char *dump_every_str = 0;
static bool called_once = false;
NetProcessor::AcceptOptions opt;
- if ((dump_every_str = getenv("PROXY_DUMP_STATS")) != 0) {
- int dump_every_sec = atoi(dump_every_str);
- eventProcessor.schedule_every(NEW(new DumpStats), HRTIME_SECONDS(dump_every_sec), ET_CALL);
- }
-
///////////////////////////////////
// start accepting connections //
///////////////////////////////////
@@ -237,11 +193,6 @@ start_HttpProxyServer(int accept_threads)
start_HttpProxyPort(HttpProxyPort::global()[i], accept_threads);
}
-#ifdef DEBUG
- if (diags->on("http_dump")) {
-// HttpStateMachine::dump_state_machines();
- }
-#endif
#if TS_HAS_TESTS
if (is_action_tag_set("http_update_test")) {
init_http_update_test();