tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove the unused TrackHeader structure."

Browse source
This commit is contained in:
Christopher Ferris 2016-02-02 22:09:30 +00:00 committed by Gerrit Code Review
commit fe60bae4b7
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libc/malloc_debug/malloc_debug.h
View file

@ -58,11 +58,6 @@ struct Header {
static size_t max_size() { return (1U << 31) - 1; } static size_t max_size() { return (1U << 31) - 1; }
} __attribute__((packed)); } __attribute__((packed));
struct TrackHeader {
Header* prev = nullptr;
Header* next = nullptr;
} __attribute__((packed));
struct BacktraceHeader { struct BacktraceHeader {
size_t num_frames; size_t num_frames;
uintptr_t frames[0]; uintptr_t frames[0];

6
libc/malloc_debug/tests/malloc_debug_unit_tests.cpp
View file

@ -67,14 +67,10 @@ __END_DECLS
constexpr char DIVIDER[] = constexpr char DIVIDER[] =
"6 malloc_debug *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***\n"; "6 malloc_debug *** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***\n";
constexpr uint32_t TRACK_HEADER = 0x2; constexpr uint32_t BACKTRACE_HEADER = 0x1;
constexpr uint32_t BACKTRACE_HEADER = 0x4;
static size_t get_tag_offset(uint32_t flags = 0, size_t backtrace_frames = 0) { static size_t get_tag_offset(uint32_t flags = 0, size_t backtrace_frames = 0) {
size_t offset = BIONIC_ALIGN(sizeof(Header), sizeof(uintptr_t)); size_t offset = BIONIC_ALIGN(sizeof(Header), sizeof(uintptr_t));
if (flags & TRACK_HEADER) {
offset += BIONIC_ALIGN(sizeof(TrackHeader), sizeof(uintptr_t));
}
if (flags & BACKTRACE_HEADER) { if (flags & BACKTRACE_HEADER) {
offset += BIONIC_ALIGN(sizeof(BacktraceHeader) + sizeof(uintptr_t) * backtrace_frames, sizeof(uintptr_t)); offset += BIONIC_ALIGN(sizeof(BacktraceHeader) + sizeof(uintptr_t) * backtrace_frames, sizeof(uintptr_t));
} }