summaryrefslogtreecommitdiff
path: root/libguile/gc.h
diff options
context:
space:
mode:
authorMichael Livshin <mlivshin@bigfoot.com>2000-03-18 11:09:41 +0000
committerMichael Livshin <mlivshin@bigfoot.com>2000-03-18 11:09:41 +0000
commita00c95d9c6ef0e219313ed61f8938a2b9ba23d06 (patch)
treeb783e31559b0bfd5ade63e8a97f28d0f4dd47c67 /libguile/gc.h
parent28b3236d36f7747e6a722a1178fa40eb550b5636 (diff)
downloadguile-a00c95d9c6ef0e219313ed61f8938a2b9ba23d06.tar.gz
* tags.h: (SCM_DOUBLE_CELLP, SCM_NDOUBLE_CELLP): new macros.
* gc.h: (typedef struct scm_freelist_t) remove from here. * gc.c: (CELL_UP, CELL_DN) make these macros take additional parameter (the span). (CLUSTER_SIZE_IN_BYTES, ALIGNMENT_SLACK) new macros. (typedef struct scm_freelist_t) move here from gc.h, it had no business being externally visible. (typedef struct scm_heap_seg_data_t) renamed from scm_heap_seg_data, to be style-compliant. (scm_mark_locations) if the possible pointer points to a multy-cell, check that it's properly aligned. (init_heap_seg) alighn multy-cells properly, work with the assumption that the segment size divides cleanly by cluster size (so that there's no spill). (round_to_cluster_size) new function. (alloc_some_heap, make_initial_segment) use round_to_cluster_size to satisfy the new init_heap_seg invariant.
Diffstat (limited to 'libguile/gc.h')
-rw-r--r--libguile/gc.h57
1 files changed, 12 insertions, 45 deletions
diff --git a/libguile/gc.h b/libguile/gc.h
index 72d697eeb..cb64d7d18 100644
--- a/libguile/gc.h
+++ b/libguile/gc.h
@@ -3,17 +3,17 @@
#ifndef GCH
#define GCH
/* Copyright (C) 1995, 96, 98, 99, 2000 Free Software Foundation, Inc.
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
- *
+ *
* This program 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 General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this software; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
@@ -60,56 +60,23 @@
: SCM_GCMARKP(x))
#define SCM_NMARKEDP(x) (!SCM_MARKEDP(x))
-extern struct scm_heap_seg_data *scm_heap_table;
+extern struct scm_heap_seg_data_t *scm_heap_table;
extern int scm_n_heap_segs;
extern int scm_take_stdin;
extern int scm_block_gc;
extern int scm_gc_heap_lock;
-typedef struct scm_freelist_t {
- /* collected cells */
- SCM cells;
-#ifdef GUILE_NEW_GC_SCHEME
- /* number of cells left to collect before cluster is full */
- unsigned int left_to_collect;
- /* a list of freelists, each of size gc_trigger,
- except the last one which may be shorter */
- SCM clusters;
- SCM *clustertail;
- /* this is the number of cells in each cluster, including the spine cell */
- int cluster_size;
- /* set to grow the heap when we run out of clusters
- */
- int grow_heap_p;
- /* minimum number of objects allocated before GC is triggered
- */
- int gc_trigger;
- /* defines gc_trigger as percent of heap size
- * 0 => constant trigger
- */
- int gc_trigger_fraction;
-#endif
- /* number of cells per object on this list */
- int span;
- /* number of collected cells during last GC */
- int collected;
- /* total number of cells in heap segments
- * belonging to this list.
- */
- int heap_size;
-} scm_freelist_t;
-
extern scm_sizet scm_max_segment_size;
extern SCM_CELLPTR scm_heap_org;
#ifdef GUILE_NEW_GC_SCHEME
extern SCM scm_freelist;
-extern scm_freelist_t scm_master_freelist;
+extern struct scm_freelist_t scm_master_freelist;
extern SCM scm_freelist2;
-extern scm_freelist_t scm_master_freelist2;
+extern struct scm_freelist_t scm_master_freelist2;
#else
-extern scm_freelist_t scm_freelist;
-extern scm_freelist_t scm_freelist2;
+extern struct scm_freelist_t scm_freelist;
+extern struct scm_freelist_t scm_freelist2;
#endif
extern unsigned long scm_gc_cells_collected;
extern unsigned long scm_gc_malloc_collected;
@@ -136,14 +103,14 @@ extern SCM scm_gc_stats (void);
extern void scm_gc_start (const char *what);
extern void scm_gc_end (void);
extern SCM scm_gc (void);
-extern void scm_gc_for_alloc (scm_freelist_t *freelist);
+extern void scm_gc_for_alloc (struct scm_freelist_t *freelist);
#ifdef GUILE_NEW_GC_SCHEME
-extern SCM scm_gc_for_newcell (scm_freelist_t *master, SCM *freelist);
+extern SCM scm_gc_for_newcell (struct scm_freelist_t *master, SCM *freelist);
#if 0
-extern void scm_alloc_cluster (scm_freelist_t *master);
+extern void scm_alloc_cluster (struct scm_freelist_t *master);
#endif
#else
-extern SCM scm_gc_for_newcell (scm_freelist_t *freelist);
+extern SCM scm_gc_for_newcell (struct scm_freelist_t *freelist);
#endif
extern void scm_igc (const char *what);
extern void scm_gc_mark (SCM p);