f183f95946
It turns out that appportable has a version that calls dlmalloc directly.
Re-add the dlmalloc symbol for 32 bit only as a compatibility shim that
calls malloc.
Bug: 17881362
(cherry pick commit from c9734d24d9
)
Change-Id: Iee9a777f66a1edb407d7563a60792b767ac4f83a
56 lines
1.7 KiB
C
56 lines
1.7 KiB
C
/*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef LIBC_BIONIC_DLMALLOC_H_
|
|
#define LIBC_BIONIC_DLMALLOC_H_
|
|
|
|
#include <sys/cdefs.h>
|
|
#include <stddef.h>
|
|
|
|
/* Configure dlmalloc. */
|
|
#define HAVE_GETPAGESIZE 1
|
|
#define MALLOC_INSPECT_ALL 1
|
|
#define MSPACES 0
|
|
#define REALLOC_ZERO_BYTES_FREES 1
|
|
#define USE_DL_PREFIX 1
|
|
#define USE_LOCKS 1
|
|
#define LOCK_AT_FORK 1
|
|
#define USE_RECURSIVE_LOCK 0
|
|
#define USE_SPIN_LOCKS 0
|
|
#define DEFAULT_MMAP_THRESHOLD (64U * 1024U)
|
|
|
|
#define malloc_getpagesize getpagesize()
|
|
|
|
#if !defined(__LP64__)
|
|
/* dlmalloc_usable_size and dlmalloc were exposed in the NDK and some
|
|
* apps actually used them. Rename these functions out of the way
|
|
* for 32 bit architectures so that ndk_cruft.cpp can expose
|
|
* compatibility shims with these names.
|
|
*/
|
|
#define dlmalloc_usable_size dlmalloc_usable_size_real
|
|
#define dlmalloc dlmalloc_real
|
|
#endif
|
|
|
|
/* Export two symbols used by the VM. */
|
|
__BEGIN_DECLS
|
|
int dlmalloc_trim(size_t) __LIBC_ABI_PUBLIC__;
|
|
void dlmalloc_inspect_all(void (*handler)(void*, void*, size_t, void*), void*) __LIBC_ABI_PUBLIC__;
|
|
__END_DECLS
|
|
|
|
/* Include the proper definitions. */
|
|
#include "../upstream-dlmalloc/malloc.h"
|
|
|
|
#endif // LIBC_BIONIC_DLMALLOC_H_
|