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

Timestamp:

Nov 20, 2002, 1:12:14 PM (23 years ago)

Author:

darin

Message:

• decrease ref/deref -- 5% speedup in iBench

• JavaScriptCore.pbproj/project.pbxproj: Added array_instance.h
• kjs/array_instance.h: Added so it can be shared by function.h.

• kjs/array_object.cpp:
• kjs/array_object.h:
• kjs/bool_object.cpp:
• kjs/bool_object.h:
• kjs/collector.cpp:
• kjs/date_object.cpp:
• kjs/date_object.h:
• kjs/error_object.cpp:
• kjs/function.cpp:
• kjs/function.h:
• kjs/function_object.cpp:
• kjs/internal.cpp:
• kjs/internal.h:
• kjs/math_object.cpp:
• kjs/nodes.cpp:
• kjs/number_object.cpp:
• kjs/object.cpp:
• kjs/object.h:
• kjs/object_object.cpp:
• kjs/property_map.cpp:
• kjs/reference.cpp:
• kjs/reference.h:
• kjs/regexp_object.cpp:
• kjs/string_object.cpp:
• kjs/string_object.h:
• kjs/value.cpp:
• kjs/value.h: Switched lots of interfaces so they don't require ref/deref.

File:

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

trunk/JavaScriptCore/kjs/collector.cpp

@@ -100 +100 @@
     heap.oversizeCells[heap.usedOversizeCells] = (CollectorCell *)newCell;
     heap.usedOversizeCells++;
+    heap.numLiveObjects++;
     
     return (void *)newCell;
@@ -141 +142 @@
           targetBlock->bitmap[wordInBitmap] |= (1 << bitInWord);
           targetBlock->usedCells++;
+          heap.numLiveObjects++;
           return (void *)(targetBlock->cells + cellPos);
         }
@@ -293 +295 @@
 
 #if APPLE_CHANGES
+
 int Collector::numInterpreters()
 {
@@ -343 +346 @@
         
         if ((word & (1 << bitInWord)) &&
-            imp->refcount == 0) {
+            imp->refcount != 0) {
           ++count;
         }
@@ -352 +355 @@
   for (int cell = 0; cell < heap.usedOversizeCells; cell++) {
     ValueImp *imp = (ValueImp *)heap.oversizeCells[cell];
-      if (imp->refcount == 0) {
+      if (imp->refcount != 0) {
         ++count;
       }
@@ -360 +363 @@
 }
 
+// FIXME: Rename. Root object classes are more useful than live object classes.
 CFSetRef Collector::liveObjectClasses()
 {
@@ -370 +374 @@
         ValueImp *imp = (ValueImp *)(heap.blocks[block]->cells + BITS_PER_WORD * wordInBitmap + bitInWord);
         
-        if (word & (1 << bitInWord)) {
+        if (word & (1 << bitInWord)
+                && ((imp->_flags & ValueImp::VI_GCALLOWED) == 0 || imp->refcount != 0)) {
           const char *mangled_name = typeid(*imp).name();
           int status;
@@ -386 +391 @@
   for (int cell = 0; cell < heap.usedOversizeCells; cell++) {
     ValueImp *imp = (ValueImp *)heap.oversizeCells[cell];
-
-    const char *mangled_name = typeid(*imp).name();
-    int status;
-    char *demangled_name = __cxxabiv1::__cxa_demangle (mangled_name, NULL, NULL, &status);
-    
-    CFStringRef className = CFStringCreateWithCString(NULL, demangled_name, kCFStringEncodingASCII);
-    free(demangled_name);
-    CFSetAddValue(classes, className);
-    CFRelease(className);
+    
+    if ((imp->_flags & ValueImp::VI_GCALLOWED) == 0 || imp->refcount != 0) {
+        const char *mangled_name = typeid(*imp).name();
+        int status;
+        char *demangled_name = __cxxabiv1::__cxa_demangle (mangled_name, NULL, NULL, &status);
+        
+        CFStringRef className = CFStringCreateWithCString(NULL, demangled_name, kCFStringEncodingASCII);
+        free(demangled_name);
+        CFSetAddValue(classes, className);
+        CFRelease(className);
+    }
   }
 
@@ -400 +407 @@
 }
 
-#endif
+#endif // APPLE_CHANGES