Changeset 34969 in webkit for trunk/JavaScriptCore/kjs/collector.cpp

Timestamp:

Jul 2, 2008, 9:55:22 PM (17 years ago)

Author:

[email protected]

Message:

Add the ability to trace JavaScriptCore garabge collections using dtrace.

Reviewed by Sam Weinig.

• JavaScriptCore.xcodeproj/project.pbxproj: Generate the dtrace probe header

file when building on a new enough version of Mac OS X.

• JavaScriptCorePrefix.h: Add our standard Mac OS X version detection macros.
• kjs/Tracing.d: Declare three dtrace probes.
• kjs/Tracing.h: Include the generated dtrace macros if dtrace is available,

otherwise provide versions that do nothing.

• kjs/collector.cpp:

(KJS::Heap::collect): Fire dtrace probes when starting a collection, after the
mark phase has completed, and when the collection is complete.

• wtf/Platform.h: Define HAVE_DTRACE when building on a new enough version of Mac OS X.

File:

• trunk/JavaScriptCore/kjs/collector.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/collector.cpp

@@ -29 +29 @@
 #include "list.h"
 #include "Machine.h"
+#include "Tracing.h"
 #include <algorithm>
 #include <setjmp.h>
@@ -933 +934 @@
     if ((primaryHeap.operationInProgress != NoOperation) | (numberHeap.operationInProgress != NoOperation))
         abort();
-    
+
+    JAVASCRIPTCORE_GC_BEGIN();
     primaryHeap.operationInProgress = Collection;
     numberHeap.operationInProgress = Collection;
@@ -944 +946 @@
         ArgList::markLists(*m_markListSet);
 
+    JAVASCRIPTCORE_GC_MARKED();
+
     size_t originalLiveObjects = primaryHeap.numLiveObjects + numberHeap.numLiveObjects;
     size_t numLiveObjects = sweep<PrimaryHeap>();
     numLiveObjects += sweep<NumberHeap>();
-  
+
     primaryHeap.operationInProgress = NoOperation;
     numberHeap.operationInProgress = NoOperation;
+    JAVASCRIPTCORE_GC_END(originalLiveObjects, numLiveObjects);
 
     return numLiveObjects < originalLiveObjects;