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/04/17 23:15:49 UTC
git commit: TS-846 Eliminate proxy.config.remap.use_remap_processor
Updated Branches:
refs/heads/master 821a8c3be -> 1d4ce3fa3
TS-846 Eliminate proxy.config.remap.use_remap_processor
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1d4ce3fa
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1d4ce3fa
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1d4ce3fa
Branch: refs/heads/master
Commit: 1d4ce3fa31e2f45f4904dc5440533b58628e9623
Parents: 821a8c3
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Mar 19 17:15:38 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Wed Apr 17 15:13:19 2013 -0600
----------------------------------------------------------------------
CHANGES | 2 ++
.../perl/AdminClient/lib/Apache/TS/AdminClient.pm | 1 -
mgmt/RecordsConfig.cc | 4 +---
proxy/Main.cc | 10 ++++------
4 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1d4ce3fa/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 7642314..e418fd7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
Changes with Apache Traffic Server 3.3.3
+ *) [TS-846] Eliminate proxy.config.remap.use_remap_processor.
+
*) [TS-1802] Remove proxy.config.net.accept_throttle.
*) [TS-1752] Change type of "len" in jtest to off_t, for better
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1d4ce3fa/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
----------------------------------------------------------------------
diff --git a/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm b/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
index 36d1091..ab3d421 100644
--- a/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
+++ b/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
@@ -643,7 +643,6 @@ The Apache Traffic Server Administration Manual will explain what these strings
proxy.config.proxy_binary_opts
proxy.config.proxy_name
proxy.config.remap.num_remap_threads
- proxy.config.remap.use_remap_processor
proxy.config.res_track_memory
proxy.config.reverse_proxy.enabled
proxy.config.reverse_proxy.oldasxbehavior
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1d4ce3fa/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 604212e..df1e5ef 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -1897,9 +1897,7 @@ RecordElement RecordsConfig[] = {
//# Eric's super cool remap processor
//#
//############
- {RECT_CONFIG, "proxy.config.remap.use_remap_processor", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
- ,
- {RECT_CONFIG, "proxy.config.remap.num_remap_threads", RECD_INT, "1", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ {RECT_CONFIG, "proxy.config.remap.num_remap_threads", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
//##############################################################################
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1d4ce3fa/proxy/Main.cc
----------------------------------------------------------------------
diff --git a/proxy/Main.cc b/proxy/Main.cc
index c15529c..78e1fe6 100644
--- a/proxy/Main.cc
+++ b/proxy/Main.cc
@@ -1575,14 +1575,12 @@ main(int argc, char **argv)
ink_split_dns_init(makeModuleVersion(1, 0, PRIVATE_MODULE_HEADER));
eventProcessor.start(num_of_net_threads);
- int use_separate_thread = 0;
- int num_remap_threads = 1;
- TS_ReadConfigInteger(use_separate_thread, "proxy.config.remap.use_remap_processor");
+ int num_remap_threads = 0;
TS_ReadConfigInteger(num_remap_threads, "proxy.config.remap.num_remap_threads");
- if (use_separate_thread && num_remap_threads < 1)
- num_remap_threads = 1;
+ if (num_remap_threads < 1)
+ num_remap_threads = 0;
- if (use_separate_thread) {
+ if (num_remap_threads > 0) {
Note("using the new remap processor system with %d threads", num_remap_threads);
remapProcessor.setUseSeparateThread();
}