diff options
| author | Christopher Ferris <cferris@google.com> | 2017-05-03 18:06:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-03 18:06:57 +0000 |
| commit | 33d712344e284614cdca40445d5a8c58d85129f1 (patch) | |
| tree | 88996c1f1553bac44fbd68c8bcf2f2312574ac23 | |
| parent | b43ab5d1ba0c131ac0fbf5136c2bfd2bcd5df959 (diff) | |
| parent | 2b3ac544b561624cefce9d87c0f1eec0d530368e (diff) | |
| download | jemalloc-33d712344e284614cdca40445d5a8c58d85129f1.tar.gz | |
Change the name of the libc logging header. am: be92dfd38f am: 7604d1f20d am: 3d3237a80a
am: 2b3ac544b5
Change-Id: Ifdd14ce1ec359f5ac731d1e7eece536a4e87cdd9
| -rw-r--r-- | Android.bp | 12 | ||||
| -rw-r--r-- | android/include/log.h (renamed from android/include/libc_logging.h) | 6 | ||||
| -rw-r--r-- | include/jemalloc/internal/arena.h | 4 |
3 files changed, 11 insertions, 11 deletions
@@ -136,7 +136,7 @@ cc_library_static { defaults: ["jemalloc_defaults"], - cflags: ["-include bionic/libc/private/libc_logging.h"], + cflags: ["-include bionic/libc/async_safe/include/async_safe/log.h"], srcs: lib_src_files, } @@ -151,7 +151,7 @@ cc_library_static { cflags: [ "-DJEMALLOC_JET", - "-include android/include/libc_logging.h", + "-include android/include/log.h", ], srcs: lib_src_files, @@ -181,7 +181,7 @@ cc_library_static { cflags: [ "-DJEMALLOC_UNIT_TEST", - "-include android/include/libc_logging.h", + "-include android/include/log.h", ], local_include_dirs: [ @@ -251,7 +251,7 @@ cc_test { cflags: common_cflags + [ "-DJEMALLOC_UNIT_TEST", - "-include android/include/libc_logging.h", + "-include android/include/log.h", ], local_include_dirs: common_c_local_includes + [ @@ -278,7 +278,7 @@ cc_library_static { cflags: [ "-DJEMALLOC_INTEGRATION_TEST", - "-include android/include/libc_logging.h", + "-include android/include/log.h", ], local_include_dirs: [ @@ -319,7 +319,7 @@ cc_test { cflags: common_cflags + [ "-DJEMALLOC_INTEGRATION_TEST", - "-include android/include/libc_logging.h", + "-include android/include/log.h", ], local_include_dirs: common_c_local_includes + [ diff --git a/android/include/libc_logging.h b/android/include/log.h index 19c2cfe..01470ae 100644 --- a/android/include/libc_logging.h +++ b/android/include/log.h @@ -26,10 +26,10 @@ * SUCH DAMAGE. */ -#ifndef _JEMALLOC_LIBC_LOGGING_H -#define _JEMALLOC_LIBC_LOGGING_H +#ifndef _JEMALLOC_LIBC_LOG_LOG_H +#define _JEMALLOC_LIBC_LOG_LOG_H /* Convert this to an abort for jemalloc tests. */ -#define __libc_fatal(format, ...) abort() +#define async_safe_fatal(format, ...) abort() #endif /* _JEMALLOC_LIBC_LOGGING_H */ diff --git a/include/jemalloc/internal/arena.h b/include/jemalloc/internal/arena.h index 1ab91ea..0792951 100644 --- a/include/jemalloc/internal/arena.h +++ b/include/jemalloc/internal/arena.h @@ -1439,7 +1439,7 @@ arena_dalloc(tsdn_t *tsdn, void *ptr, tcache_t *tcache, bool slow_path) #if defined(__ANDROID__) /* Verify the ptr is actually in the chunk. */ if (unlikely(pageind < map_bias || pageind >= chunk_npages)) { - __libc_fatal("Invalid address %p passed to free: invalid page index", ptr); + async_safe_fatal("Invalid address %p passed to free: invalid page index", ptr); } #endif mapbits = arena_mapbits_get(chunk, pageind); @@ -1447,7 +1447,7 @@ arena_dalloc(tsdn_t *tsdn, void *ptr, tcache_t *tcache, bool slow_path) #if defined(__ANDROID__) /* Verify the ptr has been allocated. */ if (unlikely((mapbits & CHUNK_MAP_ALLOCATED) == 0)) { - __libc_fatal("Invalid address %p passed to free: value not allocated", ptr); + async_safe_fatal("Invalid address %p passed to free: value not allocated", ptr); } #endif if (likely((mapbits & CHUNK_MAP_LARGE) == 0)) { |