Repository: trafficserver Updated Branches: refs/heads/6.1.x 01eb69749 -> f2987f0af
TS-4198: Restore sync buffer cleanup. This closes #472 (cherry picked from commit b3f9e053989cc8155dce6c381e66f735cd94df91) Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8377fa5b Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8377fa5b Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8377fa5b Branch: refs/heads/6.1.x Commit: 8377fa5b6f7ccf72090eab790a306bcee67067ca Parents: 01eb697 Author: Phil Sorber <[email protected]> Authored: Fri Feb 12 09:08:20 2016 -0700 Committer: Leif Hedstrom <[email protected]> Committed: Fri Feb 12 08:16:10 2016 -0800 ---------------------------------------------------------------------- iocore/cache/CacheDir.cc | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8377fa5b/iocore/cache/CacheDir.cc ---------------------------------------------------------------------- diff --git a/iocore/cache/CacheDir.cc b/iocore/cache/CacheDir.cc index 62c84de..0f33818 100644 --- a/iocore/cache/CacheDir.cc +++ b/iocore/cache/CacheDir.cc @@ -1001,6 +1001,15 @@ CacheSync::mainEvent(int event, Event *e) Lrestart: if (vol_idx >= gnvol) { vol_idx = 0; + if (buf) { + if (buf_huge) + ats_free_hugepage(buf, buflen); + else + ats_memalign_free(buf); + buflen = 0; + buf = NULL; + buf_huge = false; + } Debug("cache_dir_sync", "sync done"); if (event == EVENT_INTERVAL) trigger = e->ethread->schedule_in(this, HRTIME_SECONDS(cache_config_dir_sync_frequency));
