2001-03-30 15:03:23 +00:00
|
|
|
|
/* Copyright (C) 1998,1999,2000,2001 Free Software Foundation, Inc.
|
1998-12-23 06:38:06 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
1998-12-23 06:38:06 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
|
* Lesser General Public License for more details.
|
1998-12-23 06:38:06 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
|
|
*/
|
1999-12-12 02:36:16 +00:00
|
|
|
|
|
1998-12-23 06:38:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This is an implementation of guardians as described in
|
|
|
|
|
|
* R. Kent Dybvig, Carl Bruggeman, and David Eby (1993) "Guardians in
|
|
|
|
|
|
* a Generation-Based Garbage Collector" ACM SIGPLAN Conference on
|
|
|
|
|
|
* Programming Language Design and Implementation, June 1993
|
|
|
|
|
|
* ftp://ftp.cs.indiana.edu/pub/scheme-repository/doc/pubs/guardians.ps.gz
|
|
|
|
|
|
*
|
2000-12-23 23:00:23 +00:00
|
|
|
|
* By this point, the semantics are actually quite different from
|
|
|
|
|
|
* those described in the abovementioned paper. The semantic changes
|
|
|
|
|
|
* are there to improve safety and intuitiveness. The interface is
|
|
|
|
|
|
* still (mostly) the one described by the paper, however.
|
|
|
|
|
|
*
|
|
|
|
|
|
* Original design: Mikael Djurfeldt
|
|
|
|
|
|
* Original implementation: Michael Livshin
|
|
|
|
|
|
* Hacked on since by: everybody
|
1998-12-23 06:38:06 +00:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/_scm.h"
|
|
|
|
|
|
#include "libguile/ports.h"
|
|
|
|
|
|
#include "libguile/print.h"
|
|
|
|
|
|
#include "libguile/smob.h"
|
|
|
|
|
|
#include "libguile/validate.h"
|
2000-12-23 23:00:23 +00:00
|
|
|
|
#include "libguile/root.h"
|
2000-12-29 22:18:06 +00:00
|
|
|
|
#include "libguile/hashtab.h"
|
|
|
|
|
|
#include "libguile/weaks.h"
|
2000-12-23 23:00:23 +00:00
|
|
|
|
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/guardians.h"
|
1998-12-23 06:38:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* The live and zombies FIFOs are implemented as tconcs as described
|
|
|
|
|
|
in Dybvig's paper. This decouples addition and removal of elements
|
|
|
|
|
|
so that no synchronization between these needs to take place.
|
|
|
|
|
|
*/
|
2000-12-05 03:04:20 +00:00
|
|
|
|
|
2001-09-13 22:29:44 +00:00
|
|
|
|
typedef struct t_tconc
|
2000-12-05 03:04:20 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM head;
|
|
|
|
|
|
SCM tail;
|
2001-09-13 22:29:44 +00:00
|
|
|
|
} t_tconc;
|
2000-12-05 03:04:20 +00:00
|
|
|
|
|
|
|
|
|
|
#define TCONC_EMPTYP(tc) (SCM_EQ_P ((tc).head, (tc).tail))
|
|
|
|
|
|
|
1998-12-23 06:38:06 +00:00
|
|
|
|
#define TCONC_IN(tc, obj, pair) \
|
1999-12-16 03:46:42 +00:00
|
|
|
|
do { \
|
1998-12-23 06:38:06 +00:00
|
|
|
|
SCM_SETCAR ((tc).tail, obj); \
|
2004-05-15 15:39:27 +00:00
|
|
|
|
SCM_SET_CELL_OBJECT_1 (pair, SCM_EOL); \
|
|
|
|
|
|
SCM_SET_CELL_OBJECT_0 (pair, SCM_BOOL_F); \
|
1998-12-23 06:38:06 +00:00
|
|
|
|
SCM_SETCDR ((tc).tail, pair); \
|
|
|
|
|
|
(tc).tail = pair; \
|
1999-12-16 03:46:42 +00:00
|
|
|
|
} while (0)
|
1998-12-23 06:38:06 +00:00
|
|
|
|
|
|
|
|
|
|
#define TCONC_OUT(tc, res) \
|
1999-12-16 03:46:42 +00:00
|
|
|
|
do { \
|
1998-12-23 06:38:06 +00:00
|
|
|
|
(res) = SCM_CAR ((tc).head); \
|
|
|
|
|
|
(tc).head = SCM_CDR ((tc).head); \
|
1999-12-16 03:46:42 +00:00
|
|
|
|
} while (0)
|
1998-12-23 06:38:06 +00:00
|
|
|
|
|
|
|
|
|
|
|
2001-06-14 19:50:43 +00:00
|
|
|
|
static scm_t_bits tc16_guardian;
|
1998-12-23 06:38:06 +00:00
|
|
|
|
|
2001-09-13 22:29:44 +00:00
|
|
|
|
typedef struct t_guardian
|
1998-12-23 06:38:06 +00:00
|
|
|
|
{
|
2001-09-13 22:29:44 +00:00
|
|
|
|
t_tconc live;
|
|
|
|
|
|
t_tconc zombies;
|
|
|
|
|
|
struct t_guardian *next;
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
unsigned long flags;
|
2001-09-13 22:29:44 +00:00
|
|
|
|
} t_guardian;
|
1998-12-23 06:38:06 +00:00
|
|
|
|
|
2000-12-23 23:00:23 +00:00
|
|
|
|
#define GUARDIAN_P(x) SCM_SMOB_PREDICATE(tc16_guardian, x)
|
2001-09-13 22:29:44 +00:00
|
|
|
|
#define GUARDIAN_DATA(x) ((t_guardian *) SCM_CELL_WORD_1 (x))
|
2000-12-23 23:00:23 +00:00
|
|
|
|
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
#define F_GREEDY 1L
|
|
|
|
|
|
#define F_LISTED (1L << 1)
|
|
|
|
|
|
#define F_DESTROYED (1L << 2)
|
|
|
|
|
|
|
|
|
|
|
|
#define GREEDY_P(x) (((x)->flags & F_GREEDY) != 0)
|
|
|
|
|
|
#define SET_GREEDY(x) ((x)->flags |= F_GREEDY)
|
|
|
|
|
|
|
|
|
|
|
|
#define LISTED_P(x) (((x)->flags & F_LISTED) != 0)
|
|
|
|
|
|
#define SET_LISTED(x) ((x)->flags |= F_LISTED)
|
|
|
|
|
|
#define CLR_LISTED(x) ((x)->flags &= ~F_LISTED)
|
|
|
|
|
|
|
|
|
|
|
|
#define DESTROYED_P(x) (((x)->flags & F_DESTROYED) != 0)
|
|
|
|
|
|
#define SET_DESTROYED(x) ((x)->flags |= F_DESTROYED)
|
2000-12-23 23:00:23 +00:00
|
|
|
|
|
|
|
|
|
|
/* during the gc mark phase, live guardians are linked into the lists
|
|
|
|
|
|
here. */
|
2001-09-13 22:29:44 +00:00
|
|
|
|
static t_guardian *greedy_guardians = NULL;
|
|
|
|
|
|
static t_guardian *sharing_guardians = NULL;
|
2000-12-23 23:00:23 +00:00
|
|
|
|
|
2000-12-29 22:18:06 +00:00
|
|
|
|
static SCM greedily_guarded_whash = SCM_EOL;
|
2000-12-23 23:00:23 +00:00
|
|
|
|
|
|
|
|
|
|
/* this is the list of guarded objects that are parts of cycles. we
|
|
|
|
|
|
don't know in which order to return them from guardians, so we just
|
|
|
|
|
|
unguard them and whine about it in after-gc-hook */
|
|
|
|
|
|
static SCM self_centered_zombies = SCM_EOL;
|
|
|
|
|
|
|
1998-12-23 06:38:06 +00:00
|
|
|
|
|
2000-12-23 23:00:23 +00:00
|
|
|
|
static void
|
2001-09-13 22:29:44 +00:00
|
|
|
|
add_to_live_list (t_guardian *g)
|
2000-12-23 23:00:23 +00:00
|
|
|
|
{
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
if (LISTED_P (g))
|
2000-12-23 23:00:23 +00:00
|
|
|
|
return;
|
1998-12-23 06:38:06 +00:00
|
|
|
|
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
if (GREEDY_P (g))
|
2000-12-23 23:00:23 +00:00
|
|
|
|
{
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
g->next = greedy_guardians;
|
|
|
|
|
|
greedy_guardians = g;
|
2000-12-23 23:00:23 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
g->next = sharing_guardians;
|
|
|
|
|
|
sharing_guardians = g;
|
2000-12-23 23:00:23 +00:00
|
|
|
|
}
|
2000-12-05 03:04:20 +00:00
|
|
|
|
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
SET_LISTED (g);
|
2000-12-23 23:00:23 +00:00
|
|
|
|
}
|
2000-04-02 21:52:49 +00:00
|
|
|
|
|
2000-12-05 03:04:20 +00:00
|
|
|
|
/* mark a guardian by adding it to the live guardian list. */
|
1998-12-23 06:38:06 +00:00
|
|
|
|
static SCM
|
2000-12-05 03:04:20 +00:00
|
|
|
|
guardian_mark (SCM ptr)
|
|
|
|
|
|
{
|
2001-09-13 22:29:44 +00:00
|
|
|
|
add_to_live_list (GUARDIAN_DATA (ptr));
|
2000-12-05 03:04:20 +00:00
|
|
|
|
|
|
|
|
|
|
/* the objects protected by the guardian are not marked here: that
|
|
|
|
|
|
would prevent them from ever getting collected. instead marking
|
2000-12-23 23:00:23 +00:00
|
|
|
|
is done at the end of the mark phase by guardian_zombify. */
|
2000-12-05 03:04:20 +00:00
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* validate.h
(SCM_NUM2{SIZE,PTRDIFF,SHORT,USHORT,BITS,UBITS,INT,UINT}[_DEF]):
new macros.
* unif.h: type renaming:
scm_array -> scm_array_t
scm_array_dim -> scm_array_dim_t
the old names are deprecated, all in-Guile uses changed.
* tags.h (scm_ubits_t): new typedef, representing unsigned
scm_bits_t.
* stacks.h: type renaming:
scm_info_frame -> scm_info_frame_t
scm_stack -> scm_stack_t
the old names are deprecated, all in-Guile uses changed.
* srcprop.h: type renaming:
scm_srcprops -> scm_srcprops_t
scm_srcprops_chunk -> scm_srcprops_chunk_t
the old names are deprecated, all in-Guile uses changed.
* gsubr.c, procs.c, print.c, ports.c, read.c, rdelim.c, ramap.c,
rw.c, smob.c, sort.c, srcprop.c, stacks.c, strings.c, strop.c,
strorder.c, strports.c, struct.c, symbols.c, unif.c, values.c,
vectors.c, vports.c, weaks.c:
various int/size_t -> size_t/scm_bits_t changes.
* random.h: type renaming:
scm_rstate -> scm_rstate_t
scm_rng -> scm_rng_t
scm_i_rstate -> scm_i_rstate_t
the old names are deprecated, all in-Guile uses changed.
* procs.h: type renaming:
scm_subr_entry -> scm_subr_entry_t
the old name is deprecated, all in-Guile uses changed.
* options.h (scm_option_t.val): unsigned long -> scm_bits_t.
type renaming:
scm_option -> scm_option_t
the old name is deprecated, all in-Guile uses changed.
* objects.c: various long -> scm_bits_t changes.
(scm_i_make_class_object): flags: unsigned long -> scm_ubits_t
* numbers.h (SCM_FIXNUM_BIT): deprecated, renamed to
SCM_I_FIXNUM_BIT.
* num2integral.i.c: new file, multiply included by numbers.c, used
to "templatize" the various integral <-> num conversion routines.
* numbers.c (scm_mkbig, scm_big2num, scm_adjbig, scm_normbig,
scm_copybig, scm_2ulong2big, scm_dbl2big, scm_big2dbl):
deprecated.
(scm_i_mkbig, scm_i_big2inum, scm_i_adjbig, scm_i_normbig,
scm_i_copybig, scm_i_short2big, scm_i_ushort2big, scm_i_int2big,
scm_i_uint2big, scm_i_long2big, scm_i_ulong2big, scm_i_bits2big,
scm_i_ubits2big, scm_i_size2big, scm_i_ptrdiff2big,
scm_i_long_long2big, scm_i_ulong_long2big, scm_i_dbl2big,
scm_i_big2dbl, scm_short2num, scm_ushort2num, scm_int2num,
scm_uint2num, scm_bits2num, scm_ubits2num, scm_size2num,
scm_ptrdiff2num, scm_num2short, scm_num2ushort, scm_num2int,
scm_num2uint, scm_num2bits, scm_num2ubits, scm_num2ptrdiff,
scm_num2size): new functions.
* modules.c (scm_module_reverse_lookup): i, n: int -> scm_bits_t.x
* load.c: change int -> size_t in various places (where the
variable is used to store a string length).
(search-path): call scm_done_free, not scm_done_malloc.
* list.c (scm_ilength): return a scm_bits_t, not long.
some other {int,long} -> scm_bits_t changes.
* hashtab.c: various [u]int -> scm_bits_t changes.
scm_ihashx_closure -> scm_ihashx_closure_t (and made a typedef).
(scm_ihashx): n: uint -> scm_bits_t
use scm_bits2num instead of scm_ulong2num.
* gsubr.c: various int -> scm_bits_t changes.
* gh_data.c (gh_scm2double): no loss of precision any more.
* gh.h (gh_str2scm): len: int -> size_t
(gh_{get,set}_substr): start: int -> scm_bits_t,
len: int -> size_t
(gh_<num>2scm): n: int -> scm_bits_t
(gh_*vector_length): return scm_[u]size_t, not unsigned long.
(gh_length): return scm_bits_t, not unsigned long.
* fports.h: type renaming:
scm_fport -> scm_fport_t
the old name is deprecated, all in-Guile uses changed.
* fports.c (fport_fill_input): count: int -> scm_bits_t
(fport_flush): init_size, remaining, count: int -> scm_bits_t
* debug.h (scm_lookup_cstr, scm_lookup_soft, scm_evstr): removed
those prototypes, as the functions they prototype don't exist.
* fports.c (default_buffer_size): int -> size_t
(scm_fport_buffer_add): read_size, write_size: int -> scm_bits_t
default_size: int -> size_t
(scm_setvbuf): csize: int -> scm_bits_t
* fluids.c (n_fluids): int -> scm_bits_t
(grow_fluids): old_length, i: int -> scm_bits_t
(next_fluid_num, scm_fluid_ref, scm_fluid_set_x): n: int ->
scm_bits_t
(scm_c_with_fluids): flen, vlen: int -> scm_bits_t
* filesys.c (s_scm_open_fdes): changed calls to SCM_NUM2LONG to
the new and shiny SCM_NUM2INT.
* extensions.c: extension -> extension_t (and made a typedef).
* eval.h (SCM_IFRAME): cast to scm_bits_t, not int. just so
there are no nasty surprises if/when the various deeply magic tag
bits move somewhere else.
* eval.c: changed the locals used to store results of SCM_IFRAME,
scm_ilength and such to be of type scm_bits_t (and not int/long).
(iqq): depth, edepth: int -> scm_bits_t
(scm_eval_stack): int -> scm_bits_t
(SCM_CEVAL): various vars are not scm_bits_t instead of int.
(check_map_args, scm_map, scm_for_each): len: long -> scm_bits_t
i: int -> scm_bits_t
* environments.c: changed the many calls to scm_ulong2num to
scm_ubits2num.
(import_environment_fold): proc_as_ul: ulong -> scm_ubits_t
* dynwind.c (scm_dowinds): delta: long -> scm_bits_t
* debug.h: type renaming:
scm_debug_info -> scm_debug_info_t
scm_debug_frame -> scm_debug_frame_t
the old names are deprecated, all in-Guile uses changed.
(scm_debug_eframe_size): int -> scm_bits_t
* debug.c (scm_init_debug): use scm_c_define instead of the
deprecated scm_define.
* continuations.h: type renaming:
scm_contregs -> scm_contregs_t
the old name is deprecated, all in-Guile uses changed.
(scm_contregs_t.num_stack_items): size_t -> scm_bits_t
(scm_contregs_t.num_stack_items): ulong -> scm_ubits_t
* continuations.c (scm_make_continuation): change the type of
stack_size form long to scm_bits_t.
* ports.h: type renaming:
scm_port_rw_active -> scm_port_rw_active_t (and made a typedef)
scm_port -> scm_port_t
scm_ptob_descriptor -> scm_ptob_descriptor_t
the old names are deprecated, all in-Guile uses changed.
(scm_port_t.entry): int -> scm_bits_t.
(scm_port_t.line_number): int -> long.
(scm_port_t.putback_buf_size): int -> size_t.
* __scm.h (long_long, ulong_long): deprecated (they pollute the
global namespace and have little value besides that).
(SCM_BITS_LENGTH): new, is the bit size of scm_bits_t (i.e. of an
SCM handle).
(ifdef spaghetti): include sys/types.h and sys/stdtypes.h, if they
exist (for size_t & ptrdiff_t)
(scm_sizet): deprecated.
* Makefile.am (noinst_HEADERS): add num2integral.i.c
2001-05-24 00:50:51 +00:00
|
|
|
|
static size_t
|
2000-12-05 03:04:20 +00:00
|
|
|
|
guardian_free (SCM ptr)
|
|
|
|
|
|
{
|
* gc.h, gc.c (scm_gc_sweep): Issue deprecation warning when
non-zero is returned from a port or smob free function.
(scm_malloc, scm_realloc, scm_strndup, scm_strdup,
scm_gc_register_collectable_memory,
scm_gc_unregister_collectable_memory, scm_gc_malloc,
scm_gc_realloc, scm_gc_free, scm_gc_strndup, scm_gc_strdup): New.
* backtrace.c, continuations.c, convert.i.c, coop-threads.c,
debug-malloc.c, dynl.c, environments.c, environments.h,
extensions.c, filesys.c, fports.c, gc.c, gc.h, gh_data.c, goops.c,
guardians.c, hooks.c, init.c, keywords.c, load.c, numbers.c,
ports.c, posix.c, procs.c, rdelim.c, regex-posix.c, root.c,
smob.c, stime.c, strings.c, struct.c, struct.h, symbols.c, unif.c,
vectors.c, weaks.c: Use scm_gc_malloc/scm_malloc and
scm_gc_free/free instead of scm_must_malloc and scm_must_free, as
appropriate. Return zero from smob and port free functions.
* debug-malloc.c (scm_malloc_reregister): Handle "old == NULL".
* fports.c (scm_setvbuf): Reset read buffer to saved values when
it is pointing to the putback buffer.
2002-02-11 18:06:50 +00:00
|
|
|
|
scm_gc_free (GUARDIAN_DATA (ptr), sizeof (t_guardian), "guardian");
|
|
|
|
|
|
return 0;
|
2000-12-05 03:04:20 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2001-06-07 21:12:19 +00:00
|
|
|
|
guardian_print (SCM guardian, SCM port, scm_print_state *pstate SCM_UNUSED)
|
2000-12-05 03:04:20 +00:00
|
|
|
|
{
|
2001-09-13 22:29:44 +00:00
|
|
|
|
t_guardian *g = GUARDIAN_DATA (guardian);
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
|
2000-12-23 23:00:23 +00:00
|
|
|
|
scm_puts ("#<", port);
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
|
|
|
|
|
|
if (DESTROYED_P (g))
|
|
|
|
|
|
scm_puts ("destroyed ", port);
|
|
|
|
|
|
|
|
|
|
|
|
if (GREEDY_P (g))
|
|
|
|
|
|
scm_puts ("greedy", port);
|
2000-12-30 19:26:37 +00:00
|
|
|
|
else
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
scm_puts ("sharing", port);
|
|
|
|
|
|
|
|
|
|
|
|
scm_puts (" guardian 0x", port);
|
|
|
|
|
|
scm_intprint ((long) g, 16, port);
|
|
|
|
|
|
|
|
|
|
|
|
if (! DESTROYED_P (g))
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_puts (" (reachable: ", port);
|
|
|
|
|
|
scm_display (scm_length (SCM_CDR (g->live.head)), port);
|
|
|
|
|
|
scm_puts (" unreachable: ", port);
|
|
|
|
|
|
scm_display (scm_length (SCM_CDR (g->zombies.head)), port);
|
|
|
|
|
|
scm_puts (")", port);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
scm_puts (">", port);
|
2000-12-05 03:04:20 +00:00
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
/* This is the Scheme entry point for each guardian: If OBJ is an
|
|
|
|
|
|
* object, it's added to the guardian's live list. If OBJ is unbound,
|
|
|
|
|
|
* the next available unreachable object (or #f if none) is returned.
|
|
|
|
|
|
*
|
|
|
|
|
|
* If the second optional argument THROW_P is true (the default), then
|
|
|
|
|
|
* an error is raised if GUARDIAN is greedy and OBJ is already greedily
|
|
|
|
|
|
* guarded. If THROW_P is false, #f is returned instead of raising the
|
|
|
|
|
|
* error, and #t is returned if everything is fine.
|
2000-12-05 03:04:20 +00:00
|
|
|
|
*/
|
|
|
|
|
|
static SCM
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
guardian_apply (SCM guardian, SCM obj, SCM throw_p)
|
1998-12-23 06:38:06 +00:00
|
|
|
|
{
|
2001-09-13 22:29:44 +00:00
|
|
|
|
if (DESTROYED_P (GUARDIAN_DATA (guardian)))
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
scm_misc_error ("guard", "attempted use of destroyed guardian: ~A",
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_list_1 (guardian));
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
|
|
|
|
|
|
if (!SCM_UNBNDP (obj))
|
|
|
|
|
|
return scm_guard (guardian, obj,
|
|
|
|
|
|
(SCM_UNBNDP (throw_p)
|
|
|
|
|
|
? 1
|
2004-07-06 10:59:25 +00:00
|
|
|
|
: scm_is_true (throw_p)));
|
1998-12-23 06:38:06 +00:00
|
|
|
|
else
|
2000-12-05 03:04:20 +00:00
|
|
|
|
return scm_get_one_zombie (guardian);
|
1998-12-23 06:38:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2000-12-05 03:04:20 +00:00
|
|
|
|
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_guard (SCM guardian, SCM obj, int throw_p)
|
2000-04-02 21:52:49 +00:00
|
|
|
|
{
|
2001-09-13 22:29:44 +00:00
|
|
|
|
t_guardian *g = GUARDIAN_DATA (guardian);
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
|
2000-12-05 03:04:20 +00:00
|
|
|
|
if (!SCM_IMP (obj))
|
2000-04-02 21:52:49 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM z;
|
2000-12-05 03:04:20 +00:00
|
|
|
|
|
2000-12-30 19:26:37 +00:00
|
|
|
|
/* This critical section barrier will be replaced by a mutex. */
|
|
|
|
|
|
SCM_DEFER_INTS;
|
|
|
|
|
|
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
if (GREEDY_P (g))
|
2000-12-23 23:00:23 +00:00
|
|
|
|
{
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_true (scm_hashq_get_handle
|
2000-12-29 22:18:06 +00:00
|
|
|
|
(greedily_guarded_whash, obj)))
|
2000-12-30 19:26:37 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM_ALLOW_INTS;
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
|
|
|
|
|
|
if (throw_p)
|
|
|
|
|
|
scm_misc_error ("guard",
|
|
|
|
|
|
"object is already greedily guarded: ~A",
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
scm_list_1 (obj));
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
else
|
|
|
|
|
|
return SCM_BOOL_F;
|
2000-12-30 19:26:37 +00:00
|
|
|
|
}
|
2000-12-23 23:00:23 +00:00
|
|
|
|
else
|
2000-12-29 22:18:06 +00:00
|
|
|
|
scm_hashq_create_handle_x (greedily_guarded_whash,
|
|
|
|
|
|
obj, guardian);
|
2000-12-23 23:00:23 +00:00
|
|
|
|
}
|
2000-04-02 21:52:49 +00:00
|
|
|
|
|
2001-11-25 15:21:07 +00:00
|
|
|
|
z = scm_cons (SCM_BOOL_F, SCM_BOOL_F);
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
TCONC_IN (g->live, obj, z);
|
2000-12-30 19:26:37 +00:00
|
|
|
|
|
2000-04-02 21:52:49 +00:00
|
|
|
|
SCM_ALLOW_INTS;
|
|
|
|
|
|
}
|
2000-12-30 19:26:37 +00:00
|
|
|
|
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
return throw_p ? SCM_UNSPECIFIED : SCM_BOOL_T;
|
2000-04-02 21:52:49 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2000-12-05 03:04:20 +00:00
|
|
|
|
|
2000-04-02 21:52:49 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_get_one_zombie (SCM guardian)
|
|
|
|
|
|
{
|
2001-09-13 22:29:44 +00:00
|
|
|
|
t_guardian *g = GUARDIAN_DATA (guardian);
|
2000-04-02 21:52:49 +00:00
|
|
|
|
SCM res = SCM_BOOL_F;
|
|
|
|
|
|
|
|
|
|
|
|
/* This critical section barrier will be replaced by a mutex. */
|
|
|
|
|
|
SCM_DEFER_INTS;
|
2000-12-30 19:26:37 +00:00
|
|
|
|
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
if (!TCONC_EMPTYP (g->zombies))
|
|
|
|
|
|
TCONC_OUT (g->zombies, res);
|
2000-12-23 23:00:23 +00:00
|
|
|
|
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_true (res) && GREEDY_P (g))
|
2000-12-29 22:18:06 +00:00
|
|
|
|
scm_hashq_remove_x (greedily_guarded_whash, res);
|
2000-12-30 19:26:37 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_ALLOW_INTS;
|
2000-12-23 23:00:23 +00:00
|
|
|
|
|
2000-04-02 21:52:49 +00:00
|
|
|
|
return res;
|
|
|
|
|
|
}
|
1998-12-23 06:38:06 +00:00
|
|
|
|
|
2000-12-05 03:04:20 +00:00
|
|
|
|
|
2000-12-23 23:00:23 +00:00
|
|
|
|
SCM_DEFINE (scm_make_guardian, "make-guardian", 0, 1, 0,
|
|
|
|
|
|
(SCM greedy_p),
|
2000-04-02 21:52:49 +00:00
|
|
|
|
"Create a new guardian.\n"
|
|
|
|
|
|
"A guardian protects a set of objects from garbage collection,\n"
|
|
|
|
|
|
"allowing a program to apply cleanup or other actions.\n\n"
|
|
|
|
|
|
|
2001-02-23 20:24:15 +00:00
|
|
|
|
"@code{make-guardian} returns a procedure representing the guardian.\n"
|
2000-04-02 21:52:49 +00:00
|
|
|
|
"Calling the guardian procedure with an argument adds the\n"
|
|
|
|
|
|
"argument to the guardian's set of protected objects.\n"
|
|
|
|
|
|
"Calling the guardian procedure without an argument returns\n"
|
|
|
|
|
|
"one of the protected objects which are ready for garbage\n"
|
2001-02-23 20:24:15 +00:00
|
|
|
|
"collection, or @code{#f} if no such object is available.\n"
|
2000-04-02 21:52:49 +00:00
|
|
|
|
"Objects which are returned in this way are removed from\n"
|
2000-08-25 17:33:01 +00:00
|
|
|
|
"the guardian.\n\n"
|
2000-04-02 21:52:49 +00:00
|
|
|
|
|
2001-02-23 20:24:15 +00:00
|
|
|
|
"@code{make-guardian} takes one optional argument that says whether the\n"
|
|
|
|
|
|
"new guardian should be greedy or sharing. If there is any chance\n"
|
2000-12-23 23:00:23 +00:00
|
|
|
|
"that any object protected by the guardian may be resurrected,\n"
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
"then you should make the guardian greedy (this is the default).\n\n"
|
2000-12-23 23:00:23 +00:00
|
|
|
|
|
2000-01-26 01:17:16 +00:00
|
|
|
|
"See R. Kent Dybvig, Carl Bruggeman, and David Eby (1993)\n"
|
|
|
|
|
|
"\"Guardians in a Generation-Based Garbage Collector\".\n"
|
|
|
|
|
|
"ACM SIGPLAN Conference on Programming Language Design\n"
|
2000-12-23 23:00:23 +00:00
|
|
|
|
"and Implementation, June 1993.\n\n"
|
|
|
|
|
|
|
|
|
|
|
|
"(the semantics are slightly different at this point, but the\n"
|
|
|
|
|
|
"paper still (mostly) accurately describes the interface).")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_make_guardian
|
1998-12-23 06:38:06 +00:00
|
|
|
|
{
|
* gc.h, gc.c (scm_gc_sweep): Issue deprecation warning when
non-zero is returned from a port or smob free function.
(scm_malloc, scm_realloc, scm_strndup, scm_strdup,
scm_gc_register_collectable_memory,
scm_gc_unregister_collectable_memory, scm_gc_malloc,
scm_gc_realloc, scm_gc_free, scm_gc_strndup, scm_gc_strdup): New.
* backtrace.c, continuations.c, convert.i.c, coop-threads.c,
debug-malloc.c, dynl.c, environments.c, environments.h,
extensions.c, filesys.c, fports.c, gc.c, gc.h, gh_data.c, goops.c,
guardians.c, hooks.c, init.c, keywords.c, load.c, numbers.c,
ports.c, posix.c, procs.c, rdelim.c, regex-posix.c, root.c,
smob.c, stime.c, strings.c, struct.c, struct.h, symbols.c, unif.c,
vectors.c, weaks.c: Use scm_gc_malloc/scm_malloc and
scm_gc_free/free instead of scm_must_malloc and scm_must_free, as
appropriate. Return zero from smob and port free functions.
* debug-malloc.c (scm_malloc_reregister): Handle "old == NULL".
* fports.c (scm_setvbuf): Reset read buffer to saved values when
it is pointing to the putback buffer.
2002-02-11 18:06:50 +00:00
|
|
|
|
t_guardian *g = scm_gc_malloc (sizeof (t_guardian), "guardian");
|
2000-04-02 21:52:49 +00:00
|
|
|
|
SCM z1 = scm_cons (SCM_BOOL_F, SCM_EOL);
|
|
|
|
|
|
SCM z2 = scm_cons (SCM_BOOL_F, SCM_EOL);
|
1998-12-23 06:38:06 +00:00
|
|
|
|
SCM z;
|
2000-04-02 21:52:49 +00:00
|
|
|
|
|
1998-12-23 06:38:06 +00:00
|
|
|
|
/* A tconc starts out with one tail pair. */
|
|
|
|
|
|
g->live.head = g->live.tail = z1;
|
|
|
|
|
|
g->zombies.head = g->zombies.tail = z2;
|
2000-12-23 23:00:23 +00:00
|
|
|
|
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
g->next = NULL;
|
|
|
|
|
|
g->flags = 0L;
|
1999-07-07 09:44:01 +00:00
|
|
|
|
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
/* [cmm] the UNBNDP check below is redundant but I like it. */
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (SCM_UNBNDP (greedy_p) || scm_is_true (greedy_p))
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
SET_GREEDY (g);
|
|
|
|
|
|
|
2000-12-05 03:04:20 +00:00
|
|
|
|
SCM_NEWSMOB (z, tc16_guardian, g);
|
1998-12-23 06:38:06 +00:00
|
|
|
|
|
2000-12-05 03:04:20 +00:00
|
|
|
|
return z;
|
1998-12-23 06:38:06 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1998-12-23 06:38:06 +00:00
|
|
|
|
|
2000-04-02 21:52:49 +00:00
|
|
|
|
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
SCM_DEFINE (scm_guardian_destroyed_p, "guardian-destroyed?", 1, 0, 0,
|
|
|
|
|
|
(SCM guardian),
|
2001-02-23 20:24:15 +00:00
|
|
|
|
"Return @code{#t} if @var{guardian} has been destroyed, otherwise @code{#f}.")
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
#define FUNC_NAME s_scm_guardian_destroyed_p
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM res = SCM_BOOL_F;
|
|
|
|
|
|
|
|
|
|
|
|
/* This critical section barrier will be replaced by a mutex. */
|
|
|
|
|
|
SCM_DEFER_INTS;
|
|
|
|
|
|
|
2004-07-06 10:59:25 +00:00
|
|
|
|
res = scm_from_bool (DESTROYED_P (GUARDIAN_DATA (guardian)));
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_ALLOW_INTS;
|
|
|
|
|
|
|
|
|
|
|
|
return res;
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
2001-02-23 20:24:15 +00:00
|
|
|
|
SCM_DEFINE (scm_guardian_greedy_p, "guardian-greedy?", 1, 0, 0,
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
(SCM guardian),
|
2001-11-11 15:01:52 +00:00
|
|
|
|
"Return @code{#t} if @var{guardian} is a greedy guardian, otherwise @code{#f}.")
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
#define FUNC_NAME s_scm_guardian_greedy_p
|
|
|
|
|
|
{
|
2004-07-06 10:59:25 +00:00
|
|
|
|
return scm_from_bool (GREEDY_P (GUARDIAN_DATA (guardian)));
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM_DEFINE (scm_destroy_guardian_x, "destroy-guardian!", 1, 0, 0,
|
|
|
|
|
|
(SCM guardian),
|
|
|
|
|
|
"Destroys @var{guardian}, by making it impossible to put any more\n"
|
|
|
|
|
|
"objects in it or get any objects from it. It also unguards any\n"
|
|
|
|
|
|
"objects guarded by @var{guardian}.")
|
|
|
|
|
|
#define FUNC_NAME s_scm_destroy_guardian_x
|
|
|
|
|
|
{
|
2001-09-13 22:29:44 +00:00
|
|
|
|
t_guardian *g = GUARDIAN_DATA (guardian);
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
|
|
|
|
|
|
/* This critical section barrier will be replaced by a mutex. */
|
|
|
|
|
|
SCM_DEFER_INTS;
|
|
|
|
|
|
|
|
|
|
|
|
if (DESTROYED_P (g))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_ALLOW_INTS;
|
* list.h (scm_list_1, scm_list_2, scm_list_3, scm_list_4, scm_list_5,
scm_list_n): New functions.
(SCM_LIST0, SCM_LIST1, SCM_LIST2, SCM_LIST3, SCM_LIST4, SCM_LIST5,
SCM_LIST6, SCM_LIST7, SCM_LIST8, SCM_LIST9, scm_listify): Deprecated.
(lots of files): Use the new functions.
* goops.c (CALL_GF1, CALL_GF2, CALL_GF3, CALL_GF4): Use scm_call_N.
* strings.c: #include "libguile/deprecation.h".
2001-06-28 01:11:59 +00:00
|
|
|
|
SCM_MISC_ERROR ("guardian is already destroyed: ~A",
|
|
|
|
|
|
scm_list_1 (guardian));
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (GREEDY_P (g))
|
|
|
|
|
|
{
|
|
|
|
|
|
/* clear the "greedily guarded" property of the objects */
|
|
|
|
|
|
SCM pair;
|
|
|
|
|
|
for (pair = g->live.head; pair != g->live.tail; pair = SCM_CDR (pair))
|
|
|
|
|
|
scm_hashq_remove_x (greedily_guarded_whash, SCM_CAR (pair));
|
|
|
|
|
|
for (pair = g->zombies.head; pair != g->zombies.tail; pair = SCM_CDR (pair))
|
|
|
|
|
|
scm_hashq_remove_x (greedily_guarded_whash, SCM_CAR (pair));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* empty the lists */
|
|
|
|
|
|
g->live.head = g->live.tail;
|
|
|
|
|
|
g->zombies.head = g->zombies.tail;
|
|
|
|
|
|
|
|
|
|
|
|
SET_DESTROYED (g);
|
|
|
|
|
|
|
|
|
|
|
|
SCM_ALLOW_INTS;
|
|
|
|
|
|
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
2000-12-05 03:04:20 +00:00
|
|
|
|
/* called before gc mark phase begins to initialise the live guardian list. */
|
2000-04-21 23:12:09 +00:00
|
|
|
|
static void *
|
2001-06-07 21:12:19 +00:00
|
|
|
|
guardian_gc_init (void *dummy1 SCM_UNUSED,
|
|
|
|
|
|
void *dummy2 SCM_UNUSED,
|
|
|
|
|
|
void *dummy3 SCM_UNUSED)
|
1998-12-23 06:38:06 +00:00
|
|
|
|
{
|
2000-12-23 23:00:23 +00:00
|
|
|
|
greedy_guardians = sharing_guardians = NULL;
|
2000-04-21 23:12:09 +00:00
|
|
|
|
|
|
|
|
|
|
return 0;
|
1998-12-23 06:38:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2000-12-23 23:00:23 +00:00
|
|
|
|
static void
|
2001-09-13 22:29:44 +00:00
|
|
|
|
mark_dependencies_in_tconc (t_tconc *tc)
|
2000-12-23 23:00:23 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM pair, next_pair;
|
|
|
|
|
|
SCM *prev_ptr;
|
|
|
|
|
|
|
2000-12-28 14:26:12 +00:00
|
|
|
|
/* scan the list for unmarked objects, and mark their
|
2000-12-23 23:00:23 +00:00
|
|
|
|
dependencies */
|
2000-12-28 14:26:12 +00:00
|
|
|
|
for (pair = tc->head, prev_ptr = &tc->head;
|
|
|
|
|
|
! SCM_EQ_P (pair, tc->tail);
|
2000-12-23 23:00:23 +00:00
|
|
|
|
pair = next_pair)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM obj = SCM_CAR (pair);
|
|
|
|
|
|
next_pair = SCM_CDR (pair);
|
|
|
|
|
|
|
2002-08-04 00:17:18 +00:00
|
|
|
|
if (! SCM_GC_MARK_P (obj))
|
2000-12-23 23:00:23 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* a candidate for finalizing */
|
|
|
|
|
|
scm_gc_mark_dependencies (obj);
|
|
|
|
|
|
|
2002-08-04 00:17:18 +00:00
|
|
|
|
if (SCM_GC_MARK_P (obj))
|
2000-12-23 23:00:23 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* uh oh. a cycle. transfer this object (the
|
|
|
|
|
|
spine cell, to be exact) to
|
|
|
|
|
|
self_centered_zombies, so we'll be able to
|
|
|
|
|
|
complain about it later. */
|
|
|
|
|
|
*prev_ptr = next_pair;
|
2002-08-04 00:17:18 +00:00
|
|
|
|
SCM_SET_GC_MARK (pair);
|
2001-09-13 21:58:15 +00:00
|
|
|
|
SCM_SETCDR (pair, self_centered_zombies);
|
|
|
|
|
|
self_centered_zombies = pair;
|
2000-12-23 23:00:23 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
/* see if this is a guardian. if yes, list it (but don't
|
|
|
|
|
|
mark it yet). */
|
|
|
|
|
|
if (GUARDIAN_P (obj))
|
2001-09-13 22:29:44 +00:00
|
|
|
|
add_to_live_list (GUARDIAN_DATA (obj));
|
2000-12-23 23:00:23 +00:00
|
|
|
|
|
|
|
|
|
|
prev_ptr = SCM_CDRLOC (pair);
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2000-12-28 14:26:12 +00:00
|
|
|
|
static void
|
2001-09-13 22:29:44 +00:00
|
|
|
|
mark_dependencies (t_guardian *g)
|
2000-12-28 14:26:12 +00:00
|
|
|
|
{
|
|
|
|
|
|
mark_dependencies_in_tconc (&g->zombies);
|
|
|
|
|
|
mark_dependencies_in_tconc (&g->live);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2000-12-23 23:00:23 +00:00
|
|
|
|
static void
|
2001-09-13 22:29:44 +00:00
|
|
|
|
mark_and_zombify (t_guardian *g)
|
2000-12-23 23:00:23 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM tconc_tail = g->live.tail;
|
|
|
|
|
|
SCM *prev_ptr = &g->live.head;
|
|
|
|
|
|
SCM pair = g->live.head;
|
|
|
|
|
|
|
|
|
|
|
|
while (! SCM_EQ_P (pair, tconc_tail))
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM next_pair = SCM_CDR (pair);
|
|
|
|
|
|
|
2002-08-04 00:17:18 +00:00
|
|
|
|
if (!SCM_GC_MARK_P (SCM_CAR (pair)))
|
2000-12-23 23:00:23 +00:00
|
|
|
|
{
|
|
|
|
|
|
/* got you, zombie! */
|
|
|
|
|
|
|
|
|
|
|
|
/* out of the live list! */
|
|
|
|
|
|
*prev_ptr = next_pair;
|
|
|
|
|
|
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
if (GREEDY_P (g))
|
2000-12-23 23:00:23 +00:00
|
|
|
|
/* if the guardian is greedy, mark this zombie now. this
|
|
|
|
|
|
way it won't be zombified again this time around. */
|
2002-08-04 00:17:18 +00:00
|
|
|
|
SCM_SET_GC_MARK (SCM_CAR (pair));
|
2000-12-23 23:00:23 +00:00
|
|
|
|
|
|
|
|
|
|
/* into the zombie list! */
|
|
|
|
|
|
TCONC_IN (g->zombies, SCM_CAR (pair), pair);
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
prev_ptr = SCM_CDRLOC (pair);
|
|
|
|
|
|
|
|
|
|
|
|
pair = next_pair;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Mark the cells of the live list (yes, the cells in the list, we
|
|
|
|
|
|
don't care about objects pointed to by the list cars, since we
|
|
|
|
|
|
know they are already marked). */
|
|
|
|
|
|
for (pair = g->live.head; !SCM_NULLP (pair); pair = SCM_CDR (pair))
|
2002-08-04 00:17:18 +00:00
|
|
|
|
SCM_SET_GC_MARK (pair);
|
2000-12-23 23:00:23 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2000-04-02 21:52:49 +00:00
|
|
|
|
|
|
|
|
|
|
/* this is called by the garbage collector between the mark and sweep
|
|
|
|
|
|
phases. for each marked guardian, it moves any unmarked object in
|
|
|
|
|
|
its live list (tconc) to its zombie list (tconc). */
|
2000-04-21 23:12:09 +00:00
|
|
|
|
static void *
|
2001-06-07 21:12:19 +00:00
|
|
|
|
guardian_zombify (void *dummy1 SCM_UNUSED,
|
|
|
|
|
|
void *dummy2 SCM_UNUSED,
|
|
|
|
|
|
void *dummy3 SCM_UNUSED)
|
1998-12-23 06:38:06 +00:00
|
|
|
|
{
|
2001-09-13 22:29:44 +00:00
|
|
|
|
t_guardian *last_greedy_guardian = NULL;
|
|
|
|
|
|
t_guardian *last_sharing_guardian = NULL;
|
|
|
|
|
|
t_guardian *first_greedy_guardian = NULL;
|
|
|
|
|
|
t_guardian *first_sharing_guardian = NULL;
|
|
|
|
|
|
t_guardian *g;
|
2000-12-23 23:00:23 +00:00
|
|
|
|
|
|
|
|
|
|
/* First, find all newly unreachable objects and mark their
|
|
|
|
|
|
dependencies.
|
|
|
|
|
|
|
|
|
|
|
|
Note that new guardians may be stuck on the end of the live
|
|
|
|
|
|
guardian lists as we run this loop, since guardians might be
|
|
|
|
|
|
guarded too. When we mark a guarded guardian, its mark function
|
|
|
|
|
|
sticks in the appropriate live guardian list. The loop
|
|
|
|
|
|
terminates when no new guardians are found. */
|
2000-04-02 21:52:49 +00:00
|
|
|
|
|
2000-04-03 13:55:54 +00:00
|
|
|
|
do {
|
2000-12-23 23:00:23 +00:00
|
|
|
|
first_greedy_guardian = greedy_guardians;
|
|
|
|
|
|
first_sharing_guardian = sharing_guardians;
|
|
|
|
|
|
|
|
|
|
|
|
for (g = greedy_guardians; g != last_greedy_guardian;
|
|
|
|
|
|
g = g->next)
|
|
|
|
|
|
mark_dependencies (g);
|
|
|
|
|
|
for (g = sharing_guardians; g != last_sharing_guardian;
|
|
|
|
|
|
g = g->next)
|
|
|
|
|
|
mark_dependencies (g);
|
|
|
|
|
|
|
|
|
|
|
|
last_greedy_guardian = first_greedy_guardian;
|
|
|
|
|
|
last_sharing_guardian = first_sharing_guardian;
|
|
|
|
|
|
} while (first_greedy_guardian != greedy_guardians
|
|
|
|
|
|
|| first_sharing_guardian != sharing_guardians);
|
2000-04-03 13:55:54 +00:00
|
|
|
|
|
2000-12-23 23:00:23 +00:00
|
|
|
|
/* now, scan all the guardians that are currently known to be live
|
|
|
|
|
|
and move their unmarked objects to zombie lists. */
|
|
|
|
|
|
|
|
|
|
|
|
for (g = greedy_guardians; g; g = g->next)
|
|
|
|
|
|
{
|
|
|
|
|
|
mark_and_zombify (g);
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
CLR_LISTED (g);
|
2000-12-23 23:00:23 +00:00
|
|
|
|
}
|
|
|
|
|
|
for (g = sharing_guardians; g; g = g->next)
|
|
|
|
|
|
{
|
|
|
|
|
|
mark_and_zombify (g);
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
CLR_LISTED (g);
|
2000-12-23 23:00:23 +00:00
|
|
|
|
}
|
2000-04-21 23:12:09 +00:00
|
|
|
|
|
2000-12-23 23:00:23 +00:00
|
|
|
|
/* Preserve the zombies in their undead state, by marking to prevent
|
|
|
|
|
|
collection. */
|
|
|
|
|
|
for (g = greedy_guardians; g; g = g->next)
|
|
|
|
|
|
scm_gc_mark (g->zombies.head);
|
|
|
|
|
|
for (g = sharing_guardians; g; g = g->next)
|
|
|
|
|
|
scm_gc_mark (g->zombies.head);
|
|
|
|
|
|
|
2000-04-21 23:12:09 +00:00
|
|
|
|
return 0;
|
1998-12-23 06:38:06 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2000-12-23 23:00:23 +00:00
|
|
|
|
static void *
|
2001-06-07 21:12:19 +00:00
|
|
|
|
whine_about_self_centered_zombies (void *dummy1 SCM_UNUSED,
|
|
|
|
|
|
void *dummy2 SCM_UNUSED,
|
|
|
|
|
|
void *dummy3 SCM_UNUSED)
|
2000-12-23 23:00:23 +00:00
|
|
|
|
{
|
2001-09-13 21:58:15 +00:00
|
|
|
|
if (!SCM_NULLP (self_centered_zombies))
|
2000-12-23 23:00:23 +00:00
|
|
|
|
{
|
|
|
|
|
|
SCM pair;
|
|
|
|
|
|
|
|
|
|
|
|
scm_puts ("** WARNING: the following guarded objects were unguarded due to cycles:",
|
|
|
|
|
|
scm_cur_errp);
|
|
|
|
|
|
scm_newline (scm_cur_errp);
|
2001-09-13 21:58:15 +00:00
|
|
|
|
for (pair = self_centered_zombies;
|
|
|
|
|
|
!SCM_NULLP (pair); pair = SCM_CDR (pair))
|
2000-12-23 23:00:23 +00:00
|
|
|
|
{
|
|
|
|
|
|
scm_display (SCM_CAR (pair), scm_cur_errp);
|
|
|
|
|
|
scm_newline (scm_cur_errp);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2001-09-13 21:58:15 +00:00
|
|
|
|
self_centered_zombies = SCM_EOL;
|
2000-12-23 23:00:23 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
}
|
1998-12-23 06:38:06 +00:00
|
|
|
|
|
|
|
|
|
|
void
|
2000-12-23 23:00:23 +00:00
|
|
|
|
scm_init_guardians ()
|
1998-12-23 06:38:06 +00:00
|
|
|
|
{
|
2000-12-05 03:04:20 +00:00
|
|
|
|
tc16_guardian = scm_make_smob_type ("guardian", 0);
|
|
|
|
|
|
scm_set_smob_mark (tc16_guardian, guardian_mark);
|
|
|
|
|
|
scm_set_smob_free (tc16_guardian, guardian_free);
|
|
|
|
|
|
scm_set_smob_print (tc16_guardian, guardian_print);
|
* guardians.c (F_GREEDY, F_LISTED, F_DESTROYED, GREEDY_P,
SET_GREEDY, LISTED_P, SET_LISTED, CLR_LISTED, DESTROYED_P,
SET_DESTROYED): new defines/macros.
(GUARDIAN_LIVE, GUARDIAN_ZOMBIES, GUARDIAN_NEXT): deleted.
(add_to_live_list): takes a `guardian_t *' now, not SCM.
(guardian_print): print more info.
(guardian_apply): check if the guardian is destroyed, and throw an
error if so. take one more optional argument `throw_p'.
(scm_guard): depending on the value of `throw_p', return a boolean
result.
(scm_get_one_zombie): remove redundant property test.
(guardian_t): represent the various (currently 3, I hope nothing
more gets added) boolean fields as bit flags.
(scm_guardian_destroyed_p, scm_guardian_greedy_p): new predicates.
(scm_destroy_guardian_x): new procedure.
* guardians.h: added prototypes for `scm_guardian_greedy_p' and
`scm_guardian_destroyed_p'. changed prototype for `scm_guard'.
2001-01-04 13:00:31 +00:00
|
|
|
|
scm_set_smob_apply (tc16_guardian, guardian_apply, 0, 2, 0);
|
2000-12-05 03:04:20 +00:00
|
|
|
|
|
|
|
|
|
|
scm_c_hook_add (&scm_before_mark_c_hook, guardian_gc_init, 0, 0);
|
|
|
|
|
|
scm_c_hook_add (&scm_before_sweep_c_hook, guardian_zombify, 0, 0);
|
1998-12-23 06:38:06 +00:00
|
|
|
|
|
2001-09-13 21:58:15 +00:00
|
|
|
|
scm_gc_register_root (&self_centered_zombies);
|
2000-12-23 23:00:23 +00:00
|
|
|
|
scm_c_hook_add (&scm_after_gc_c_hook,
|
|
|
|
|
|
whine_about_self_centered_zombies, 0, 0);
|
|
|
|
|
|
|
2000-12-29 22:18:06 +00:00
|
|
|
|
greedily_guarded_whash =
|
2004-07-23 15:43:02 +00:00
|
|
|
|
scm_permanent_object (scm_make_doubly_weak_hash_table (scm_from_int (31)));
|
2000-12-29 22:18:06 +00:00
|
|
|
|
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/guardians.x"
|
1998-12-23 06:38:06 +00:00
|
|
|
|
}
|
2000-03-19 19:01:16 +00:00
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
Local Variables:
|
|
|
|
|
|
c-file-style: "gnu"
|
|
|
|
|
|
End:
|
|
|
|
|
|
*/
|