Changeset 43392 in webkit for trunk/JavaScriptCore/wtf/ThreadingWin.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/ThreadingWin.cpp (modified) (5 diffs)

trunk/JavaScriptCore/wtf/ThreadingWin.cpp

@@ -99 +99 @@
 namespace WTF {
 
-bool ThreadIdentifier::operator==(const ThreadIdentifier& another) const
-{
-    return m_platformId == another.m_platformId;
-}
-
-bool ThreadIdentifier::operator!=(const ThreadIdentifier& another) const
-{
-    return m_platformId != another.m_platformId;
-}
-
 // MS_VC_EXCEPTION, THREADNAME_INFO, and setThreadNameInternal all come from <http://msdn.microsoft.com/en-us/library/xcb2z8hs.aspx>.
 static const DWORD MS_VC_EXCEPTION = 0x406D1388;
@@ -150 +140 @@
 static ThreadIdentifier mainThreadIdentifier;
 
+static Mutex& threadMapMutex()
+{
+    static Mutex mutex;
+    return mutex;
+}
+
 void initializeThreading()
 {
     if (!atomicallyInitializedStaticMutex) {
         atomicallyInitializedStaticMutex = new Mutex;
+        threadMapMutex();
         initializeRandomNumberGenerator();
         initializeMainThread();
@@ -161 +158 @@
 }
 
+static HashMap<DWORD, HANDLE>& threadMap()
+{
+    static HashMap<DWORD, HANDLE> map;
+    return map;
+}
+
+static void storeThreadHandleByIdentifier(DWORD threadID, HANDLE threadHandle)
+{
+    MutexLocker locker(threadMapMutex());
+    ASSERT(!threadMap().contains(threadID));
+    threadMap().add(threadID, threadHandle);
+}
+
+static HANDLE threadHandleForIdentifier(ThreadIdentifier id)
+{
+    MutexLocker locker(threadMapMutex());
+    return threadMap().get(id);
+}
+
+static void clearThreadHandleForIdentifier(ThreadIdentifier id)
+{
+    MutexLocker locker(threadMapMutex());
+    ASSERT(threadMap().contains(id));
+    threadMap().remove(id);
+}
+
 struct ThreadFunctionInvocation {
     ThreadFunctionInvocation(ThreadFunction function, void* data) : function(function), data(data) {}
@@ -186 +209 @@
 {
     unsigned threadIdentifier = 0;
+    ThreadIdentifier threadID = 0;
     ThreadFunctionInvocation* invocation = new ThreadFunctionInvocation(entryPoint, data);
     HANDLE threadHandle = reinterpret_cast<HANDLE>(_beginthreadex(0, 0, wtfThreadEntryPoint, invocation, 0, &threadIdentifier));
     if (!threadHandle) {
         LOG_ERROR("Failed to create thread at entry point %p with data %p: %ld", entryPoint, data, errno);
-        return ThreadIdentifier();
-    }
-    // Closes handle only, since we don't need it. The new thread runs until it exits.
-    CloseHandle(threadHandle);
-
-    return ThreadIdentifier(threadIdentifier);
+        return 0;
+    }
+
+    threadID = static_cast<ThreadIdentifier>(threadIdentifier);
+    storeThreadHandleByIdentifier(threadIdentifier, threadHandle);
+
+    return threadID;
 }
 
 int waitForThreadCompletion(ThreadIdentifier threadID, void** result)
 {
-    ASSERT(threadID.isValid());
+    ASSERT(threadID);
     
-    unsigned threadIdentifier = threadID.platformId();
-    HANDLE threadHandle = OpenThread(SYNCHRONIZE, FALSE, threadIdentifier);
-    // If thread already exited, return immediately.
+    HANDLE threadHandle = threadHandleForIdentifier(threadID);
     if (!threadHandle)
-        return WAIT_OBJECT_0;
+        LOG_ERROR("ThreadIdentifier %u did not correspond to an active thread when trying to quit", threadID);
  
     DWORD joinResult = WaitForSingleObject(threadHandle, INFINITE);
     if (joinResult == WAIT_FAILED)
-        LOG_ERROR("ThreadIdentifier %p was found to be deadlocked trying to quit", threadHandle);
+        LOG_ERROR("ThreadIdentifier %u was found to be deadlocked trying to quit", threadID);
 
     CloseHandle(threadHandle);
+    clearThreadHandleForIdentifier(threadID);
 
     return joinResult;
 }
 
-void detachThread(ThreadIdentifier)
-{
+void detachThread(ThreadIdentifier threadID)
+{
+    ASSERT(threadID);
+    
+    HANDLE threadHandle = threadHandleForIdentifier(threadID);
+    if (threadHandle)
+        CloseHandle(threadHandle);
+    clearThreadHandleForIdentifier(threadID);
 }
 
 ThreadIdentifier currentThread()
 {
-    return ThreadIdentifier(GetCurrentThreadId());
+    return static_cast<ThreadIdentifier>(GetCurrentThreadId());
 }
 
@@ -441 +471 @@
 }
 
-// Deprecated functions. The current build of Safari 4 beta is linked with them so we need to provide
-// the implementation taking PlatformThreadIdentifier instead of ThreadIdentifier. These are not declared
-// in .h file so the next time Safari is built it will 'automatically' switch to new functions.
-// Then deprecated ones can be removed from this file and from JavaScriptCore.def and WebKit.def files.
-// In WebKit.def file, these functions are 'renamed' so their name does not have 'Deprecated' part - this
-// is to avoid having 2 functions with only different type of return value.
-void detachThreadDeprecated(PlatformThreadIdentifier)
-{
-}
-
-int waitForThreadCompletionDeprecated(PlatformThreadIdentifier threadID, void** result)
-{
-    ASSERT(threadID);
-
-    unsigned threadIdentifier = static_cast<unsigned>(threadID);
-    HANDLE threadHandle = OpenThread(SYNCHRONIZE, FALSE, threadIdentifier);
-    // If thread already exited, return immediately.
-    if (!threadHandle)
-        return WAIT_OBJECT_0;
-
-    DWORD joinResult = WaitForSingleObject(threadHandle, INFINITE);
-    if (joinResult == WAIT_FAILED)
-        LOG_ERROR("ThreadIdentifier %p was found to be deadlocked trying to quit", threadHandle);
-
-    CloseHandle(threadHandle);
-
-    return joinResult;
-}
-
-PlatformThreadIdentifier currentThreadDeprecated()
-{
-    return static_cast<PlatformThreadIdentifier>(GetCurrentThreadId());
-}
-
-PlatformThreadIdentifier createThreadDeprecated(ThreadFunction entryPoint, void* data, const char* name)
-{
-    ThreadIdentifier threadID = createThread(entryPoint, data, name);
-    return static_cast<PlatformThreadIdentifier>(threadID.platformId());
-}
-
 } // namespace WTF