Changeset 43392 in webkit for trunk/JavaScriptCore/wtf/ThreadingPthreads.cpp

Timestamp:

May 7, 2009, 11:47:19 PM (16 years ago)

Author:

[email protected]

Message:

Fix <​https://bugs.webkit.org/show_bug.cgi?id=25640>.
Bug 25640: Crash on quit in r43384 nightly build on Leopard w/ Safari 4 beta installed

Rubber-stamped by Oliver Hunt.

Roll out r43366 as it removed symbols that Safari 4 Beta uses.

File:

• trunk/JavaScriptCore/wtf/ThreadingPthreads.cpp (modified) (7 diffs)

trunk/JavaScriptCore/wtf/ThreadingPthreads.cpp

@@ -49 +49 @@
 namespace WTF {
 
-bool ThreadIdentifier::operator==(const ThreadIdentifier& another) const
-{
-    return pthread_equal(m_platformId, another.m_platformId);
-}
-
-bool ThreadIdentifier::operator!=(const ThreadIdentifier& another) const
-{
-    return !pthread_equal(m_platformId, another.m_platformId);
-}
+typedef HashMap<ThreadIdentifier, pthread_t> ThreadMap;
 
 static Mutex* atomicallyInitializedStaticMutex;
@@ -65 +57 @@
 #endif
 
+static Mutex& threadMapMutex()
+{
+    DEFINE_STATIC_LOCAL(Mutex, mutex, ());
+    return mutex;
+}
+
 void initializeThreading()
 {
     if (!atomicallyInitializedStaticMutex) {
         atomicallyInitializedStaticMutex = new Mutex;
+        threadMapMutex();
         initializeRandomNumberGenerator();
 #if !PLATFORM(DARWIN) || PLATFORM(CHROMIUM)
@@ -86 +85 @@
 {
     atomicallyInitializedStaticMutex->unlock();
+}
+
+static ThreadMap& threadMap()
+{
+    DEFINE_STATIC_LOCAL(ThreadMap, map, ());
+    return map;
+}
+
+static ThreadIdentifier identifierByPthreadHandle(const pthread_t& pthreadHandle)
+{
+    MutexLocker locker(threadMapMutex());
+
+    ThreadMap::iterator i = threadMap().begin();
+    for (; i != threadMap().end(); ++i) {
+        if (pthread_equal(i->second, pthreadHandle))
+            return i->first;
+    }
+
+    return 0;
+}
+
+static ThreadIdentifier establishIdentifierForPthreadHandle(pthread_t& pthreadHandle)
+{
+    ASSERT(!identifierByPthreadHandle(pthreadHandle));
+
+    MutexLocker locker(threadMapMutex());
+
+    static ThreadIdentifier identifierCount = 1;
+
+    threadMap().add(identifierCount, pthreadHandle);
+    
+    return identifierCount++;
+}
+
+static pthread_t pthreadHandleForIdentifier(ThreadIdentifier id)
+{
+    MutexLocker locker(threadMapMutex());
+    
+    return threadMap().get(id);
+}
+
+static void clearPthreadHandleForIdentifier(ThreadIdentifier id)
+{
+    MutexLocker locker(threadMapMutex());
+
+    ASSERT(threadMap().contains(id));
+    
+    threadMap().remove(id);
 }
 
@@ -118 +165 @@
     if (pthread_create(&threadHandle, 0, runThreadWithRegistration, static_cast<void*>(threadData))) {
         LOG_ERROR("Failed to create pthread at entry point %p with data %p", entryPoint, data);
-        return ThreadIdentifier();
-    }
-    return ThreadIdentifier(threadHandle);
+        return 0;
+    }
+    return establishIdentifierForPthreadHandle(threadHandle);
 }
 #else
@@ -128 +175 @@
     if (pthread_create(&threadHandle, 0, entryPoint, data)) {
         LOG_ERROR("Failed to create pthread at entry point %p with data %p", entryPoint, data);
-        return ThreadIdentifier();
-    }
-
-    return ThreadIdentifier(threadHandle);
+        return 0;
+    }
+
+    return establishIdentifierForPthreadHandle(threadHandle);
 }
 #endif
@@ -146 +193 @@
 int waitForThreadCompletion(ThreadIdentifier threadID, void** result)
 {
-    ASSERT(threadID.isValid());
-    
-    pthread_t pthreadHandle = threadID.platformId();
+    ASSERT(threadID);
+    
+    pthread_t pthreadHandle = pthreadHandleForIdentifier(threadID);
  
     int joinResult = pthread_join(pthreadHandle, result);
     if (joinResult == EDEADLK)
-        LOG_ERROR("ThreadIdentifier %p was found to be deadlocked trying to quit", pthreadHandle);
+        LOG_ERROR("ThreadIdentifier %u was found to be deadlocked trying to quit", threadID);
         
+    clearPthreadHandleForIdentifier(threadID);
     return joinResult;
 }
@@ -159 +207 @@
 void detachThread(ThreadIdentifier threadID)
 {
-    ASSERT(threadID.isValid());
-    
-    pthread_t pthreadHandle = threadID.platformId();
+    ASSERT(threadID);
+    
+    pthread_t pthreadHandle = pthreadHandleForIdentifier(threadID);
     
     pthread_detach(pthreadHandle);
+    
+    clearPthreadHandleForIdentifier(threadID);
 }
 
 ThreadIdentifier currentThread()
 {
-    return ThreadIdentifier(pthread_self());
+    pthread_t currentThread = pthread_self();
+    if (ThreadIdentifier id = identifierByPthreadHandle(currentThread))
+        return id;
+    return establishIdentifierForPthreadHandle(currentThread);
 }