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

Timestamp:

Feb 4, 2006, 3:29:43 PM (19 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Hyatt.

• change JavaScript collector statistics calls to use HashCountedSet instead of CFSet; other misc cleanup ​http://bugzilla.opendarwin.org/show_bug.cgi?id=7072

• kjs/collector.cpp: (KJS::Collector::numProtectedObjects): renamed from numReferencedObjects (KJS::typeName): (KJS::Collector::rootObjectTypeCounts): renamed from rootObjectClasses, use HashSet
• kjs/collector.h: (KJS::Collector::isOutOfMemory): Renamed from outOfMemory.
• kjs/nodes.cpp:

WebCore:

Reviewed by Hyatt.

• change JavaScript collector statistics calls to use HashCountedSet instead of CFSet; other misc cleanup ​http://bugzilla.opendarwin.org/show_bug.cgi?id=7072

• kwq/WebCoreJavaScript.h:
• kwq/WebCoreJavaScript.mm: (+[WebCoreJavaScript protectedObjectCount]): Renamed from referencedObjectCounts (+[WebCoreJavaScript rootObjectTypeCounts]): Renamed from rootObjectClasses, changed from NSSet to NSCountedSet.

WebKit:

Reviewed by Hyatt.

• change JavaScript collector statistics calls to use HashCountedSet instead of CFSet; other misc cleanup ​http://bugzilla.opendarwin.org/show_bug.cgi?id=7072

• Misc.subproj/WebCoreStatistics.h:
• Misc.subproj/WebCoreStatistics.m: (+[WebCoreStatistics javaScriptProtectedObjectsCount]): new (+[WebCoreStatistics javaScriptRootObjecTypeCounts]): new (+[WebCoreStatistics javaScriptRootObjectClasses]): deprecated (+[WebCoreStatistics javaScriptReferencedObjectsCount]): deprecated (+[WebCoreStatistics javaScriptNoGCAllowedObjectsCount]): Just return 0. Deprecated.

File:

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

trunk/JavaScriptCore/kjs/collector.cpp

@@ -1 @@
-// -*- c-basic-offset: 2 -*-
+// -*- mode: c++; c-basic-offset: 4 -*-
 /*
  *  This file is part of the KDE libraries
@@ -35 +35 @@
 #if __APPLE__
 
-#include <CoreFoundation/CoreFoundation.h>
 #include <pthread.h>
 #include <mach/mach_port.h>
@@ -597 +596 @@
 }
 
-size_t Collector::numGCNotAllowedObjects()
-{
-  return 0;
-}
-
-size_t Collector::numReferencedObjects()
+size_t Collector::numProtectedObjects()
 {
   return protectedValues().size();
 }
 
-#if __APPLE__
-
-static const char *className(JSCell *val)
+static const char *typeName(JSCell *val)
 {
   const char *name = "???";
@@ -642 +634 @@
 }
 
-const void *Collector::rootObjectClasses()
-{
-  // FIXME: this should be a HashSet (or maybe even CountedHashSet)
-  CFMutableSetRef classes = CFSetCreateMutable(NULL, 0, &kCFTypeSetCallBacks);
-
-  ProtectCounts& pv = protectedValues();
-  ProtectCounts::iterator end = pv.end();
-  for (ProtectCounts::iterator it = pv.begin(); it != end; ++it) {
-    JSCell *val = it->first;
-    CFStringRef name = CFStringCreateWithCString(NULL, className(val), kCFStringEncodingASCII);
-    CFSetAddValue(classes, name);
-    CFRelease(name);
-  }
-
-  return classes;
-}
-
-#endif
+HashCountedSet<const char*>* Collector::rootObjectTypeCounts()
+{
+    HashCountedSet<const char*>* counts = new HashCountedSet<const char*>;
+
+    ProtectCounts& pv = protectedValues();
+    ProtectCounts::iterator end = pv.end();
+    for (ProtectCounts::iterator it = pv.begin(); it != end; ++it)
+        counts->add(typeName(it->first));
+
+    return counts;
+}
 
 } // namespace KJS