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

trunk/JavaScriptCore/wtf/qt/ThreadingQt.cpp

@@ -42 +42 @@
 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;
-}
-
 class ThreadPrivate : public QThread {
 public:
@@ -80 +70 @@
 static ThreadIdentifier mainThreadIdentifier;
 
+static Mutex& threadMapMutex()
+{
+    static Mutex mutex;
+    return mutex;
+}
+
+static HashMap<ThreadIdentifier, QThread*>& threadMap()
+{
+    static HashMap<ThreadIdentifier, QThread*> map;
+    return map;
+}
+
+static ThreadIdentifier identifierByQthreadHandle(QThread*& thread)
+{
+    MutexLocker locker(threadMapMutex());
+
+    HashMap<ThreadIdentifier, QThread*>::iterator i = threadMap().begin();
+    for (; i != threadMap().end(); ++i) {
+        if (i->second == thread)
+            return i->first;
+    }
+
+    return 0;
+}
+
+static ThreadIdentifier establishIdentifierForThread(QThread*& thread)
+{
+    ASSERT(!identifierByQthreadHandle(thread));
+
+    MutexLocker locker(threadMapMutex());
+
+    static ThreadIdentifier identifierCount = 1;
+
+    threadMap().add(identifierCount, thread);
+
+    return identifierCount++;
+}
+
+static void clearThreadForIdentifier(ThreadIdentifier id)
+{
+    MutexLocker locker(threadMapMutex());
+
+    ASSERT(threadMap().contains(id));
+
+    threadMap().remove(id);
+}
+
+static QThread* threadForIdentifier(ThreadIdentifier id)
+{
+    MutexLocker locker(threadMapMutex());
+
+    return threadMap().get(id);
+}
+
 void initializeThreading()
 {
     if (!atomicallyInitializedStaticMutex) {
         atomicallyInitializedStaticMutex = new Mutex;
+        threadMapMutex();
         initializeRandomNumberGenerator();
-        mainThreadIdentifier = ThreadIdentifier(QCoreApplication::instance()->thread());
+        QThread* mainThread = QCoreApplication::instance()->thread();
+        mainThreadIdentifier = identifierByQthreadHandle(mainThread);
+        if (!mainThreadIdentifier)
+            mainThreadIdentifier = establishIdentifierForThread(mainThread);
         initializeMainThread();
     }
@@ -106 +154 @@
     if (!thread) {
         LOG_ERROR("Failed to create thread at entry point %p with data %p", entryPoint, data);
-        return ThreadIdentifier();
+        return 0;
     }
     thread->start();
@@ -112 +160 @@
     QThread* threadRef = static_cast<QThread*>(thread);
 
-    return ThreadIdentifier(threadRef);
+    return establishIdentifierForThread(threadRef);
 }
 
@@ -121 +169 @@
 int waitForThreadCompletion(ThreadIdentifier threadID, void** result)
 {
-    ASSERT(threadID.IsValid());
-
-    QThread* thread = threadID.platformId();
+    ASSERT(threadID);
+
+    QThread* thread = threadForIdentifier(threadID);
 
     bool res = thread->wait();
 
+    clearThreadForIdentifier(threadID);
     if (result)
         *result = static_cast<ThreadPrivate*>(thread)->getReturnValue();
@@ -139 +188 @@
 ThreadIdentifier currentThread()
 {
-    return ThreadIdentifier(QThread::currentThread());
+    QThread* currentThread = QThread::currentThread();
+    if (ThreadIdentifier id = identifierByQthreadHandle(currentThread))
+        return id;
+    return establishIdentifierForThread(currentThread);
 }