mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-06 15:40:29 +02:00
Code Activity

* guardians.c (guardian_t): `next' - new field to be used for

Browse source 
chaining the live guardians in a single-linked list during the GC
mark phase.
(GUARDIAN_NEXT): convenience macro to access the `next' field.
(guardians, guardians_size, n_guardians): deleted.
(first_live_guardian, current_link_field): new globals used to
point to the head of the live guardian list and current `next'
field, respectively.
(g_mark): append the guardian to the live guardian list.
(scm_guardian_gc_init): zero the live guardian list.
(scm_guardian_zombify): iterate through the live guardian list.
This commit is contained in:
Jim Blandy 1999-06-19 16:11:38 +00:00
parent 2206b7fc99
commit 01a119acae
1 changed files with 17 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

48
libguile/guardians.c
View file

@ -93,33 +93,24 @@ typedef struct guardian_t
{ {
tconc_t live; tconc_t live;
tconc_t zombies; tconc_t zombies;
struct guardian_t *next;
} guardian_t; } guardian_t;
#define GUARDIAN(x) ((guardian_t *) SCM_CDR (x)) #define GUARDIAN(x) ((guardian_t *) SCM_CDR (x))
#define GUARDIAN_LIVE(x) (GUARDIAN (x)->live) #define GUARDIAN_LIVE(x) (GUARDIAN (x)->live)
#define GUARDIAN_ZOMBIES(x) (GUARDIAN (x)->zombies) #define GUARDIAN_ZOMBIES(x) (GUARDIAN (x)->zombies)
#define GUARDIAN_NEXT(x) (GUARDIAN (x)->next)
static SCM *guardians = NULL; static guardian_t *first_live_guardian = NULL;
static scm_sizet guardians_size = 0; static guardian_t **current_link_field = NULL;
static scm_sizet n_guardians;
static SCM static SCM
g_mark (SCM ptr) g_mark (SCM ptr)
{ {
if (n_guardians >= guardians_size) *current_link_field = GUARDIAN (ptr);
{ current_link_field = &GUARDIAN_NEXT (ptr);
SCM_SYSCALL (guardians = GUARDIAN_NEXT (ptr) = NULL;
(SCM *) realloc((char *) guardians,
sizeof (SCM) * (guardians_size *= 2)));
if (!guardians)
{
scm_puts ("active guardian table", scm_cur_errp);
scm_puts ("\nFATAL ERROR DURING CRITICAL SCM_CODE SECTION\n",
scm_cur_errp);
exit (SCM_EXIT_FAILURE);
}
}
guardians[n_guardians++] = ptr;
/* Can't mark zombies here since they can refer to objects which are /* Can't mark zombies here since they can refer to objects which are
living dead, thereby preventing them to join the zombies. */ living dead, thereby preventing them to join the zombies. */
return SCM_BOOL_F; return SCM_BOOL_F;
@ -195,23 +186,23 @@ scm_make_guardian ()
void void
scm_guardian_gc_init() scm_guardian_gc_init()
{ {
n_guardians = 0; current_link_field = &first_live_guardian;
first_live_guardian = NULL;
} }
void void
scm_guardian_zombify () scm_guardian_zombify ()
{ {
int i; guardian_t *g;
for (i = 0; i < n_guardians; ++i) for (g = first_live_guardian; g; g = g->next)
{ {
SCM g = guardians[i];
/* Loop through the live list and /* Loop through the live list and
1. move unmarked objects to the zombies tconc 1. move unmarked objects to the zombies tconc
2. mark the live tconc. 2. mark the live tconc.
*/ */
SCM tconc_tail = GUARDIAN_LIVE (g).tail; SCM tconc_tail = g->live.tail;
SCM prev_pair = SCM_BOOL_F; SCM prev_pair = SCM_BOOL_F;
SCM pair = GUARDIAN_LIVE (g).head; SCM pair = g->live.head;
while (pair != tconc_tail) while (pair != tconc_tail)
{ {
SCM next_pair = SCM_CDR (pair); SCM next_pair = SCM_CDR (pair);
@ -222,13 +213,13 @@ scm_guardian_zombify ()
/* out of the live list! */ /* out of the live list! */
if (SCM_FALSEP (prev_pair)) if (SCM_FALSEP (prev_pair))
GUARDIAN_LIVE (g).head = next_pair; g->live.head = next_pair;
else else
/* mark previous pair */ /* mark previous pair */
SCM_SETCDR (prev_pair, next_pair | 1); SCM_SETCDR (prev_pair, next_pair | 1);
/* to the zombie list! */ /* to the zombie list! */
TCONC_IN (GUARDIAN_ZOMBIES (g), SCM_CAR (pair), pair); TCONC_IN (g->zombies, SCM_CAR (pair), pair);
} }
else else
{ {
@ -246,7 +237,7 @@ scm_guardian_zombify ()
/* mark live list tail */ /* mark live list tail */
SCM_SETOR_CDR (tconc_tail, 1); SCM_SETOR_CDR (tconc_tail, 1);
scm_gc_mark (GUARDIAN_ZOMBIES (g).head); scm_gc_mark (g->zombies.head);
} }
} }
@ -287,11 +278,6 @@ void
scm_init_guardian() scm_init_guardian()
{ {
scm_tc16_guardian = scm_newsmob (&g_smob); scm_tc16_guardian = scm_newsmob (&g_smob);
if (!(guardians = (SCM *) malloc ((guardians_size = 32) * sizeof (SCM))))
{
fprintf (stderr, "trouble!\n");
exit (SCM_EXIT_FAILURE);
}
guard1 = scm_make_subr_opt ("guardian", scm_tc7_subr_2o, guard, 0); guard1 = scm_make_subr_opt ("guardian", scm_tc7_subr_2o, guard, 0);
#include "guardians.x" #include "guardians.x"