Bugfixes (in-heap check, reclaim, ...) and additional analytical code

diff --git a/mm/allocator2.c b/mm/allocator2.c
index c7e83d45f9841175c461e724ce78a7b291c2400b..f760b33018a8b6844b263d47e8b0222cafbdc466 100644 (file)
--- a/mm/allocator2.c
+++ b/mm/allocator2.c
@@ -6,7 +6,7 @@
  *
  * Authors: Philipp Tomsich     EMAIL: cacao@complang.tuwien.ac.at
  *
- * $Id: allocator2.c 105 1998-12-10 17:48:53Z phil $
+ * $Id: allocator2.c 106 1998-12-11 02:03:33Z phil $
  */
 
 #include "allocator.h"
@@ -259,7 +259,7 @@ allocator_init()
 {
 #if 0
        fprintf(stderr, 
-                       "allocator_init: $Id: allocator2.c 105 1998-12-10 17:48:53Z phil $\n\n");
+                       "allocator_init: $Id: allocator2.c 106 1998-12-11 02:03:33Z phil $\n\n");
        
        fprintf(stderr, "\t%d bit addresses\n", ADDRESS);
        fprintf(stderr, "\t%d bit alignment\n", ALIGN);
@@ -507,7 +507,7 @@ allocator_dump_to_file(FILE* file)
                }
 
                if (count)
-                       fprintf(file, "%d bytes\t%d\n", i * (1 << ALIGN), count);
+                       fprintf(file, "%d\t%d\n", i * (1 << ALIGN), count);
        }
        for (i = 0; i < LARGE << SUBBIT; ++i) {
                int                     count = 0;
@@ -519,7 +519,7 @@ allocator_dump_to_file(FILE* file)
                                count++;
                        } else {
                                if (count)
-                                       fprintf(file, "%d bytes\t%d\n", size, count);
+                                       fprintf(file, "%d\t%d\n", size, count);
                                size = chunk->size;
                                count = 1;
                        }
@@ -558,6 +558,7 @@ void allocator_mark_free_kludge(BITBLOCK* bitmap)
 }
 
 
+
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where

diff --git a/mm/heap2.c b/mm/heap2.c
index fde1e3ceae126f1e1462fe1275651bd4e3a235a1..7b2dc4edca14429785964ca63f55ac53468943ac 100644 (file)
--- a/mm/heap2.c
+++ b/mm/heap2.c
@@ -20,6 +20,24 @@
 #undef ALIGN
 #undef OFFSET
 
+#define HEURISTIC_SEL    0
+#define HEURISTIC_PARAM  2UL
+
+
+#define next_collection_heuristic_init()   \
+             (void*)((long)heap_top + (((long)heap_limit - (long)heap_top) >> 4))
+
+#if HEURISTIC_SEL == 0
+#define next_collection_heuristic()   \
+             (void*)((long)heap_top + (((long)heap_limit - (long)heap_top) >> HEURISTIC_PARAM))
+#elif HEURISTIC_SEL == 1
+#define next_collection_heuristic()   \
+             (void*)((long)heap_top + (((long)heap_top - (long)heap_base) << HEURISTIC_PARAM))
+#elif HEURISTIC_SEL == 2
+#define next_collection_heuristic()   \
+             (void*)((long)heap_top + HEURISTIC_PARAM)  
+#endif
+
 //#define PSEUDO_GENERATIONAL
 //#define COLLECT_LIFESPAN
 //#define NEW_COLLECT_LIFESPAN
