Changeset 36056 in webkit for trunk/JavaScriptCore/wtf/MainThread.h

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/MainThread.h (modified) (1 diff)

trunk/JavaScriptCore/wtf/MainThread.h

@@ -33 +33 @@
 namespace WTF {
 
+class Mutex;
+
 typedef void MainThreadFunction(void*);
 
 void callOnMainThread(MainThreadFunction*, void* context);
+void callOnMainThreadAndWait(MainThreadFunction*, void* context);
+
 void setMainThreadCallbacksPaused(bool paused);
 
-#if PLATFORM(WIN)
+// Must be called from the main thread (Darwin is an exception to this rule).
 void initializeMainThread();
-#endif
 
 // These functions are internal to the callOnMainThread implementation.
 void dispatchFunctionsFromMainThread();
 void scheduleDispatchFunctionsOnMainThread();
+Mutex& mainThreadFunctionQueueMutex();
 
 } // namespace WTF