diff options
| author | Ian Rogers <irogers@google.com> | 2012-10-03 17:31:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-03 17:31:02 -0700 |
| commit | 870ea4772199f8d4cbd9a269f9093620ee50a59c (patch) | |
| tree | 7946a657bfd8363e7e985f08193fcac5b76c7059 /src/utils.cc | |
| parent | eb569a9f67d5e4d3bf1919553f0050e3d729dcc3 (diff) | |
| parent | 120f1c74a9768e958377b6c97897511b27ae58c8 (diff) | |
| download | art-870ea4772199f8d4cbd9a269f9093620ee50a59c.zip art-870ea4772199f8d4cbd9a269f9093620ee50a59c.tar.gz art-870ea4772199f8d4cbd9a269f9093620ee50a59c.tar.bz2 | |
Merge "Fail threads attaching during runtime shutdown." into dalvik-dev
Diffstat (limited to 'src/utils.cc')
| -rw-r--r-- | src/utils.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/utils.cc b/src/utils.cc index 534b28e..cbe07a2 100644 --- a/src/utils.cc +++ b/src/utils.cc @@ -73,10 +73,10 @@ std::string GetThreadName(pid_t tid) { return result; } -void GetThreadStack(void*& stack_base, size_t& stack_size) { +void GetThreadStack(pthread_t thread, void*& stack_base, size_t& stack_size) { #if defined(__APPLE__) - stack_size = pthread_get_stacksize_np(pthread_self()); - void* stack_addr = pthread_get_stackaddr_np(pthread_self()); + stack_size = pthread_get_stacksize_np(thread); + void* stack_addr = pthread_get_stackaddr_np(thread); // Check whether stack_addr is the base or end of the stack. // (On Mac OS 10.7, it's the end.) @@ -88,7 +88,7 @@ void GetThreadStack(void*& stack_base, size_t& stack_size) { } #else pthread_attr_t attributes; - CHECK_PTHREAD_CALL(pthread_getattr_np, (pthread_self(), &attributes), __FUNCTION__); + CHECK_PTHREAD_CALL(pthread_getattr_np, (thread, &attributes), __FUNCTION__); CHECK_PTHREAD_CALL(pthread_attr_getstack, (&attributes, &stack_base, &stack_size), __FUNCTION__); CHECK_PTHREAD_CALL(pthread_attr_destroy, (&attributes), __FUNCTION__); #endif |