Changeset 214936 in webkit

Timestamp:

Apr 5, 2017 12:58:02 AM (7 years ago)

Author:

Carlos Garcia Campos

Message:

Implement PromiseDeferredTimer for non CF based ports
​https://bugs.webkit.org/show_bug.cgi?id=170391

Reviewed by Yusuke Suzuki.

RunLoop handling is only implemented for CF causing several wasm tests to fail for other ports.

• jsc.cpp:

(runJSC): Remove CF ifdefs.

• runtime/PromiseDeferredTimer.cpp:

(JSC::PromiseDeferredTimer::doWork): Add non CF implementation using WTF RunLoop.
(JSC::PromiseDeferredTimer::runRunLoop): Ditto.

• runtime/PromiseDeferredTimer.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jsc.cpp (modified) (1 diff)
• runtime/PromiseDeferredTimer.cpp (modified) (2 diffs)
• runtime/PromiseDeferredTimer.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-04-05  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Implement PromiseDeferredTimer for non CF based ports
+        https://bugs.webkit.org/show_bug.cgi?id=170391
+
+        Reviewed by Yusuke Suzuki.
+
+        RunLoop handling is only implemented for CF causing several wasm tests to fail for other ports.
+
+        * jsc.cpp:
+        (runJSC): Remove CF ifdefs.
+        * runtime/PromiseDeferredTimer.cpp:
+        (JSC::PromiseDeferredTimer::doWork): Add non CF implementation using WTF RunLoop.
+        (JSC::PromiseDeferredTimer::runRunLoop): Ditto.
+        * runtime/PromiseDeferredTimer.h:
+
 2017-04-05  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -3813 +3813 @@
         vm.drainMicrotasks();
     }
-#if USE(CF)
     vm.promiseDeferredTimer->runRunLoop();
-#endif
 
     result = success && (asyncTestExpectedPasses == asyncTestPasses) ? 0 : 3;

trunk/Source/JavaScriptCore/runtime/PromiseDeferredTimer.cpp

@@ -30 +30 @@
 #include "StrongInlines.h"
 #include "VM.h"
-
 #include <wtf/Locker.h>
+#include <wtf/RunLoop.h>
 
 namespace JSC {
@@ -69 +69 @@
     }
 
+    if (m_pendingPromises.isEmpty() && m_shouldStopRunLoopWhenAllPromisesFinish)
 #if USE(CF)
-    if (m_pendingPromises.isEmpty() && m_shouldStopRunLoopWhenAllPromisesFinish)
         CFRunLoopStop(m_runLoop.get());
+#else
+        RunLoop::current().stop();
 #endif
 }
 
-#if USE(CF)
 void PromiseDeferredTimer::runRunLoop()
 {
     ASSERT(!m_vm->currentThreadIsHoldingAPILock());
+#if USE(CF)
     ASSERT(CFRunLoopGetCurrent() == m_runLoop.get());
+#endif
     m_shouldStopRunLoopWhenAllPromisesFinish = true;
     if (m_pendingPromises.size())
+#if USE(CF)
         CFRunLoopRun();
+#else
+        RunLoop::run();
+#endif
 }
-#endif
 
 void PromiseDeferredTimer::addPendingPromise(JSPromiseDeferred* ticket, Vector<Strong<JSCell>>&& dependencies)

trunk/Source/JavaScriptCore/runtime/PromiseDeferredTimer.h

@@ -62 +62 @@
 
     void stopRunningTasks() { m_runTasks = false; }
-#if USE(CF)
+
     JS_EXPORT_PRIVATE void runRunLoop();
-#endif
 
 private:
@@ -70 +69 @@
     Lock m_taskLock;
     bool m_runTasks { true };
-#if USE(CF)
     bool m_shouldStopRunLoopWhenAllPromisesFinish { false };
-#endif
     Vector<std::tuple<JSPromiseDeferred*, Task>> m_tasks;
     HashMap<JSPromiseDeferred*, Vector<Task>> m_blockedTasks;