Changeset 215694 in webkit for trunk/Source/JavaScriptCore/runtime/JSRunLoopTimer.cpp

Timestamp:

Apr 24, 2017, 2:11:44 PM (8 years ago)

Author:

[email protected]

Message:

ASSERTION FAILED: m_table seen with workers/wasm-hashset LayoutTests
​https://bugs.webkit.org/show_bug.cgi?id=171119
<rdar://problem/31760635>

Reviewed by Keith Miller.

The HashSet of timer set notification callbacks can be accessed
and augmented simultaneously from different threads. e.g, the worker
thread can augment it while the wasm compilation thread will
access it. Therefore, accesses must be guarded by a lock.

• runtime/JSRunLoopTimer.cpp:

(JSC::JSRunLoopTimer::scheduleTimer):
(JSC::JSRunLoopTimer::addTimerSetNotification):
(JSC::JSRunLoopTimer::removeTimerSetNotification):

• runtime/JSRunLoopTimer.h:

File:

• trunk/Source/JavaScriptCore/runtime/JSRunLoopTimer.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/runtime/JSRunLoopTimer.cpp

@@ -105 +105 @@
     CFRunLoopTimerSetNextFireDate(m_timer.get(), CFAbsoluteTimeGetCurrent() + intervalInSeconds.seconds());
     m_isScheduled = true;
+    auto locker = holdLock(m_timerCallbacksLock);
     for (auto& task : m_timerSetCallbacks)
         task->run();
@@ -143 +144 @@
     m_timer.startOneShot(intervalInSeconds);
     m_isScheduled = true;
+
+    auto locker = holdLock(m_timerCallbacksLock);
     for (auto& task : m_timerSetCallbacks)
         task->run();
@@ -157 +160 @@
 void JSRunLoopTimer::addTimerSetNotification(TimerNotificationCallback callback)
 {
+    auto locker = holdLock(m_timerCallbacksLock);
     m_timerSetCallbacks.add(callback);
 }
@@ -162 +166 @@
 void JSRunLoopTimer::removeTimerSetNotification(TimerNotificationCallback callback)
 {
+    auto locker = holdLock(m_timerCallbacksLock);
     m_timerSetCallbacks.remove(callback);
 }