Changeset 73223 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Dec 2, 2010, 5:16:11 PM (14 years ago)

Author:

[email protected]

Message:

Fixed <rdar://problem/8310571> CrashTracer: 60 crashes in Photo Booth at
com.apple.JavaScriptCore: JSC::Heap::markRoots + 746

Reviewed by Gavin Barraclough.

• API/APIShims.h:

(JSC::APIEntryShimWithoutLock::APIEntryShimWithoutLock): Call our new
synchronize() function.

• runtime/Collector.cpp:

(JSC::Heap::activityCallback):

• runtime/Collector.h: Added an activityCallback() accessor, for the

call above.

• runtime/GCActivityCallback.h:

(JSC::GCActivityCallback::synchronize):

• runtime/GCActivityCallbackCF.cpp:

(JSC::DefaultGCActivityCallback::DefaultGCActivityCallback):
(JSC::DefaultGCActivityCallback::~DefaultGCActivityCallback):
(JSC::DefaultGCActivityCallback::operator()):
(JSC::DefaultGCActivityCallback::synchronize): Track the run loop we're
scheduled in. If we begin/resume execution within a new run loop, reschedule
on it. This prevents a crash when using a lockless context group on
multiple threads -- the crash would happen if the GC timer scheduled on
thread A, then you continued execution on thread B, then the thread A
timer fired.

Location:

trunk/JavaScriptCore/runtime

Files:

• Collector.cpp (modified) (1 diff)
• Collector.h (modified) (1 diff)
• GCActivityCallback.h (modified) (2 diffs)
• GCActivityCallbackCF.cpp (modified) (3 diffs)

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -1233 +1233 @@
 }
 
+GCActivityCallback* Heap::activityCallback()
+{
+    return m_activityCallback.get();
+}
+
 } // namespace JSC

trunk/JavaScriptCore/runtime/Collector.h

@@ -99 +99 @@
         bool isBusy(); // true if an allocation or collection is in progress
         void collectAllGarbage();
+
+        GCActivityCallback* activityCallback();
         void setActivityCallback(PassOwnPtr<GCActivityCallback>);
 

trunk/JavaScriptCore/runtime/GCActivityCallback.h

@@ -41 +41 @@
     virtual ~GCActivityCallback() {}
     virtual void operator()() {}
+    virtual void synchronize() {}
 
 protected:
@@ -56 +57 @@
 
     void operator()();
+    void synchronize();
 
 private:

trunk/JavaScriptCore/runtime/GCActivityCallbackCF.cpp

@@ -48 +48 @@
 
     RetainPtr<CFRunLoopTimerRef> timer;
+    RetainPtr<CFRunLoopRef> runLoop;
     CFRunLoopTimerContext context;
 };
 
 const CFTimeInterval decade = 60 * 60 * 24 * 365 * 10;
+const CFTimeInterval triggerInterval = 2; // seconds
 
 void DefaultGCActivityCallbackPlatformData::trigger(CFRunLoopTimerRef, void *info)
@@ -66 +68 @@
     memset(&d->context, '\0', sizeof(CFRunLoopTimerContext));
     d->context.info = heap;
+    d->runLoop = CFRunLoopGetCurrent();
     d->timer.adoptCF(CFRunLoopTimerCreate(0, decade, decade, 0, 0, DefaultGCActivityCallbackPlatformData::trigger, &d->context));
-    CFRunLoopAddTimer(CFRunLoopGetCurrent(), d->timer.get(), kCFRunLoopCommonModes);
+    CFRunLoopAddTimer(d->runLoop.get(), d->timer.get(), kCFRunLoopCommonModes);
 }
 
 DefaultGCActivityCallback::~DefaultGCActivityCallback()
 {
-    CFRunLoopRemoveTimer(CFRunLoopGetCurrent(), d->timer.get(), kCFRunLoopCommonModes);
+    CFRunLoopRemoveTimer(d->runLoop.get(), d->timer.get(), kCFRunLoopCommonModes);
     CFRunLoopTimerInvalidate(d->timer.get());
     d->context.info = 0;
+    d->runLoop = 0;
     d->timer = 0;
 }
@@ -80 +84 @@
 void DefaultGCActivityCallback::operator()()
 {
-    CFRunLoopTimerSetNextFireDate(d->timer.get(), CFAbsoluteTimeGetCurrent() + 2);
+    CFRunLoopTimerSetNextFireDate(d->timer.get(), CFAbsoluteTimeGetCurrent() + triggerInterval);
+}
+
+void DefaultGCActivityCallback::synchronize()
+{
+    if (CFRunLoopGetCurrent() == d->runLoop.get())
+        return;
+    CFRunLoopRemoveTimer(d->runLoop.get(), d->timer.get(), kCFRunLoopCommonModes);
+    d->runLoop = CFRunLoopGetCurrent();
+    CFRunLoopAddTimer(d->runLoop.get(), d->timer.get(), kCFRunLoopCommonModes);
 }