Repository: trafficserver Updated Branches: refs/heads/master bba557870 -> f82e4f488
TS-3122: Update CHANGES, fix FreeBSD build, and fix RECU value in config. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f82e4f48 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f82e4f48 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f82e4f48 Branch: refs/heads/master Commit: f82e4f4885635a9fd7302b53e06a378b67536b12 Parents: bba5578 Author: Phil Sorber <[email protected]> Authored: Mon Jun 8 10:18:29 2015 -0600 Committer: Phil Sorber <[email protected]> Committed: Mon Jun 8 10:18:42 2015 -0600 ---------------------------------------------------------------------- CHANGES | 2 ++ lib/ts/hugepages.cc | 3 +++ mgmt/RecordsConfig.cc | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f82e4f48/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 2188b45..75c6da9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 6.0.0 + *) [TS-3122] Add support for hugepages on Linux. + *) [TS-2032] Eliminate remnant code for milestone for cache-lookup times. Author: John Rushford <[email protected]> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f82e4f48/lib/ts/hugepages.cc ---------------------------------------------------------------------- diff --git a/lib/ts/hugepages.cc b/lib/ts/hugepages.cc index 216bf0b..d7d94a4 100644 --- a/lib/ts/hugepages.cc +++ b/lib/ts/hugepages.cc @@ -25,6 +25,8 @@ #include "ink_align.h" #define DEBUG_TAG "hugepages" + +#ifdef MAP_HUGETLB #define MEMINFO_PATH "/proc/meminfo" #define LINE_SIZE 256 #define TOKEN "Hugepagesize:" @@ -32,6 +34,7 @@ static int hugepage_size = -1; static bool hugepage_enabled; +#endif size_t ats_hugepage_size(void) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f82e4f48/mgmt/RecordsConfig.cc ---------------------------------------------------------------------- diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc index ec3387a..eae4690 100644 --- a/mgmt/RecordsConfig.cc +++ b/mgmt/RecordsConfig.cc @@ -2079,7 +2079,7 @@ static const RecordElement RecordsConfig[] = , {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_NULL, RR_NULL, RECC_NULL, "[0-1]", RECA_NULL} + {RECT_CONFIG, "proxy.config.allocator.hugepages", RECD_INT, "0", RECU_RESTART_TS, RR_NULL, RECC_NULL, "[0-1]", RECA_NULL} , //############
