Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(419)

Unified Diff: runtime/vm/os_thread_linux.cc

Issue 1275353005: VM thread shutdown. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Merge Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/os_thread_linux.h ('k') | runtime/vm/os_thread_macos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « runtime/vm/os_thread_linux.h ('k') | runtime/vm/os_thread_macos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698