Permalink
Browse files

Removed everything related to GMS/IMS ... bye bye

git-svn-id: https://svn.parrot.org/parrot/branches/gc-refactor@41167 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
1 parent cfe7d60 commit d10465e21b54c0bb6b156ac390699912366f2835 jrtayloriv committed Sep 8, 2009
Showing with 18 additions and 3,272 deletions.
  1. +1 −3 MANIFEST
  2. +0 −6 config/gen/makefiles/root.in
  3. +3 −34 include/parrot/settings.h
  4. +1 −2 src/gc/alloc_resources.c
  5. +0 −6 src/gc/api.c
  6. +13 −13 src/gc/gc_private.h
  7. +0 −1,974 src/gc/generational_ms.c
  8. +0 −82 src/gc/generational_ms.h
  9. +0 −1,152 src/gc/incremental_ms.c
View
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Sep 7 21:02:37 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Tue Sep 8 22:16:59 2009 UT
#
# See below for documentation on the format of this file.
#
@@ -1284,8 +1284,6 @@ src/gc/gc_inf.c []
src/gc/gc_malloc.c []
src/gc/gc_ms.c []
src/gc/gc_private.h []
-src/gc/generational_ms.c []
-src/gc/incremental_ms.c []
src/gc/malloc.c []
src/gc/malloc_trace.c []
src/gc/mark_sweep.c []
@@ -426,8 +426,6 @@ INTERP_O_FILES := \
$(SRC_DIR)/extend_vtable$(O) \
$(SRC_DIR)/gc/alloc_memory$(O) \
$(SRC_DIR)/gc/api$(O) \
- $(SRC_DIR)/gc/generational_ms$(O) \
- $(SRC_DIR)/gc/incremental_ms$(O) \
$(SRC_DIR)/gc/gc_ms$(O) \
$(SRC_DIR)/gc/gc_inf$(O) \
$(SRC_DIR)/gc/mark_sweep$(O) \
@@ -1100,10 +1098,6 @@ $(SRC_DIR)/gc/gc_inf$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/gc/gc_inf.c
$(SRC_DIR)/gc/api$(O) : $(GENERAL_H_FILES) $(SRC_DIR)/gc/gc_private.h
-$(SRC_DIR)/gc/generational_ms$(O) : $(GENERAL_H_FILES)
-
-$(SRC_DIR)/gc/incremental_ms$(O) : $(GENERAL_H_FILES)
-
$(SRC_DIR)/gc/alloc_resources$(O) : $(GENERAL_H_FILES)
$(SRC_DIR)/gc/res_lea$(O) : $(GENERAL_H_FILES)
View
@@ -35,42 +35,11 @@
#endif /* DISABLE_GC_DEBUG */
/*
- * GC_SUBSYSTEM selection
- * 0 ... MS stop-the-world mark & sweep
- * 1 ... IMS incremental mark & sweep
- * 2 ... GMS generational mark & sweep
- * 3 ... INF infinite memory "collector"
- *
- * Please note that only 0 and 3 currently work (and INF doesn't really
- * "work").
+ * GC_DEFAULT_TYPE selection
+ * MS -- stop-the-world mark & sweep
+ * INF -- infinite memory "collector"
*/
#define PARROT_GC_DEFAULT_TYPE MS
-#define PARROT_GC_SUBSYSTEM 0
-
-#if PARROT_GC_SUBSYSTEM == 0
-# define PARROT_GC_MS 1
-# define PARROT_GC_IMS 0
-# define PARROT_GC_GMS 0
-# define PARROT_GC_INF 0
-#endif
-#if PARROT_GC_SUBSYSTEM == 1
-# define PARROT_GC_MS 0
-# define PARROT_GC_IMS 1
-# define PARROT_GC_GMS 0
-# define PARROT_GC_INF 0
-#endif
-#if PARROT_GC_SUBSYSTEM == 2
-# define PARROT_GC_MS 0
-# define PARROT_GC_IMS 0
-# define PARROT_GC_GMS 1
-# define PARROT_GC_INF 0
-#endif
-#if PARROT_GC_SUBSYSTEM == 3
-# define PARROT_GC_MS 0
-# define PARROT_GC_IMS 0
-# define PARROT_GC_GMS 0
-# define PARROT_GC_INF 1
-#endif
/*
* JIT/i386 can use the CGP run core for external functions instead
View
@@ -217,8 +217,7 @@ mem_allocate(PARROT_INTERP, size_t size, ARGMOD(Variable_Size_Pool *pool))
&& interp->mem_pools->mem_allocs_since_last_collect) {
Parrot_gc_mark_and_sweep(interp, GC_trace_stack_FLAG);
- if ((interp->gc_sys->sys_type != IMS) &&
- (interp->gc_sys->sys_type != INF)) {
+ if (interp->gc_sys->sys_type != INF) {
/* Compact the pool if allowed and worthwhile */
if (pool->compact) {
/* don't bother reclaiming if it's only a small amount */
View
@@ -275,12 +275,6 @@ Parrot_gc_initialize(PARROT_INTERP, ARGIN(void *stacktop))
case MS:
Parrot_gc_ms_init(interp);
break;
- case IMS:
- Parrot_gc_ims_init(interp);
- break;
- case GMS:
- Parrot_gc_gms_init(interp);
- break;
case INF:
Parrot_gc_inf_init(interp);
break;
View
@@ -17,8 +17,6 @@ Parrot.
#define PARROT_GC_PRIVATE_H_GUARD
#include "parrot/settings.h"
-#include "generational_ms.h"
-
#if ! DISABLE_GC_DEBUG
/* Set when walking the system stack. Defined in src/gc/system.c */
@@ -96,17 +94,13 @@ typedef struct GC_MS_PObj_Wrapper {
typedef enum _gc_sys_type_enum {
MS, /*mark and sweep*/
- IMS, /*incremental mark and sweep*/
- GMS, /*generational mark and sweep*/
INF /*infinite memory core*/
} gc_sys_type_enum;
typedef struct GC_Subsystem {
- gc_sys_type_enum sys_type; /* Which GC subsystem are we using? */
-
- union { /* Holds system-specific data structures*/
- struct gc_gms_sys_data gms_data;
- } gc_sys_data;
+ /* Which GC subsystem are we using? See PARROT_GC_DEFAULT_TYPE in
+ * include/parrot/settings.h for possible values */
+ gc_sys_type_enum sys_type;
/** Function hooks that each subsystem MUST provide */
void (*do_gc_mark)(PARROT_INTERP, UINTVAL flags);
@@ -117,6 +111,11 @@ typedef struct GC_Subsystem {
*These will be called via the GC API functions Parrot_gc_func_name
*e.g. read barrier && write barrier hooks can go here later ...*/
+ /* Holds system-specific data structures
+ * unused right now, but this is where it should go if we need them ...
+ union {
+ } gc_private;
+ */
} GC_Subsystem;
typedef struct Memory_Block {
@@ -174,7 +173,7 @@ typedef struct Fixed_Size_Pool {
struct Variable_Size_Pool *mem_pool;
/* Size in bytes of an individual pool item. This size may include
- * a GC-system specific GC header. (e.g. GMS headers) */
+ * a GC-system specific GC header. */
size_t object_size;
size_t start_arena_memory;
@@ -201,10 +200,11 @@ typedef struct Fixed_Size_Pool {
alloc_objects_fn_type more_objects;
gc_object_fn_type gc_object;
- /*Contains GC system-specific data structures*/
+ /* Contains GC system-specific data structures ... unused at the moment,
+ * but this is where it should go when we need it ...
union {
- struct gc_gms_smallobjpool_data *gms; /*generational mark and sweep*/
- } gc_sys_priv_data;
+ } gc_private;
+ */
#if GC_USE_LAZY_ALLOCATOR
void *newfree;
Oops, something went wrong.

0 comments on commit d10465e

Please sign in to comment.