Changeset 91171 in webkit

Timestamp:

Jul 17, 2011 7:58:46 PM (13 years ago)

Author:

ryuan.choi@samsung.com

Message:

[EFL] Refactor scheduleDispatchFunctionsOnMainThread to fix crash.
​https://bugs.webkit.org/show_bug.cgi?id=64337

Replace ecore_timer_add to Ecore_Pipe.
This is needed because ecore_timer should not be called in a child thread,
but in the main thread.

Reviewed by Antonio Gomes.

• wtf/efl/MainThreadEfl.cpp:

(WTF::pipeObject):
(WTF::monitorDispatchFunctions):
(WTF::initializeMainThreadPlatform):
(WTF::scheduleDispatchFunctionsOnMainThread):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/efl/MainThreadEfl.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-07-17  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [EFL] Refactor scheduleDispatchFunctionsOnMainThread to fix crash.
+        https://bugs.webkit.org/show_bug.cgi?id=64337
+
+        Replace ecore_timer_add to Ecore_Pipe.
+        This is needed because ecore_timer should not be called in a child thread,
+        but in the main thread.
+
+        Reviewed by Antonio Gomes.
+
+        * wtf/efl/MainThreadEfl.cpp:
+        (WTF::pipeObject):
+        (WTF::monitorDispatchFunctions):
+        (WTF::initializeMainThreadPlatform):
+        (WTF::scheduleDispatchFunctionsOnMainThread):
+
 2011-07-17  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/wtf/efl/MainThreadEfl.cpp

@@ -36 +36 @@
 
 #include <Ecore.h>
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
+#include <wtf/StdLibExtras.h>
 
 namespace WTF {
 
+static OwnPtr<Ecore_Pipe>& pipeObject()
+{
+    DEFINE_STATIC_LOCAL(OwnPtr<Ecore_Pipe>, pipeObject, ());
+    return pipeObject;
+}
+
+static void monitorDispatchFunctions(void*, void*, unsigned int)
+{
+    dispatchFunctionsFromMainThread();
+}
+
 void initializeMainThreadPlatform()
 {
-}
-
-static Eina_Bool timeoutFired(void*)
-{
-    dispatchFunctionsFromMainThread();
-    return ECORE_CALLBACK_CANCEL;
+    pipeObject() = adoptPtr(ecore_pipe_add(monitorDispatchFunctions, 0));
 }
 
 void scheduleDispatchFunctionsOnMainThread()
 {
-    ecore_timer_add(0, timeoutFired, 0);
+    ecore_pipe_write(pipeObject().get(), "", 0);
 }
 
-
 }