Changeset 798 in webkit for trunk/JavaScriptCore/kjs/collector.h

Timestamp:

Mar 21, 2002, 4:31:57 PM (23 years ago)

Author:

mjs

Message:

Merged changes from LABYRINTH_KDE_3_MERGE branch.

File:

• trunk/JavaScriptCore/kjs/collector.h (modified) (5 diffs)

trunk/JavaScriptCore/kjs/collector.h

@@ +1 @@
+// -*- c-basic-offset: 2 -*-
 /*
  *  This file is part of the KDE libraries
  *  Copyright (C) 1999-2000 Harri Porten ([email protected])
+ *  Copyright (C) 2001 Peter Kelly ([email protected])
  *
  *  This library is free software; you can redistribute it and/or
@@ -16 +18 @@
  *  License along with this library; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *  $Id$
  */
 
@@ -40 +44 @@
 #include <stdlib.h>
 
+// for DEBUG_*
+#include "value.h"
+#include "object.h"
+#include "types.h"
+#include "interpreter.h"
+
 namespace KJS {
 
-  class Imp;
   class CollectorBlock;
 
@@ -66 +75 @@
      * Run the garbage collection. This involves calling the delete operator
      * on each object and freeing the used memory.
-     * In the current implemenation this will basically free all registered
-     * object regardless whether they are still references by others or not.
-     * 
      */
-    static void collect();
+    static bool collect();
     static int size() { return filled; }
+    static bool outOfMemory() { return memLimitReached; }
 
 #ifdef KJS_DEBUG_MEM
+    /** Check that nothing is left when the last interpreter gets deleted */
+    static void finalCheck();
     /**
      * @internal
@@ -84 +93 @@
     static unsigned long filled;
     static unsigned long softLimit;
+    static unsigned long timesFilled;
+    static unsigned long increaseLimitAt;
+    static bool memLimitReached;
     enum { BlockSize = 100 };
   };