conservatory
/
elk
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Fixed a bug in the garbage collector. 

git-svn-id: svn://svn.zoy.org/elk/trunk@138 55e467fa-43c5-0310-a8a2-de718669efc6
This commit is contained in:
sam 2003-09-10 15:08:00 +00:00
parent 335719f3a1
commit 2879388fa2
2 changed files with 44 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BUGS
View File

@ -36,10 +36,3 @@ Generational/Incremental Garbage Collector
o The percentage displayed at the end of a GC run is sometimes wrong. o The percentage displayed at the end of a GC run is sometimes wrong.
o This simple test causes a valgrind error after the first GC run:
(define (fact x) (if (> x 1) (* x (fact (- x 1))) 1))
(fact 100)
(fact 1000)
(fact 1000)

39
src/heap-gen.c
View File

@ -196,8 +196,7 @@ static void TerminateGC ();
#define IS_CLUSTER(a,b) (SAME_PHYSPAGE (PAGE_TO_ADDR ((a)), \ #define IS_CLUSTER(a,b) (SAME_PHYSPAGE (PAGE_TO_ADDR ((a)), \
PAGE_TO_ADDR ((b))) || \ PAGE_TO_ADDR ((b))) || \
(space[(a)&hp_per_pp_mask] == \ (space[a] == space[b] && \
space[((b)&hp_per_pp_mask)+hp_per_pp] && \
type[(a)&hp_per_pp_mask] == OBJECTPAGE && \ type[(a)&hp_per_pp_mask] == OBJECTPAGE && \
type[((b)&hp_per_pp_mask)+hp_per_pp] == OBJECTPAGE)) type[((b)&hp_per_pp_mask)+hp_per_pp] == OBJECTPAGE))
@ -805,25 +804,30 @@ static void AllocPage (pageno_t npg) {
/* now look for a cluster of npg free pages. cont_free counts the /* now look for a cluster of npg free pages. cont_free counts the
* number of free pages found, first_freepage is the number of the * number of free pages found, first_freepage is the number of the
* first free heap page in the cluster. * first free heap page in the cluster. */
*/
for (p = spanning_pages, cont_free = 0; p; p--) { for (p = spanning_pages, cont_free = 0; p; p--) {
if (space[current_freepage] < previous_space
&& !STABLE (current_freepage)) { /* If we have more space than before, or if the current page is
* stable, start again with the next page. */
if (space[current_freepage] >= previous_space
|| STABLE (current_freepage)) {
current_freepage = next (current_freepage);
cont_free = 0;
continue;
}
if (cont_free == 0) { if (cont_free == 0) {
/* This is our first free page, first check that we have a /* This is our first free page, first check that we have a
* continuous cluster of pages (we'll check later that they * continuous cluster of pages (we'll check later that they
* are free). Otherwise, go to the next free page */ * are free). Otherwise, go to the next free page. */
if (current_freepage+npg-1 <= lastpage if ((current_freepage+npg-1) > lastpage
&& IS_CLUSTER (current_freepage, current_freepage+npg-1)) || !IS_CLUSTER (current_freepage, current_freepage+npg-1)) {
first_freepage = current_freepage; current_freepage = next ((current_freepage&hp_per_pp_mask)
else { +hp_per_pp-1);
current_freepage = next (current_freepage -
current_freepage % hp_per_pp +
hp_per_pp-1);
continue; continue;
} }
first_freepage = current_freepage;
} }
cont_free++; cont_free++;
@ -848,11 +852,6 @@ static void AllocPage (pageno_t npg) {
/* check the next free page. If we warped, reset cont_free to 0. */ /* check the next free page. If we warped, reset cont_free to 0. */
current_freepage = next (current_freepage); current_freepage = next (current_freepage);
if (current_freepage == firstpage) cont_free = 0; if (current_freepage == firstpage) cont_free = 0;
} else {
current_freepage = next (current_freepage);
cont_free = 0;
}
} }
/* no space available, try to expand heap */ /* no space available, try to expand heap */