diff options
author | Marius Vollmer <mvo@zagadka.de> | 2004-08-19 16:48:38 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2004-08-19 16:48:38 +0000 |
commit | eb01cb6494c4ccf1494ef09ccbb352b4702f7753 (patch) | |
tree | bd3892af0ee095707b9bac24f0d0175214b04e8e /libguile/gc-card.c | |
parent | fddf60002a11cd962db15a905e86f5721eb04680 (diff) | |
download | guile-eb01cb6494c4ccf1494ef09ccbb352b4702f7753.tar.gz |
* gc.h, gc.c (scm_i_gc_admin_mutex): New, to protect
scm_gc_mallocated, for now.
(scm_init_storage): Initialize it.
* gc-malloc.c (descrease_mtrigger, increase_mtrigger): Use it.
* gc-mark.c (scm_gc_mark_dependencies): Call scm_i_string_mark,
scm_i_stringbuf_mark and scm_i_symbol_mark, as appropriate.
* gc-card.c (scm_i_sweep_card): Call scm_i_string_free,
scm_i_stringbuf_free and scm_i_symbol_free, as appropriate.
Diffstat (limited to 'libguile/gc-card.c')
-rw-r--r-- | libguile/gc-card.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libguile/gc-card.c b/libguile/gc-card.c index 2f57736b3..3bbd12331 100644 --- a/libguile/gc-card.c +++ b/libguile/gc-card.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2004 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -193,12 +193,13 @@ scm_i_sweep_card (scm_t_cell * p, SCM *free_list, scm_t_heap_segment*seg) } break; case scm_tc7_string: - scm_gc_free (SCM_I_STRING_CHARS (scmptr), - SCM_I_STRING_LENGTH (scmptr) + 1, "string"); + scm_i_string_free (scmptr); + break; + case scm_tc7_stringbuf: + scm_i_stringbuf_free (scmptr); break; case scm_tc7_symbol: - scm_gc_free (SCM_SYMBOL_CHARS (scmptr), - SCM_SYMBOL_LENGTH (scmptr) + 1, "symbol"); + scm_i_symbol_free (scmptr); break; case scm_tc7_variable: break; |