diff options
Diffstat (limited to 'runtime/gc/allocator')
-rw-r--r-- | runtime/gc/allocator/dlmalloc.cc | 72 | ||||
-rw-r--r-- | runtime/gc/allocator/dlmalloc.h | 40 |
2 files changed, 112 insertions, 0 deletions
diff --git a/runtime/gc/allocator/dlmalloc.cc b/runtime/gc/allocator/dlmalloc.cc new file mode 100644 index 0000000..7584b6e --- /dev/null +++ b/runtime/gc/allocator/dlmalloc.cc @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "dlmalloc.h" + +#include "base/logging.h" + +// ART specific morecore implementation defined in space.cc. +#define MORECORE(x) art_heap_morecore(m, x) +extern "C" void* art_heap_morecore(void* m, intptr_t increment); + +// Custom heap error handling. +#define PROCEED_ON_ERROR 0 +static void art_heap_corruption(const char* function); +static void art_heap_usage_error(const char* function, void* p); +#define CORRUPTION_ERROR_ACTION(m) art_heap_corruption(__FUNCTION__) +#define USAGE_ERROR_ACTION(m,p) art_heap_usage_error(__FUNCTION__, p) + +// Ugly inclusion of C file so that ART specific #defines configure dlmalloc for our use for +// mspaces (regular dlmalloc is still declared in bionic). +#pragma GCC diagnostic ignored "-Wempty-body" +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#include "../../../bionic/libc/upstream-dlmalloc/malloc.c" +#pragma GCC diagnostic warning "-Wstrict-aliasing" +#pragma GCC diagnostic warning "-Wempty-body" + + +static void art_heap_corruption(const char* function) { + LOG(FATAL) << "Corrupt heap detected in: " << function; +} + +static void art_heap_usage_error(const char* function, void* p) { + LOG(FATAL) << "Incorrect use of function '" << function << "' argument " << p << " not expected"; +} + +#include "globals.h" +#include "utils.h" +#include <sys/mman.h> + +using namespace art; +extern "C" void DlmallocMadviseCallback(void* start, void* end, size_t used_bytes, void* arg) { + // Is this chunk in use? + if (used_bytes != 0) { + return; + } + // Do we have any whole pages to give back? + start = reinterpret_cast<void*>(RoundUp(reinterpret_cast<uintptr_t>(start), kPageSize)); + end = reinterpret_cast<void*>(RoundDown(reinterpret_cast<uintptr_t>(end), kPageSize)); + if (end > start) { + size_t length = reinterpret_cast<byte*>(end) - reinterpret_cast<byte*>(start); + int rc = madvise(start, length, MADV_DONTNEED); + if (UNLIKELY(rc != 0)) { + errno = rc; + PLOG(FATAL) << "madvise failed during heap trimming"; + } + size_t* reclaimed = reinterpret_cast<size_t*>(arg); + *reclaimed += length; + } +} diff --git a/runtime/gc/allocator/dlmalloc.h b/runtime/gc/allocator/dlmalloc.h new file mode 100644 index 0000000..6b02a44 --- /dev/null +++ b/runtime/gc/allocator/dlmalloc.h @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2011 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ART_SRC_GC_ALLOCATOR_DLMALLOC_H_ +#define ART_SRC_GC_ALLOCATOR_DLMALLOC_H_ + +// Configure dlmalloc for mspaces. +#define HAVE_MMAP 0 +#define HAVE_MREMAP 0 +#define HAVE_MORECORE 1 +#define MSPACES 1 +#define NO_MALLINFO 1 +#define ONLY_MSPACES 1 +#define MALLOC_INSPECT_ALL 1 + +#include "../../bionic/libc/upstream-dlmalloc/malloc.h" + +// Define dlmalloc routines from bionic that cannot be included directly because of redefining +// symbols from the include above. +extern "C" void dlmalloc_inspect_all(void(*handler)(void*, void *, size_t, void*), void* arg); +extern "C" int dlmalloc_trim(size_t); + +// Callback for dlmalloc_inspect_all or mspace_inspect_all that will madvise(2) unused +// pages back to the kernel. +extern "C" void DlmallocMadviseCallback(void* start, void* end, size_t used_bytes, void* /*arg*/); + +#endif // ART_SRC_GC_ALLOCATOR_DLMALLOC_H_ |