Repository: trafficserver Updated Branches: refs/heads/6.0.x cca283cb9 -> e95d2f379
TS-3731 Missed removing some reclaimable freelist configs (cherry picked from commit 758b5ebfca77d02ff78e6dc2042b093d7e2e2aba) Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e95d2f37 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e95d2f37 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e95d2f37 Branch: refs/heads/6.0.x Commit: e95d2f379f61ff73be4f2c45f0445c65de6c6b52 Parents: cca283c Author: Leif Hedstrom <[email protected]> Authored: Wed Jul 1 17:13:39 2015 -0700 Committer: Bryan Call <[email protected]> Committed: Mon Jul 6 08:45:56 2015 -0700 ---------------------------------------------------------------------- mgmt/RecordsConfig.cc | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e95d2f37/mgmt/RecordsConfig.cc ---------------------------------------------------------------------- diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc index 0f9d8c8..8039eb6 100644 --- a/mgmt/RecordsConfig.cc +++ b/mgmt/RecordsConfig.cc @@ -1963,22 +1963,6 @@ static const RecordElement RecordsConfig[] = //############ //# - //# Using for Reclaimable InkFreeList memory pool - //# - //############ - {RECT_CONFIG, "proxy.config.allocator.enable_reclaim", RECD_INT, "1", RECU_NULL, RR_NULL, RECC_NULL, "[0-1]", RECA_NULL} - , - {RECT_CONFIG, "proxy.config.allocator.max_overage", RECD_INT, "3", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL} - , - {RECT_CONFIG, "proxy.config.allocator.reclaim_factor", RECD_FLOAT, "0.3", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL} - , - {RECT_CONFIG, "proxy.config.allocator.debug_filter", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, "[0-3]", RECA_NULL} - , - {RECT_CONFIG, "proxy.config.allocator.hugepages", RECD_INT, "0", RECU_RESTART_TS, RR_NULL, RECC_NULL, "[0-1]", RECA_NULL} - , - - //############ - //# //# Per-thread freelist / allocator controls //# //############ @@ -1987,6 +1971,8 @@ static const RecordElement RecordsConfig[] = , {RECT_CONFIG, "proxy.config.allocator.thread_freelist_low_watermark", RECD_INT, "32", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL} , + {RECT_CONFIG, "proxy.config.allocator.hugepages", RECD_INT, "0", RECU_RESTART_TS, RR_NULL, RECC_NULL, "[0-1]", RECA_NULL} + , //############ //#
