generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove non-standard prctl constants from <sys/prctl.h>.

Browse Source 
Also remove __bionic_name_mem which has exactly one caller, and is only
ever expected to be used in this one place.

(cherry picked from commit d7453860a6b06e7d4a960c20792ce6f0b6cc5f3a)

Change-Id: I26b7638609e9d4eaf4f21ae29721ea27d4176702
This commit is contained in:
Elliott Hughes 2014-07-17 14:26:33 -07:00
parent 9a7fdb2dae
commit d648f557f1
5 changed files with 7 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libc/Android.mk
View File

@ -96,7 +96,6 @@ libc_bionic_src_files := \
bionic/access.cpp \ bionic/access.cpp \
bionic/assert.cpp \ bionic/assert.cpp \
bionic/atof.cpp \ bionic/atof.cpp \
bionic/__bionic_name_mem.cpp \
bionic/bionic_time_conversions.cpp \ bionic/bionic_time_conversions.cpp \
bionic/brk.cpp \ bionic/brk.cpp \
bionic/c16rtomb.cpp \ bionic/c16rtomb.cpp \

50
libc/bionic/__bionic_name_mem.cpp
View File

@ -1,50 +0,0 @@
/*
* Copyright (C) 2013 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include "private/bionic_name_mem.h"
#include <sys/prctl.h>
// Local definitions of custom prctl arguments to set a vma name in some kernels.
#define BIONIC_PR_SET_VMA 0x53564d41
#define BIONIC_PR_SET_VMA_ANON_NAME 0
// Names a region of memory. The name is expected to show up in /proc/pid/maps
// and /proc/pid/smaps. There is no guarantee that it will work, and if it
// does work it is likely to only work on memory that was allocated with
// mmap(MAP_ANONYMOUS), and only on regions that are page aligned. name should
// be a pointer to a string that is valid for as long as the memory is mapped,
// preferably a compile-time constant string.
//
// Returns -1 on error and sets errno. If it returns an error naming page
// aligned anonymous memory the kernel doesn't support naming, and an alternate
// method of naming memory should be used (like ashmem).
int __bionic_name_mem(void* addr, size_t len, const char* name) {
return prctl(BIONIC_PR_SET_VMA, BIONIC_PR_SET_VMA_ANON_NAME, addr, len, name);
}

9
libc/bionic/dlmalloc.c
View File

@ -26,11 +26,16 @@ static void __bionic_heap_usage_error(const char* function, void* address);
#define CORRUPTION_ERROR_ACTION(m) __bionic_heap_corruption_error(__FUNCTION__) #define CORRUPTION_ERROR_ACTION(m) __bionic_heap_corruption_error(__FUNCTION__)
#define USAGE_ERROR_ACTION(m,p) __bionic_heap_usage_error(__FUNCTION__, p) #define USAGE_ERROR_ACTION(m,p) __bionic_heap_usage_error(__FUNCTION__, p)
/* Bionic named anonymous memory declarations */ // Bionic named anonymous memory declarations.
static void* named_anonymous_mmap(size_t length); static void* named_anonymous_mmap(size_t length);
#define MMAP(s) named_anonymous_mmap(s) #define MMAP(s) named_anonymous_mmap(s)
#define DIRECT_MMAP(s) named_anonymous_mmap(s) #define DIRECT_MMAP(s) named_anonymous_mmap(s)
// Local definitions of custom prctl arguments to set a vma name in Android kernels.
#include <sys/prctl.h>
#define PR_SET_VMA 0x53564d41
#define PR_SET_VMA_ANON_NAME 0
// Ugly inclusion of C file so that bionic specific #defines configure dlmalloc. // Ugly inclusion of C file so that bionic specific #defines configure dlmalloc.
#include "../upstream-dlmalloc/malloc.c" #include "../upstream-dlmalloc/malloc.c"
@ -51,6 +56,6 @@ static void* named_anonymous_mmap(size_t length) {
if (map == MAP_FAILED) { if (map == MAP_FAILED) {
return map; return map;
} }
__bionic_name_mem(map, length, "libc_malloc"); prctl(BIONIC_PR_SET_VMA, BIONIC_PR_SET_VMA_ANON_NAME, map, length, "libc_malloc");
return map; return map;
} }

13
libc/include/sys/prctl.h
View File

@ -38,18 +38,6 @@
#error PR_SET_TIMERSLACK_PID defined twice #error PR_SET_TIMERSLACK_PID defined twice
#endif #endif
#if !defined(PR_SET_VMA)
#define PR_SET_VMA 0x53564d41
#else
#error PR_SET_VMA defined twice
#endif
#if !defined(PR_SET_VMA_ANON_NAME)
#define PR_SET_VMA_ANON_NAME 0
#else
#error PR_SET_VMA_ANON_NAME defined twice
#endif
__BEGIN_DECLS __BEGIN_DECLS
/* IMPORTANT NOTE: This function is declared as taking a variable number /* IMPORTANT NOTE: This function is declared as taking a variable number
@ -63,4 +51,3 @@ extern int prctl(int option, ...);
__END_DECLS __END_DECLS
#endif /* _SYS_PRCTL_H */ #endif /* _SYS_PRCTL_H */

41
libc/private/bionic_name_mem.h
View File

@ -1,41 +0,0 @@
/*
* Copyright (C) 2013 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef _BIONIC_NAME_MEM_H
#define _BIONIC_NAME_MEM_H
#include <sys/cdefs.h>
#include <stddef.h>
__BEGIN_DECLS
__LIBC_HIDDEN__ int __bionic_name_mem(void* addr, size_t len, const char* name);
__END_DECLS
#endif