Changeset 36056 in webkit for trunk/JavaScriptCore/wtf/ThreadingQt.cpp

Timestamp:

Sep 3, 2008, 9:37:00 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin Adler.

Implement callOnMainThreadAndWait().

This will be useful when a background thread needs to perform UI calls synchronously
(e.g. an openDatabase() call cannot return until the user answers to a confirmation dialog).

• wtf/MainThread.cpp: (WTF::FunctionWithContext::FunctionWithContext): Added a ThreadCondition member. When non-zero, the condition is signalled after the function is called. (WTF::mainThreadFunctionQueueMutex): Renamed from functionQueueMutex, sinc this is no longer static. Changed to be initialized from initializeThreading() to avoid lock contention. (WTF::initializeMainThread): On non-Windows platforms, just call mainThreadFunctionQueueMutex. (WTF::dispatchFunctionsFromMainThread): Signal synchronous calls when done. (WTF::callOnMainThread): Updated for functionQueueMutex rename. (WTF::callOnMainThreadAndWait): Added.

• wtf/MainThread.h: Added callOnMainThreadAndWait(); initializeMainThread() now exists on all platforms.

• wtf/win/MainThreadWin.cpp: (WTF::initializeMainThread): Added a callOnMainThreadAndWait() call to initialize function queue mutex.

• wtf/ThreadingGtk.cpp: (WTF::initializeThreading):
• wtf/ThreadingPthreads.cpp: (WTF::initializeThreading):
• wtf/ThreadingQt.cpp: (WTF::initializeThreading): Only initialize mainThreadIdentifier on non-Darwin platforms. It was not guaranteed to be accurate on Darwin.

File:

• trunk/JavaScriptCore/wtf/ThreadingQt.cpp (modified) (3 diffs)

trunk/JavaScriptCore/wtf/ThreadingQt.cpp

@@ -30 +30 @@
 #include "Threading.h"
 
-#include <wtf/HashMap.h>
-#include <wtf/MathExtras.h>
+#include "HashMap.h"
+#include "MainThread.h"
+#include "MathExtras.h"
 
 #include <QMutex>
@@ -65 +66 @@
 Mutex* atomicallyInitializedStaticMutex;
 
+#if !PLATFORM(DARWIN)
 static ThreadIdentifier mainThreadIdentifier;
+#endif
 
 static Mutex& threadMapMutex()
@@ -125 +128 @@
         threadMapMutex();
         wtf_random_init();
+#if !PLATFORM(DARWIN)
         mainThreadIdentifier = currentThread();
+#endif
+        initializeMainThread();
     }
 }