Index: runtime/vm/os_thread_linux.cc |
diff --git a/runtime/vm/os_thread_linux.cc b/runtime/vm/os_thread_linux.cc |
index c99189b1b764536e7266159a3bd2921e5f61d3b9..f9bb9b551cbf824239e6b6af9e6ab79ec88d84d0 100644 |
--- a/runtime/vm/os_thread_linux.cc |
+++ b/runtime/vm/os_thread_linux.cc |
@@ -102,9 +102,6 @@ int OSThread::Start(ThreadStartFunction function, uword parameter) { |
int result = pthread_attr_init(&attr); |
RETURN_ON_PTHREAD_FAILURE(result); |
- result = pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); |
- RETURN_ON_PTHREAD_FAILURE(result); |
- |
result = pthread_attr_setstacksize(&attr, OSThread::GetMaxStackSize()); |
RETURN_ON_PTHREAD_FAILURE(result); |
@@ -124,6 +121,7 @@ int OSThread::Start(ThreadStartFunction function, uword parameter) { |
ThreadLocalKey OSThread::kUnsetThreadLocalKey = |
static_cast<pthread_key_t>(-1); |
ThreadId OSThread::kInvalidThreadId = static_cast<ThreadId>(0); |
+ThreadJoinId OSThread::kInvalidThreadJoinId = static_cast<ThreadJoinId>(0); |
ThreadLocalKey OSThread::CreateThreadLocal(ThreadDestructor destructor) { |
pthread_key_t key = kUnsetThreadLocalKey; |
@@ -159,8 +157,13 @@ ThreadId OSThread::GetCurrentThreadId() { |
} |
-bool OSThread::Join(ThreadId id) { |
- return false; |
+ThreadJoinId OSThread::GetCurrentThreadJoinId() { |
+ return pthread_self(); |
+} |
+ |
+ |
+void OSThread::Join(ThreadJoinId id) { |
+ ASSERT(pthread_join(id, NULL) == 0); |
} |