summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-02-19 12:23:29 +0100
committerAndy Wingo <wingo@pobox.com>2012-03-08 12:40:27 +0100
commit75ba64d6797f5857cc9885eb753126119a8c8b68 (patch)
tree117063e8b5d92a03fd83c9cea34f3009a0048f33
parent7b327550e20967b0a8f89182bcf9a04543db3a0f (diff)
downloadguile-75ba64d6797f5857cc9885eb753126119a8c8b68.tar.gz
use the new finalizer helpers
* libguile/foreign.c (scm_set_pointer_finalizer_x) * libguile/ports.c (finalize_port) * libguile/smob.c (scm_i_new_smob, scm_i_new_double_smob) * libguile/struct.c (scm_i_alloc_struct) * libguile/numbers.c (make_bignum): Use the new API.
-rw-r--r--libguile/foreign.c25
-rw-r--r--libguile/numbers.c8
-rw-r--r--libguile/ports.c7
-rw-r--r--libguile/smob.c18
-rw-r--r--libguile/struct.c14
5 files changed, 12 insertions, 60 deletions
diff --git a/libguile/foreign.c b/libguile/foreign.c
index b3d1cc69a..f1d960717 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -160,16 +160,8 @@ scm_from_pointer (void *ptr, scm_t_pointer_finalizer finalizer)
ret = scm_cell (scm_tc7_pointer, (scm_t_bits) ptr);
if (finalizer)
- {
- /* Register a finalizer for the newly created instance. */
- GC_finalization_proc prev_finalizer;
- GC_PTR prev_finalizer_data;
- GC_REGISTER_FINALIZER_NO_ORDER (SCM2PTR (ret),
- pointer_finalizer_trampoline,
- finalizer,
- &prev_finalizer,
- &prev_finalizer_data);
- }
+ scm_i_set_finalizer (SCM2PTR (ret), pointer_finalizer_trampoline,
+ finalizer);
}
return ret;
@@ -319,20 +311,11 @@ SCM_DEFINE (scm_set_pointer_finalizer_x, "set-pointer-finalizer!", 2, 0, 0,
"Scheme. If you need a Scheme finalizer, use guardians.")
#define FUNC_NAME s_scm_set_pointer_finalizer_x
{
- void *c_finalizer;
- GC_finalization_proc prev_finalizer;
- GC_PTR prev_finalizer_data;
-
SCM_VALIDATE_POINTER (1, pointer);
SCM_VALIDATE_POINTER (2, finalizer);
- c_finalizer = SCM_POINTER_VALUE (finalizer);
-
- GC_REGISTER_FINALIZER_NO_ORDER (SCM2PTR (pointer),
- pointer_finalizer_trampoline,
- c_finalizer,
- &prev_finalizer,
- &prev_finalizer_data);
+ scm_i_add_finalizer (SCM2PTR (pointer), pointer_finalizer_trampoline,
+ SCM_POINTER_VALUE (finalizer));
return SCM_UNSPECIFIED;
}
diff --git a/libguile/numbers.c b/libguile/numbers.c
index 25e953333..0173aeea5 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
*
* Portions Copyright 1990, 1991, 1992, 1993 by AT&T Bell Laboratories
* and Bellcore. See scm_divide.
@@ -217,17 +217,13 @@ static inline SCM
make_bignum (void)
{
scm_t_bits *p;
- GC_finalization_proc prev_finalizer;
- GC_PTR prev_finalizer_data;
/* Allocate one word for the type tag and enough room for an `mpz_t'. */
p = scm_gc_malloc_pointerless (sizeof (scm_t_bits) + sizeof (mpz_t),
"bignum");
p[0] = scm_tc16_big;
- GC_REGISTER_FINALIZER_NO_ORDER (p, finalize_bignum, NULL,
- &prev_finalizer,
- &prev_finalizer_data);
+ scm_i_set_finalizer (p, finalize_bignum, NULL);
return SCM_PACK (p);
}
diff --git a/libguile/ports.c b/libguile/ports.c
index 12efce898..2d8b9ed48 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -546,14 +546,9 @@ static void finalize_port (GC_PTR, GC_PTR);
static SCM_C_INLINE_KEYWORD void
register_finalizer_for_port (SCM port)
{
- GC_finalization_proc prev_finalizer;
- GC_PTR prev_finalization_data;
-
/* Register a finalizer for PORT so that its iconv CDs get freed and
optionally its type's `free' function gets called. */
- GC_REGISTER_FINALIZER_NO_ORDER (SCM2PTR (port), finalize_port, 0,
- &prev_finalizer,
- &prev_finalization_data);
+ scm_i_set_finalizer (SCM2PTR (port), finalize_port, NULL);
}
/* Finalize the object (a port) pointed to by PTR. */
diff --git a/libguile/smob.c b/libguile/smob.c
index 3a3e688ba..6a341ef5d 100644
--- a/libguile/smob.c
+++ b/libguile/smob.c
@@ -602,14 +602,7 @@ scm_i_new_smob (scm_t_bits tc, scm_t_bits data)
SCM_SET_CELL_WORD_0 (ret, tc);
if (scm_smobs[smobnum].free)
- {
- GC_finalization_proc prev_finalizer;
- GC_PTR prev_finalizer_data;
-
- GC_REGISTER_FINALIZER_NO_ORDER (SCM2PTR (ret),
- finalize_smob, NULL,
- &prev_finalizer, &prev_finalizer_data);
- }
+ scm_i_set_finalizer (SCM2PTR (ret), finalize_smob, NULL);
return ret;
}
@@ -636,14 +629,7 @@ scm_i_new_double_smob (scm_t_bits tc, scm_t_bits data1,
SCM_SET_CELL_WORD_0 (ret, tc);
if (scm_smobs[smobnum].free)
- {
- GC_finalization_proc prev_finalizer;
- GC_PTR prev_finalizer_data;
-
- GC_REGISTER_FINALIZER_NO_ORDER (SCM2PTR (ret),
- finalize_smob, NULL,
- &prev_finalizer, &prev_finalizer_data);
- }
+ scm_i_set_finalizer (SCM2PTR (ret), finalize_smob, NULL);
return ret;
}
diff --git a/libguile/struct.c b/libguile/struct.c
index 2aa5c113a..e5d95fc44 100644
--- a/libguile/struct.c
+++ b/libguile/struct.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,1999,2000,2001, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2000,2001, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 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 License
@@ -443,16 +443,8 @@ scm_i_alloc_struct (scm_t_bits *vtable_data, int n_words)
/* vtable_data can be null when making a vtable vtable */
if (vtable_data && vtable_data[scm_vtable_index_instance_finalize])
- {
- /* Register a finalizer for the newly created instance. */
- GC_finalization_proc prev_finalizer;
- GC_PTR prev_finalizer_data;
- GC_REGISTER_FINALIZER_NO_ORDER (SCM2PTR (ret),
- struct_finalizer_trampoline,
- NULL,
- &prev_finalizer,
- &prev_finalizer_data);
- }
+ /* Register a finalizer for the newly created instance. */
+ scm_i_set_finalizer (SCM2PTR (ret), struct_finalizer_trampoline, NULL);
return ret;
}