@@ -159,7 +177,7 @@ heap_init (SIZE size,
        /* 6. calculate a useful first collection limit */
        /* This is extremly primitive at this point... 
           we should replace it with something more useful -- phil. */
-       heap_next_collection = (void*)((long)heap_base + (heap_size / 4));
+       heap_next_collection = next_collection_heuristic_init();
 
        /* 7. Init the global reference lists & finalizer addresses */
        references = NULL;
@@ -399,13 +417,13 @@ heap_allocate (SIZE                 in_length,
        }
 
  success:
-       /* 3.a. mark all necessary bits, store the finalizer & return the newly allocate block */
+       /* 3.a. mark all necessary bits, store the finalizer & return the newly allocated block */
 
        /* I don't mark the object-start anymore, as it always is at the beginning of a free-block,
           which already is marked (Note: The first free-block gets marked in heap_init). -- phil. */
        bitmap_setbit(start_bits, free_chunk); /* mark the new object */
 
-#if 1 /* FIXME: will become unecessary soon */
+#ifndef SIZE_FROM_CLASSINFO
        bitmap_setbit(start_bits, (void*)((long)free_chunk + (long)length)); /* mark the freespace behind the new object */
 #endif
 
@@ -487,7 +505,8 @@ void gc_reclaim (void)
 {
 #ifdef PSEUDO_GENERATIONAL
        static void*  generation_start = 0;
-       staitc int    generation_num = 0;
+       static int    generation_num = 0;
+       void* addr = heap_base;
 #endif
        void* free_start;
        void* free_end = heap_base;
@@ -500,13 +519,26 @@ void gc_reclaim (void)
 #endif
 
 #ifdef PSEUDO_GENERATIONAL
-       if (!generation_start || !(generation_start % 5))
+       if (!generation_start || !(generation_num % 5))
                generation_start = heap_base;
+
+       ++generation_num;
 #endif
 
        /* 1. reset the freelists */
 
-#if 1
+#if 0
+       allocator_mark_free_kludge(start_bits); /* this line will be kicked out, when
+                                                                                          the SIZE_FROM_CLASSINFO reclaim
+                                                                                          is implemented (very soon!!) */
+#endif
+
+#ifdef PSEUDO_GENERATIONAL
+       for (addr = heap_base; addr <= generation_start; ++addr) {
+               if (bitmap_testbit(start_bits, addr))
+                       bitmap_setbit(mark_bits, addr);
+       }
+
        allocator_mark_free_kludge(start_bits); /* this line will be kicked out, when
                                                                                           the SIZE_FROM_CLASSINFO reclaim
                                                                                           is implemented (very soon!!) */
@@ -585,24 +617,35 @@ void gc_reclaim (void)
 #endif
        }
 
+#if 0
        if (heap_top < heap_limit)
                bitmap_setbit(start_bits, heap_top);
+#endif
 
        /* 3.4. emit fragmentation info */
 #ifdef COLLECT_FRAGMENTATION
-       fprintf(fragfile, 
-                       "%ld\t%ld\t%ld\t%ld\n", 
-                       (unsigned long)heap_top - (unsigned long)heap_base, 
-                       (unsigned long)heap_top - (unsigned long)heap_base - free_size,
-                       free_size, 
-                       free_fragments);
+       {
+               unsigned long heap_full = (unsigned long)heap_top - (unsigned long)heap_base;
+               unsigned long heap_life = (unsigned long)heap_top - (unsigned long)heap_base - free_size;
+
+               fprintf(fragfile, 
+                               "%ld\t%ld\t%ld\t%ld\t%f\t%f\t%f\n", 
+                               heap_full,
+                               heap_life,
+                               free_size, 
+                               free_fragments,
+                               100*(float)free_size/free_fragments,
+                               100*(float)heap_life/heap_full,
+                               100*(float)free_size/heap_full
+                               );
+       }
        fflush(fragfile);
 
        allocator_dump_to_file(fragsizefile);
 #endif
 
        /* 4. adjust the collection threshold */
-       heap_next_collection = (void*)((long)heap_top + ((long)heap_limit - (long)heap_top) / 8);
+       heap_next_collection = next_collection_heuristic();
        if (heap_next_collection > heap_limit)
                heap_next_collection = heap_limit;
 

diff --git a/mm/lifespan.c b/mm/lifespan.c
index ed8e49d2515a529383aacc03d4b7fdbd92b6351e..a994330d4b6135543a25d59d13b4634c3a2b3a21 100644 (file)
--- a/mm/lifespan.c
+++ b/mm/lifespan.c
@@ -1,6 +1,6 @@
 /*
  * cacao/mm/lifespan.c
- * $Id: lifespan.c 105 1998-12-10 17:48:53Z phil $
+ * $Id: lifespan.c 106 1998-12-11 02:03:33Z phil $
  */
 
 #include "mm.h"
@@ -98,7 +98,7 @@ void lifespan_emit()
        /* emit summary */
        int i;
 
-       for (i = 4; i < 24; ++i)
+       for (i = 4; i < 32; ++i)
                fprintf(stderr, "%Lu-%Lu\t%Lu\n", 
                                (1LL << (i-1)), 
                                (1LL << i) - 1,
@@ -106,7 +106,7 @@ void lifespan_emit()
 
        fprintf(stderr, "\n\n\n");
 
-       for (i = 4; i < 24; ++i)
+       for (i = 4; i < 32; ++i)
                fprintf(stderr, "%Lu-%Lu\t%Lu\n", 
                                (1LL << (i-1)), 
                                (1LL << i) - 1,