Updated Branches: refs/heads/3.2.x 6366e4f11 -> e70f5773c
TS-1903 Remove JEMALLOC_P use, it seems to have been deprecated Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e70f5773 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e70f5773 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e70f5773 Branch: refs/heads/3.2.x Commit: e70f5773c69ca1ccb9e3f0b3d370b9289089abb2 Parents: 6366e4f Author: Leif Hedstrom <[email protected]> Authored: Fri Dec 14 00:06:35 2012 -0700 Committer: Leif Hedstrom <[email protected]> Committed: Thu May 16 12:36:53 2013 -0600 ---------------------------------------------------------------------- CHANGES | 5 ++++- STATUS | 5 ----- lib/ts/ink_memory.cc | 28 ---------------------------- 3 files changed, 4 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e70f5773/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 2267b0d..a405c1b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,10 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.2.5 - *) [TS-1909] Remove iconv as dependency + + *) [TS-1903] Remove JEMALLOC_P use, it seems to have been deprecated. + + *) [TS-1902] Remove iconv as dependency. *) [TS-1900] Detect and link libhwloc on Ubuntu. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e70f5773/STATUS ---------------------------------------------------------------------- diff --git a/STATUS b/STATUS index 56893a4..3bd3397 100644 --- a/STATUS +++ b/STATUS @@ -65,11 +65,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: Patch: b76cae726e57acbd8254ae7a2c4832d3fcf8d057 +1: igalic, zwoop, jpeach, arno - Remove use of JEMALLOC_P (it's deprecated) - Jira: https://issues.apache.org/jira/browse/TS-1903 - Patch: 544e64678eecb80a63b88b9efe573ecb42836c24 - +1: zwoop, jpeach, igalic - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e70f5773/lib/ts/ink_memory.cc ---------------------------------------------------------------------- diff --git a/lib/ts/ink_memory.cc b/lib/ts/ink_memory.cc index 5f43797..bf0e459 100644 --- a/lib/ts/ink_memory.cc +++ b/lib/ts/ink_memory.cc @@ -47,11 +47,7 @@ ats_malloc(size_t size) // Useful for tracing bad mallocs // ink_stack_trace_dump(); if (likely(size > 0)) { -#if TS_HAS_JEMALLOC - if (unlikely((ptr = JEMALLOC_P(malloc)(size)) == NULL)) { -#else if (unlikely((ptr = malloc(size)) == NULL)) { -#endif xdump(); ink_fatal(1, "ats_malloc: couldn't allocate %zu bytes", size); } @@ -62,11 +58,7 @@ ats_malloc(size_t size) void * ats_calloc(size_t nelem, size_t elsize) { -#if TS_HAS_JEMALLOC - void *ptr = JEMALLOC_P(calloc)(nelem, elsize); -#else void *ptr = calloc(nelem, elsize); -#endif if (unlikely(ptr == NULL)) { xdump(); ink_fatal(1, "ats_calloc: couldn't allocate %zu %zu byte elements", nelem, elsize); @@ -77,11 +69,7 @@ ats_calloc(size_t nelem, size_t elsize) void * ats_realloc(void *ptr, size_t size) { -#if TS_HAS_JEMALLOC - void *newptr = JEMALLOC_P(realloc)(ptr, size); -#else void *newptr = realloc(ptr, size); -#endif if (unlikely(newptr == NULL)) { xdump(); ink_fatal(1, "ats_realloc: couldn't reallocate %zu bytes", size); @@ -105,11 +93,7 @@ ats_memalign(size_t alignment, size_t size) alignment = PAGE_SIZE; #endif -#if TS_HAS_JEMALLOC - int retcode = JEMALLOC_P(posix_memalign)(&ptr, alignment, size); -#else int retcode = posix_memalign(&ptr, alignment, size); -#endif if (unlikely(retcode)) { if (retcode == EINVAL) { @@ -136,22 +120,14 @@ void ats_free(void *ptr) { if (likely(ptr != NULL)) -#if TS_HAS_JEMALLOC - JEMALLOC_P(free)(ptr); -#else free(ptr); -#endif } /* End ats_free */ void* ats_free_null(void *ptr) { if (likely(ptr != NULL)) -#if TS_HAS_JEMALLOC - JEMALLOC_P(free)(ptr); -#else free(ptr); -#endif return NULL; } /* End ats_free_null */ @@ -159,11 +135,7 @@ void ats_memalign_free(void *ptr) { if (likely(ptr)) -#if TS_HAS_JEMALLOC - JEMALLOC_P(free)(ptr); -#else free(ptr); -#endif } // This effectively makes mallopt() a no-op (currently) when tcmalloc
