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

Fix pthread_attr_getstack under valgrind.

Browse Source 
valgrind seems to mess with the stack enough that the kernel will
report "[stack:pid]" rather than "[stack]" in /proc/self/maps, so
switch to the task-specific file instead to force "[stack]". (There
are two conditions in the kernel code that decides which form to
output.)

Bug: 17897476

(cherry picked from commit 9afb2f2106)

Change-Id: I92c331ef6fb5868af49e75bc595710d290a95f5b
This commit is contained in:
Elliott Hughes
2014-10-09 14:01:47 -07:00
parent 7f4618cbc8
commit 2f25cf373c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libc/bionic/pthread_attr.cpp
View File

@@ -31,6 +31,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #include <stdio.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <unistd.h>
#include "private/bionic_string_utils.h" #include "private/bionic_string_utils.h"
#include "private/ErrnoRestorer.h" #include "private/ErrnoRestorer.h"
@@ -126,8 +127,12 @@ static int __pthread_attr_getstack_main_thread(void** stack_base, size_t* stack_
stack_limit.rlim_cur = 8 * 1024 * 1024; stack_limit.rlim_cur = 8 * 1024 * 1024;
} }
// It doesn't matter which thread we are; we're just looking for "[stack]". // It shouldn't matter which thread we are because we're just looking for "[stack]", but
FILE* fp = fopen("/proc/self/maps", "re"); // valgrind seems to mess with the stack enough that the kernel will report "[stack:pid]"
// instead if you look in /proc/self/maps, so we need to look in /proc/pid/task/pid/maps.
char path[64];
snprintf(path, sizeof(path), "/proc/self/task/%d/maps", getpid());
FILE* fp = fopen(path, "re");
if (fp == NULL) { if (fp == NULL) {
return errno; return errno;
} }
@@ -143,7 +148,7 @@ static int __pthread_attr_getstack_main_thread(void** stack_base, size_t* stack_
} }
} }
} }
__libc_fatal("No [stack] line found in /proc/self/maps!"); __libc_fatal("No [stack] line found in \"%s\"!", path);
} }
int pthread_attr_getstack(const pthread_attr_t* attr, void** stack_base, size_t* stack_size) { int pthread_attr_getstack(const pthread_attr_t* attr, void** stack_base, size_t* stack_size) {