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

trunk/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp

@@ -43 +43 @@
 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;
-}
-
 static Mutex* atomicallyInitializedStaticMutex;
 
 static ThreadIdentifier mainThreadIdentifier;
+
+static Mutex& threadMapMutex()
+{
+    static Mutex mutex;
+    return mutex;
+}
 
 void initializeThreading()
@@ -65 +61 @@
     if (!atomicallyInitializedStaticMutex) {
         atomicallyInitializedStaticMutex = new Mutex;
+        threadMapMutex();
         initializeRandomNumberGenerator();
         mainThreadIdentifier = currentThread();
@@ -82 +79 @@
 }
 
+static HashMap<ThreadIdentifier, GThread*>& threadMap()
+{
+    static HashMap<ThreadIdentifier, GThread*> map;
+    return map;
+}
+
+static ThreadIdentifier identifierByGthreadHandle(GThread*& thread)
+{
+    MutexLocker locker(threadMapMutex());
+
+    HashMap<ThreadIdentifier, GThread*>::iterator i = threadMap().begin();
+    for (; i != threadMap().end(); ++i) {
+        if (i->second == thread)
+            return i->first;
+    }
+
+    return 0;
+}
+
+static ThreadIdentifier establishIdentifierForThread(GThread*& thread)
+{
+    ASSERT(!identifierByGthreadHandle(thread));
+
+    MutexLocker locker(threadMapMutex());
+
+    static ThreadIdentifier identifierCount = 1;
+
+    threadMap().add(identifierCount, thread);
+
+    return identifierCount++;
+}
+
+static GThread* threadForIdentifier(ThreadIdentifier id)
+{
+    MutexLocker locker(threadMapMutex());
+
+    return threadMap().get(id);
+}
+
+static void clearThreadForIdentifier(ThreadIdentifier id)
+{
+    MutexLocker locker(threadMapMutex());
+
+    ASSERT(threadMap().contains(id));
+
+    threadMap().remove(id);
+}
+
 ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char*)
 {
@@ -87 +132 @@
     if (!(thread = g_thread_create(entryPoint, data, TRUE, 0))) {
         LOG_ERROR("Failed to create thread at entry point %p with data %p", entryPoint, data);
-        return ThreadIdentifier();
-    }
-
-    return ThreadIdentifier(thread);
+        return 0;
+    }
+
+    ThreadIdentifier threadID = establishIdentifierForThread(thread);
+    return threadID;
 }
 
@@ -99 +145 @@
 int waitForThreadCompletion(ThreadIdentifier threadID, void** result)
 {
-    ASSERT(threadID.isValid());
-
-    GThread* thread = threadID.platformId();
+    ASSERT(threadID);
+
+    GThread* thread = threadForIdentifier(threadID);
 
     void* joinResult = g_thread_join(thread);
@@ -107 +153 @@
         *result = joinResult;
 
+    clearThreadForIdentifier(threadID);
     return 0;
 }
@@ -116 +163 @@
 ThreadIdentifier currentThread()
 {
-    return ThreadIdentifier(g_thread_self());
+    GThread* currentThread = g_thread_self();
+    if (ThreadIdentifier id = identifierByGthreadHandle(currentThread))
+        return id;
+    return establishIdentifierForThread(currentThread);
 }