JavaScriptCore-621.1.tar.gz

[apple/javascriptcore.git] / wtf / Threading.cpp

diff --git a/wtf/Threading.cpp b/wtf/Threading.cpp
index bd25ee749869d2b1aac78aa25aff882df80d23c6..49de59ec00ae509abaa56b757fdf953532f7697b 100644 (file)
--- a/wtf/Threading.cpp
+++ b/wtf/Threading.cpp
@@ -30,7 +30,7 @@
 
 namespace WTF {
 
 
 namespace WTF {
 

-struct NewThreadContext {
+struct NewThreadContext : FastAllocBase {

     NewThreadContext(ThreadFunction entryPoint, void* data, const char* name)
         : entryPoint(entryPoint)
         , data(data)
     NewThreadContext(ThreadFunction entryPoint, void* data, const char* name)
         : entryPoint(entryPoint)
         , data(data)


@@ -49,13 +49,14 @@ static void* threadEntryPoint(void* contextData)
 {
     NewThreadContext* context = reinterpret_cast<NewThreadContext*>(contextData);
 
 {
     NewThreadContext* context = reinterpret_cast<NewThreadContext*>(contextData);
 

-    setThreadNameInternal(context->name);
-
-    // Block until our creating thread has completed any extra setup work
+    // Block until our creating thread has completed any extra setup work, including
+    // establishing ThreadIdentifier.

     {
         MutexLocker locker(context->creationMutex);
     }
 
     {
         MutexLocker locker(context->creationMutex);
     }
 

+    initializeCurrentThreadInternal(context->name);
+

     // Grab the info that we need out of the context, then deallocate it.
     ThreadFunction entryPoint = context->entryPoint;
     void* data = context->data;
     // Grab the info that we need out of the context, then deallocate it.
     ThreadFunction entryPoint = context->entryPoint;
     void* data = context->data;


@@ -75,7 +76,7 @@ ThreadIdentifier createThread(ThreadFunction entryPoint, void* data, const char*
 
     NewThreadContext* context = new NewThreadContext(entryPoint, data, name);
 
 
     NewThreadContext* context = new NewThreadContext(entryPoint, data, name);
 

-    // Prevent the thread body from executing until we've established the thread identifier
+    // Prevent the thread body from executing until we've established the thread identifier.

     MutexLocker locker(context->creationMutex);
 
     return createThreadInternal(threadEntryPoint, context, name);
     MutexLocker locker(context->creationMutex);
 
     return createThreadInternal(threadEntryPoint, context, name);