From e40217a763572e59dc870abfee044b762cdd6740 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 2 Nov 1999 00:12:10 +0000 Subject: [PATCH] boehm.cc (_Jv_InitGC): Set GC_java_finalization. * boehm.cc (_Jv_InitGC): Set GC_java_finalization. (sum_blocks): Removed. (_Jv_GCFreeMemory): Use GC_get_free_bytes. From-SVN: r30335 --- libjava/ChangeLog | 6 ++++++ libjava/boehm.cc | 22 +++------------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index fb71da38449..cad83603c9d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +1999-11-01 Tom Tromey + + * boehm.cc (_Jv_InitGC): Set GC_java_finalization. + (sum_blocks): Removed. + (_Jv_GCFreeMemory): Use GC_get_free_bytes. + 1999-11-01 Bryce McKinlay * java/io/PrintStream (PrintStream): Fix illegal usage of "this" diff --git a/libjava/boehm.cc b/libjava/boehm.cc index fb11a112873..39fc9af9b09 100644 --- a/libjava/boehm.cc +++ b/libjava/boehm.cc @@ -368,28 +368,10 @@ _Jv_GCTotalMemory (void) return GC_get_heap_size (); } -/* Sum size of each hblk. */ -static void -sum_blocks (struct hblk *h, word arg) -{ - long *sump = (long *) arg; - /* This evil computation is from boehm-gc/checksums.c. */ - hdr *hhdr = HDR (h); - int bytes = WORDS_TO_BYTES (hhdr->hb_sz); - bytes += HDR_BYTES + HBLKSIZE - 1; - bytes &= ~ (HBLKSIZE - 1); - *sump += bytes; -} - -/* This turns out to be expensive to implement. For now, we don't - care. We could make it less expensive, perhaps, but that would - require some changes to the collector. */ long _Jv_GCFreeMemory (void) { - long sum = 0; - GC_apply_to_all_blocks (sum_blocks, &sum); - return sum; + return GC_get_free_bytes (); } void @@ -423,6 +405,8 @@ _Jv_InitGC (void) } initialized = 1; + GC_java_finalization = 1; + // Set up state for marking and allocation of Java objects. obj_free_list = (ptr_t *) GC_generic_malloc_inner ((MAXOBJSZ + 1) * sizeof (ptr_t),