mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

Removed some stupid code.

Browse source
This commit is contained in:
Mikael Djurfeldt 2000-03-15 15:19:50 +00:00
parent 4fdb0ae271
commit dd45c0dfdb
3 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libguile/gc.c
View file

@ -152,11 +152,11 @@
#ifdef GUILE_NEW_GC_SCHEME #ifdef GUILE_NEW_GC_SCHEME
SCM scm_freelist = SCM_EOL; SCM scm_freelist = SCM_EOL;
scm_freelist_t scm_master_freelist = { scm_freelist_t scm_master_freelist = {
SCM_EOL, 0, SCM_EOL, SCM_EOL, 0, 0, 0, 1, 0, 0 SCM_EOL, 0, SCM_EOL, SCM_EOL, 0, 0, 1, 0, 0
}; };
SCM scm_freelist2 = SCM_EOL; SCM scm_freelist2 = SCM_EOL;
scm_freelist_t scm_master_freelist2 = { scm_freelist_t scm_master_freelist2 = {
SCM_EOL, 0, SCM_EOL, SCM_EOL, 0, 0, 0, 2, 0, 0 SCM_EOL, 0, SCM_EOL, SCM_EOL, 0, 0, 2, 0, 0
}; };
#else #else
scm_freelist_t scm_freelist = { SCM_EOL, 1, 0, 0 }; scm_freelist_t scm_freelist = { SCM_EOL, 1, 0, 0 };
@ -571,7 +571,7 @@ scm_gc_for_newcell (scm_freelist_t *master, SCM *freelist)
scm_igc ("cells"); scm_igc ("cells");
else if (SCM_NULLP (master->clusters)) else if (SCM_NULLP (master->clusters))
alloc_some_heap (master); alloc_some_heap (master);
else if (master->triggerp && SCM_NULLP (SCM_CDR (master->clusters))) else if (SCM_NULLP (SCM_CDR (master->clusters)))
/* we are satisfied; GC instead of alloc next time around */ /* we are satisfied; GC instead of alloc next time around */
master->triggeredp = 1; master->triggeredp = 1;
--scm_ints_disabled; --scm_ints_disabled;
@ -2213,8 +2213,8 @@ make_initial_segment (scm_sizet init_heap_size, scm_freelist_t *freelistp)
#ifdef GUILE_NEW_GC_SCHEME #ifdef GUILE_NEW_GC_SCHEME
int int
scm_init_storage (scm_sizet init_heap_size, int triggerp, int gc_trigger, scm_init_storage (scm_sizet init_heap_size, int gc_trigger,
scm_sizet init_heap2_size, int triggerp2, int gc_trigger2) scm_sizet init_heap2_size, int gc_trigger2)
#else #else
int int
scm_init_storage (scm_sizet init_heap_size, scm_sizet init_heap2_size) scm_init_storage (scm_sizet init_heap_size, scm_sizet init_heap2_size)
@ -2231,7 +2231,6 @@ scm_init_storage (scm_sizet init_heap_size, scm_sizet init_heap2_size)
scm_freelist = SCM_EOL; scm_freelist = SCM_EOL;
scm_master_freelist.clusters = SCM_EOL; scm_master_freelist.clusters = SCM_EOL;
scm_master_freelist.triggeredp = 0; scm_master_freelist.triggeredp = 0;
scm_master_freelist.triggerp = triggerp;
scm_master_freelist.gc_trigger scm_master_freelist.gc_trigger
= gc_trigger ? gc_trigger : SCM_GC_TRIGGER; = gc_trigger ? gc_trigger : SCM_GC_TRIGGER;
scm_master_freelist.span = 1; scm_master_freelist.span = 1;
@ -2248,7 +2247,6 @@ scm_init_storage (scm_sizet init_heap_size, scm_sizet init_heap2_size)
scm_freelist2 = SCM_EOL; scm_freelist2 = SCM_EOL;
scm_master_freelist2.clusters = SCM_EOL; scm_master_freelist2.clusters = SCM_EOL;
scm_master_freelist2.triggeredp = 0; scm_master_freelist2.triggeredp = 0;
scm_master_freelist2.triggerp = triggerp2;
scm_master_freelist2.gc_trigger scm_master_freelist2.gc_trigger
= gc_trigger2 ? gc_trigger2 : SCM_GC_TRIGGER2; = gc_trigger2 ? gc_trigger2 : SCM_GC_TRIGGER2;
scm_master_freelist2.span = 2; scm_master_freelist2.span = 2;

12
libguile/gc.h
View file

@ -77,10 +77,10 @@ typedef struct scm_freelist_t {
SCM *clustertail; SCM *clustertail;
/* GC trigger */ /* GC trigger */
int triggeredp; int triggeredp;
/* trigger GC ? */ /* minimum number of objects allocated before GC is triggered and
int triggerp; * cluster size. These two concepts should be divorced when we go
/* minimum number of objects allocated before GC is triggered * to POSIX threads.
and cluster size. */ */
int gc_trigger; int gc_trigger;
#endif #endif
/* number of cells per object on this list */ /* number of cells per object on this list */
@ -150,8 +150,8 @@ extern SCM scm_permanent_object (SCM obj);
extern SCM scm_protect_object (SCM obj); extern SCM scm_protect_object (SCM obj);
extern SCM scm_unprotect_object (SCM obj); extern SCM scm_unprotect_object (SCM obj);
#ifdef GUILE_NEW_GC_SCHEME #ifdef GUILE_NEW_GC_SCHEME
extern int scm_init_storage (scm_sizet init_heap_size, int tp, int trig, extern int scm_init_storage (scm_sizet init_heap_size, int trig,
scm_sizet init_heap2_size, int tp2, int trig2); scm_sizet init_heap2_size, int trig2);
#else #else
extern int scm_init_storage (scm_sizet init_heap_size, extern int scm_init_storage (scm_sizet init_heap_size,
scm_sizet init_heap2_size); scm_sizet init_heap2_size);

16
libguile/init.c
View file

@ -475,18 +475,10 @@ scm_boot_guile_1 (SCM_STACKITEM *base, struct main_func_closure *closure)
scm_smob_prehistory (); scm_smob_prehistory ();
scm_tables_prehistory (); scm_tables_prehistory ();
#if defined (GUILE_DEBUG) && defined (GUILE_NEW_GC_SCHEME) #if defined (GUILE_DEBUG) && defined (GUILE_NEW_GC_SCHEME)
{ scm_init_storage (scm_i_getenv_int ("GUILE_INIT_HEAP_SIZE", 0),
int gc_trigger = scm_i_getenv_int ("GUILE_GC_TRIGGER", 0); scm_i_getenv_int ("GUILE_GC_TRIGGER", 0),
int gc_trigger2 = scm_i_getenv_int ("GUILE_GC_TRIGGER2", 0); scm_i_getenv_int ("GUILE_INIT_HEAP_SIZE2", 40000),
scm_init_storage (scm_i_getenv_int ("GUILE_INIT_HEAP_SIZE", 0), scm_i_getenv_int ("GUILE_GC_TRIGGER2", 0));
/* default: trigger */
gc_trigger >= 0 ? 1 : 0,
gc_trigger < 0 ? - gc_trigger : gc_trigger,
scm_i_getenv_int ("GUILE_INIT_HEAP_SIZE2", 40000),
/* default: don't trigger GC */
gc_trigger2 > 0 ? 1 : 0,
gc_trigger2 < 0 ? - gc_trigger2 : gc_trigger2);
}
#else #else
scm_init_storage (0, 0); scm_init_storage (0, 0);
#endif #endif