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

am e9c216fc: Merge "Fix pthread_attr_getstack under valgrind."

Browse Source 
* commit 'e9c216fca56e84b0d0a96f7d5e3c99d3276ef071':
  Fix pthread_attr_getstack under valgrind.
This commit is contained in:
Elliott Hughes 2014-10-09 22:10:37 +00:00 committed by Android Git Automerger
commit a852bb56e8
1 changed files with 8 additions and 3 deletions
Show Stats 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) {