Merge changes from topic 'debuggerd_inproc'
* changes:
linker: use fallback crash handler dumping.
linker: add android_use_fallback_allocator.
diff --git a/linker/Android.bp b/linker/Android.bp
index 5c205d5..aab05b4 100644
--- a/linker/Android.bp
+++ b/linker/Android.bp
@@ -117,9 +117,17 @@
"libutils",
"libbase",
"libz",
+
+ "libdebuggerd_handler_core",
+ "libdebuggerd_handler_fallback",
+ "libdebuggerd",
+ "libbacktrace",
+ "libunwind",
+ "liblzma",
+ "libcutils",
+
"liblog",
"libc++_static",
- "libdebuggerd_handler",
// Important: The liblinker_malloc should be the last library in the list
// to overwrite any other malloc implementations by other static libraries.
diff --git a/linker/linker_memory.cpp b/linker/linker_memory.cpp
index 3920e8c..18ef93e 100644
--- a/linker/linker_memory.cpp
+++ b/linker/linker_memory.cpp
@@ -29,22 +29,51 @@
#include "linker_allocator.h"
#include <stdlib.h>
+#include <sys/cdefs.h>
+#include <unistd.h>
+
+#include "private/libc_logging.h"
static LinkerMemoryAllocator g_linker_allocator;
+static pid_t fallback_tid = 0;
+
+// Used by libdebuggerd_handler to switch allocators during a crash dump, in
+// case the linker heap is corrupted. Do not use this function.
+extern "C" void __linker_use_fallback_allocator() {
+ if (fallback_tid != 0) {
+ __libc_format_log(ANDROID_LOG_ERROR, "libc",
+ "attempted to set fallback allocator multiple times");
+ return;
+ }
+
+ fallback_tid = gettid();
+}
+
+static LinkerMemoryAllocator& get_fallback_allocator() {
+ static LinkerMemoryAllocator fallback_allocator;
+ return fallback_allocator;
+}
+
+static LinkerMemoryAllocator& get_allocator() {
+ if (__predict_false(fallback_tid) && __predict_false(gettid() == fallback_tid)) {
+ return get_fallback_allocator();
+ }
+ return g_linker_allocator;
+}
void* malloc(size_t byte_count) {
- return g_linker_allocator.alloc(byte_count);
+ return get_allocator().alloc(byte_count);
}
void* calloc(size_t item_count, size_t item_size) {
- return g_linker_allocator.alloc(item_count*item_size);
+ return get_allocator().alloc(item_count*item_size);
}
void* realloc(void* p, size_t byte_count) {
- return g_linker_allocator.realloc(p, byte_count);
+ return get_allocator().realloc(p, byte_count);
}
void free(void* ptr) {
- g_linker_allocator.free(ptr);
+ get_allocator().free(ptr);
}