[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:11:37 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 52b49436653df940aa83d687fe7846f65a5a41fd
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 9 00:11:06 2002 +0000

    	* kjs/collector.h:
    	* kjs/collector.cpp:
    	(Collector::numInterpreters):
    	(Collector::numGCNotAllowedObjects):
    	(Collector::numReferencedObjects):
    	Add three new functions so we can see a bit more about leaking JavaScriptCore.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1112 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 5c47c5a..0d31e27 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-08  Darin Adler  <darin at apple.com>
+
+	* kjs/collector.h:
+	* kjs/collector.cpp:
+	(Collector::numInterpreters):
+	(Collector::numGCNotAllowedObjects):
+	(Collector::numReferencedObjects):
+	Add three new functions so we can see a bit more about leaking JavaScriptCore.
+
 2002-05-06  Darin Adler  <darin at apple.com>
 
 	* JavaScriptCorePrefix.h: Added.
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index 5c47c5a..0d31e27 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-05-08  Darin Adler  <darin at apple.com>
+
+	* kjs/collector.h:
+	* kjs/collector.cpp:
+	(Collector::numInterpreters):
+	(Collector::numGCNotAllowedObjects):
+	(Collector::numReferencedObjects):
+	Add three new functions so we can see a bit more about leaking JavaScriptCore.
+
 2002-05-06  Darin Adler  <darin at apple.com>
 
 	* JavaScriptCorePrefix.h: Added.
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 5c47c5a..0d31e27 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-05-08  Darin Adler  <darin at apple.com>
+
+	* kjs/collector.h:
+	* kjs/collector.cpp:
+	(Collector::numInterpreters):
+	(Collector::numGCNotAllowedObjects):
+	(Collector::numReferencedObjects):
+	Add three new functions so we can see a bit more about leaking JavaScriptCore.
+
 2002-05-06  Darin Adler  <darin at apple.com>
 
 	* JavaScriptCorePrefix.h: Added.
diff --git a/JavaScriptCore/kjs/collector.cpp b/JavaScriptCore/kjs/collector.cpp
index 5633b98..e46f26e 100644
--- a/JavaScriptCore/kjs/collector.cpp
+++ b/JavaScriptCore/kjs/collector.cpp
@@ -275,3 +275,56 @@ void Collector::finalCheck()
   }
 }
 #endif
+
+#ifdef APPLE_CHANGES
+int Collector::numInterpreters()
+{
+  int count = 0;
+  if (InterpreterImp::s_hook) {
+    InterpreterImp *scr = InterpreterImp::s_hook;
+    do {
+      ++count;
+      scr = scr->next;
+    } while (scr != InterpreterImp::s_hook);
+  }
+  return count;
+}
+
+int Collector::numGCNotAllowedObjects()
+{
+  int count = 0;
+  CollectorBlock *block = root;
+  while (block) {
+    ValueImp **r = (ValueImp**)block->mem;
+    assert(r);
+    for (int i = 0; i < block->size; i++, r++)
+    {
+      ValueImp *imp = *r;
+      if (imp && (imp->_flags & ValueImp::VI_GCALLOWED) == 0) {
+        ++count;
+      }
+    }
+    block = block->next;
+  }
+  return count;
+}
+
+int Collector::numReferencedObjects()
+{
+  int count = 0;
+  CollectorBlock *block = root;
+  while (block) {
+    ValueImp **r = (ValueImp**)block->mem;
+    assert(r);
+    for (int i = 0; i < block->size; i++, r++)
+    {
+      ValueImp *imp = *r;
+      if (imp && imp->refcount) {
+        ++count;
+      }
+    }
+    block = block->next;
+  }
+  return count;
+}
+#endif
diff --git a/JavaScriptCore/kjs/collector.h b/JavaScriptCore/kjs/collector.h
index 4bf4cbb..d0649e0 100644
--- a/JavaScriptCore/kjs/collector.h
+++ b/JavaScriptCore/kjs/collector.h
@@ -88,6 +88,11 @@ namespace KJS {
      */
     static bool collecting;
 #endif
+#ifdef APPLE_CHANGES
+    static int numInterpreters();
+    static int numGCNotAllowedObjects();
+    static int numReferencedObjects();
+#endif
   private:
     static CollectorBlock* root;
     static CollectorBlock* currentBlock;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list