Changeset 24874 in webkit for trunk/JavaScriptCore/API/JSBase.cpp

Timestamp:

Aug 5, 2007, 3:16:41 AM (18 years ago)

Author:

darin

Message:

Reviewed by Maciej.

• fix <rdar://problem/5371862> crash in Dashcode due to Quartz Composer JavaScript garbage collector reentrancy

• API/JSBase.cpp: (JSGarbageCollect): Don't call collector() if isBusy() returns true.

• kjs/collector.h: Added isBusy(), removed the unused return value from collect()
• kjs/collector.cpp: Added an "operation in progress" flag to the allocator. (KJS::Collector::allocate): Call abort() if an operation is already in progress. Set the new flag instead of using the debug-only GCLock. (KJS::Collector::collect): Ditto. (KJS::Collector::isBusy): Added.

File:

• trunk/JavaScriptCore/API/JSBase.cpp (modified) (2 diffs)

trunk/JavaScriptCore/API/JSBase.cpp

@@ -1 +1 @@
 // -*- mode: c++; c-basic-offset: 4 -*-
 /*
- * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -80 +80 @@
 {
     JSLock lock;
-    Collector::collect();
+    if (!Collector::isBusy())
+        Collector::collect();
+    // FIXME: Perhaps we should trigger a second mark and sweep
+    // once the garbage collector is done if this is called when
+    // the collector is busy.
 }