added collection of fragmentation data

[cacao.git] / mm / heap.old.c

diff --git a/mm/heap.old.c b/mm/heap.old.c
index 478e40b2244010bc4f9f85e1024f9b1d032816b6..dd1feacb97e41ca2b6cf2a9a9cb109af04681ae9 100644 (file)
--- a/mm/heap.old.c
+++ b/mm/heap.old.c
@@ -29,6 +29,7 @@
 
 #include "../threads/thread.h"                  /* schani */
 #include "../threads/locks.h"
+#include "../sysdep/threads.h"
 
 
 
@@ -419,6 +420,7 @@ static void mark (heapblock *obj)
        if ( isbitclear(startbits, blocknum) ) return;
        if ( isbitset(markbits, blocknum) ) return;
 
+       /*      fprintf(stderr, "mark: marking object at 0x%lx\n", obj); */
        setbit (markbits, blocknum);
        
        if ( isbitclear(referencebits, blocknum) ) return;
@@ -452,7 +454,7 @@ static void markreferences (void **rstart, void **rend)
 
 ******************************************************************************/
 
-static void markstack ()                   /* schani */
+static void markstack ()
 {
        void *dummy;
 
@@ -471,22 +473,12 @@ static void markstack ()                   /* schani */
                for (aThread = liveThreads; aThread != 0;
                         aThread = CONTEXT(aThread).nextlive) {
                        mark((heapblock*)aThread);
-                       if (aThread == currentThread) {
-                               void **top_of_stack = &dummy;
-                               
-                               if (top_of_stack > (void**)CONTEXT(aThread).stackEnd)
-                                       markreferences((void**)CONTEXT(aThread).stackEnd, top_of_stack);
-                               else    
-                                       markreferences(top_of_stack, (void**)CONTEXT(aThread).stackEnd);
-                       }
-                       else {
-                               if (CONTEXT(aThread).usedStackTop > CONTEXT(aThread).stackEnd)
-                                       markreferences((void**)CONTEXT(aThread).stackEnd,
-                                                                  (void**)CONTEXT(aThread).usedStackTop);
-                               else    
-                                       markreferences((void**)CONTEXT(aThread).usedStackTop,
-                                                                  (void**)CONTEXT(aThread).stackEnd);
-                       }
+                       if (CONTEXT(aThread).usedStackTop > CONTEXT(aThread).stackEnd)
+                               markreferences((void**)CONTEXT(aThread).stackEnd,
+                                                          (void**)CONTEXT(aThread).usedStackTop);
+                       else    
+                               markreferences((void**)CONTEXT(aThread).usedStackTop,
+                                                          (void**)CONTEXT(aThread).stackEnd);
            }
 
                markreferences((void**)&threadQhead[0],
@@ -495,6 +487,8 @@ static void markstack ()                   /* schani */
 #else
     void **top_of_stack = &dummy;
 
+       /*      fprintf(stderr, "marking stack\n"); */
+
     if (top_of_stack > bottom_of_stack)
         markreferences(bottom_of_stack, top_of_stack);
     else
@@ -595,6 +589,7 @@ static void heap_docollect ()
                /* Alle vom Stack referenzierten Objekte markieren */
        asm_dumpregistersandcall (markstack);
 
+       /*      fprintf(stderr, "marking references\n"); */
                /* Alle von globalen Variablen erreichbaren Objekte markieren */
        p = chain_first (allglobalreferences);
        while (p) {
@@ -632,12 +627,24 @@ static void heap_docollect ()
                        /* Ende des freien Bereiches suchen */          
                freeend = findnextsetbit (markbits, topofheap, freestart+1);
 
+#if 0
+               if (freeend==topofheap) {
+                       topofheap = freestart;
+                       heapfreemem += (freeend-freestart);
+                       goto freememfinished;
+               } else {
+                       fprintf(stderr, "%lx -- %lx\n", heap + freestart, heap + freeend);
+#endif
+
                        /* Freien Bereich in Freispeicherliste einh"angen */
-               memlist_addrange (freestart, freeend-freestart);
+                       memlist_addrange (freestart, freeend-freestart);
 
                        /* Menge des freien Speichers mitnotieren */
-               heapfreemem += (freeend-freestart);
+                       heapfreemem += (freeend-freestart);
+#if 0
                }
+#endif
+       }
 
        freememfinished:
 
@@ -692,15 +699,22 @@ void
 gc_call (void)
 {
 #ifdef USE_THREADS
+       u1 dummy;
+
        assert(blockInts == 0);
-#endif
 
        intsDisable();
-       if (currentThread == NULL || currentThread == mainThread)
+       if (currentThread == NULL || currentThread == mainThread) {
+               CONTEXT(mainThread).usedStackTop = &dummy;
                heap_docollect();
+       }
        else
-               asm_switchstackandcall(CONTEXT(mainThread).usedStackTop, heap_docollect);
+               asm_switchstackandcall(CONTEXT(mainThread).usedStackTop, heap_docollect,
+                                                          (void**)&(CONTEXT(currentThread).usedStackTop));
        intsRestore();
+#else
+       heap_docollect();
+#endif
 }
 
 
@@ -765,19 +779,23 @@ void heap_init (u4 heapbytesize, u4 heapbytestartsize, void **stackbottom)
 
 void heap_close ()
 {
+       while (livefinalizees) {
+               finalizernode *n = livefinalizees->next;
+               asm_calljavamethod (livefinalizees->finalizer, 
+                                                       heap+livefinalizees->objstart, 
+                                                       NULL,NULL,NULL);
+               FREE (livefinalizees, finalizernode);
+               livefinalizees = n;
+       }
+
 #ifndef TRACECALLARGS
-       MFREE (heap, heapblock, heapsize); */
+       MFREE (heap, heapblock, heapsize);
 #endif
        MFREE (startbits, bitfieldtype, heapsize/BITFIELDBITS);
        MFREE (markbits, bitfieldtype, heapsize/BITFIELDBITS);
        MFREE (referencebits, bitfieldtype, heapsize/BITFIELDBITS);
-       chain_free (allglobalreferences);
-
-       while (livefinalizees) {
-               finalizernode *n = livefinalizees->next;
-               FREE (livefinalizees, finalizernode);
-               livefinalizees = n;
-               }
+       if (allglobalreferences != NULL)
+               chain_free (allglobalreferences);
 }
 
 
@@ -818,6 +836,10 @@ void *heap_allocate (u4 bytelength, bool references, methodinfo *finalizer)
        u4 freestart,freelength;
        u4 length = ALIGN(bytelength, BLOCKSIZE) / BLOCKSIZE;
        
+       /*      fprintf(stderr, "heap_allocate: 0x%lx (%ld) requested, 0x%lx (%ld) aligned\n", bytelength, bytelength, length * BLOCKSIZE, length * BLOCKSIZE); */
+
+       /*      heap_docollect(); */
+
        intsDisable();                        /* schani */
 
        memlist_getsuitable (&freestart, &freelength, length);