[svn:parrot] r36617 - in trunk: include/parrot src src/gc
cotto at svn.parrot.org
cotto at svn.parrot.org
Thu Feb 12 06:10:38 UTC 2009
Author: cotto
Date: Thu Feb 12 06:10:36 2009
New Revision: 36617
URL: https://trac.parrot.org/parrot/changeset/36617
Log:
[gc] rename DOD_block_level to gc_mark_block_level and GC_block_level to gc_sweep_block_level
Modified:
trunk/include/parrot/gc_api.h
trunk/include/parrot/resources.h
trunk/src/gc/generational_ms.c
trunk/src/gc/incremental_ms.c
trunk/src/gc/mark_sweep.c
trunk/src/gc/res_lea.c
trunk/src/gc/resources.c
trunk/src/inter_create.c
trunk/src/thread.c
Modified: trunk/include/parrot/gc_api.h
==============================================================================
--- trunk/include/parrot/gc_api.h Thu Feb 12 05:56:38 2009 (r36616)
+++ trunk/include/parrot/gc_api.h Thu Feb 12 06:10:36 2009 (r36617)
@@ -21,30 +21,30 @@
/* Macros for recursively blocking and unblocking DOD */
#define Parrot_block_GC_mark(interp) \
{ \
- (interp)->arena_base->DOD_block_level++; \
+ (interp)->arena_base->gc_mark_block_level++; \
Parrot_shared_gc_block(interp); \
}
#define Parrot_unblock_GC_mark(interp) \
- if ((interp)->arena_base->DOD_block_level) { \
- (interp)->arena_base->DOD_block_level--; \
+ if ((interp)->arena_base->gc_mark_block_level) { \
+ (interp)->arena_base->gc_mark_block_level--; \
Parrot_shared_gc_unblock(interp); \
}
/* Macros for recursively blocking and unblocking GC */
#define Parrot_block_GC_sweep(interp) \
- (interp)->arena_base->GC_block_level++
+ (interp)->arena_base->gc_sweep_block_level++
#define Parrot_unblock_GC_sweep(interp) \
- if ((interp)->arena_base->GC_block_level) \
- (interp)->arena_base->GC_block_level--
+ if ((interp)->arena_base->gc_sweep_block_level) \
+ (interp)->arena_base->gc_sweep_block_level--
/* Macros for testing if the DOD and GC are blocked */
#define Parrot_is_blocked_GC_mark(interp) \
- ((interp)->arena_base->DOD_block_level)
+ ((interp)->arena_base->gc_mark_block_level)
#define Parrot_is_blocked_GC_sweep(interp) \
- ((interp)->arena_base->GC_block_level)
+ ((interp)->arena_base->gc_sweep_block_level)
#define GC_trace_stack_FLAG (UINTVAL)(1 << 0) /* trace system areas and stack */
#define GC_trace_normal (UINTVAL)(1 << 0) /* the same */
Modified: trunk/include/parrot/resources.h
==============================================================================
--- trunk/include/parrot/resources.h Thu Feb 12 05:56:38 2009 (r36616)
+++ trunk/include/parrot/resources.h Thu Feb 12 06:10:36 2009 (r36617)
@@ -154,33 +154,33 @@
* blocks allocated from
* the system since the last
* DOD run */
- size_t memory_allocated; /* The total amount of
- * allocatable memory
- * allocated. Doesn't count
- * memory for headers or
- * internal structures or
- * anything */
- UINTVAL memory_collected; /* Total amount of memory copied
- during collection */
- UINTVAL num_early_gc_PMCs; /* how many PMCs want immediate destruction */
- UINTVAL num_early_PMCs_seen;/* how many such PMCs has DOD seen */
- UINTVAL num_extended_PMCs; /* active PMCs having pmc_ext */
- PMC* gc_mark_start; /* first PMC marked during a DOD run */
- PMC* gc_mark_ptr; /* last PMC marked during a DOD run */
- PMC* gc_trace_ptr; /* last PMC trace_children was called on */
- int lazy_gc; /* flag that indicates whether we should stop
- when we've seen all impatient PMCs */
+ size_t memory_allocated; /* The total amount of
+ * allocatable memory
+ * allocated. Doesn't count
+ * memory for headers or
+ * internal structures or
+ * anything */
+ UINTVAL memory_collected; /* Total amount of memory copied
+ during collection */
+ UINTVAL num_early_gc_PMCs; /* how many PMCs want immediate destruction */
+ UINTVAL num_early_PMCs_seen; /* how many such PMCs has DOD seen */
+ UINTVAL num_extended_PMCs; /* active PMCs having pmc_ext */
+ PMC* gc_mark_start; /* first PMC marked during a DOD run */
+ PMC* gc_mark_ptr; /* last PMC marked during a DOD run */
+ PMC* gc_trace_ptr; /* last PMC trace_children was called on */
+ int lazy_gc; /* flag that indicates whether we should stop
+ when we've seen all impatient PMCs */
/*
* DOD, GC blocking
*/
- UINTVAL DOD_block_level; /* How many outstanding DOD block
- requests are there? */
- UINTVAL GC_block_level; /* How many outstanding GC block
- requests are there? */
+ UINTVAL gc_mark_block_level; /* How many outstanding DOD block
+ requests are there? */
+ UINTVAL gc_sweep_block_level; /* How many outstanding GC block
+ requests are there? */
/*
* private data for the GC subsystem
*/
- void * gc_private; /* gc subsystem data */
+ void * gc_private; /* gc subsystem data */
} Arenas;
/* &gen_from_enum(interpinfo.pasm) prefix(INTERPINFO_) */
Modified: trunk/src/gc/generational_ms.c
==============================================================================
--- trunk/src/gc/generational_ms.c Thu Feb 12 05:56:38 2009 (r36616)
+++ trunk/src/gc/generational_ms.c Thu Feb 12 06:10:36 2009 (r36617)
@@ -1846,10 +1846,10 @@
Arenas * const arena_base = interp->arena_base;
Gc_gms_private *g_gms;
- if (arena_base->DOD_block_level) {
+ if (arena_base->gc_mark_block_level) {
return;
}
- ++arena_base->DOD_block_level;
+ ++arena_base->gc_mark_block_level;
g_gms = arena_base->gc_private;
if (flags & GC_finish_FLAG) {
Small_Object_Pool * const pool = arena_base->pmc_pool;
@@ -1858,7 +1858,7 @@
/* XXX need to sweep over objects that have finalizers only */
Parrot_forall_header_pools(interp, POOL_PMC, 0, sweep_cb_pmc);
gc_gms_end_cycle(interp);
- --arena_base->DOD_block_level;
+ --arena_base->gc_mark_block_level;
return;
}
@@ -1878,7 +1878,7 @@
++arena_base->lazy_gc_runs;
}
gc_gms_end_cycle(interp);
- --arena_base->DOD_block_level;
+ --arena_base->gc_mark_block_level;
}
/*
Modified: trunk/src/gc/incremental_ms.c
==============================================================================
--- trunk/src/gc/incremental_ms.c Thu Feb 12 05:56:38 2009 (r36616)
+++ trunk/src/gc/incremental_ms.c Thu Feb 12 06:10:36 2009 (r36617)
@@ -947,7 +947,7 @@
Arenas * const arena_base = interp->arena_base;
Gc_ims_private * const g_ims = (Gc_ims_private *)arena_base->gc_private;
- if (arena_base->DOD_block_level || g_ims->state == GC_IMS_DEAD)
+ if (arena_base->gc_mark_block_level || g_ims->state == GC_IMS_DEAD)
return;
++g_ims->increments;
@@ -1028,7 +1028,7 @@
Arenas * const arena_base = interp->arena_base;
Gc_ims_private * const g_ims = (Gc_ims_private *)arena_base->gc_private;
- if (arena_base->DOD_block_level || g_ims->state == GC_IMS_DEAD)
+ if (arena_base->gc_mark_block_level || g_ims->state == GC_IMS_DEAD)
return;
if (flags & GC_finish_FLAG) {
Modified: trunk/src/gc/mark_sweep.c
==============================================================================
--- trunk/src/gc/mark_sweep.c Thu Feb 12 05:56:38 2009 (r36616)
+++ trunk/src/gc/mark_sweep.c Thu Feb 12 06:10:36 2009 (r36617)
@@ -157,7 +157,7 @@
/* XXX these should go into the interpreter */
int total_free = 0;
- if (arena_base->DOD_block_level)
+ if (arena_base->gc_mark_block_level)
return;
if (interp->pdb && interp->pdb->debugger) {
@@ -194,7 +194,7 @@
return;
}
- ++arena_base->DOD_block_level;
+ ++arena_base->gc_mark_block_level;
arena_base->lazy_gc = flags & GC_lazy_FLAG;
/* tell the threading system that we're doing DOD mark */
@@ -237,7 +237,7 @@
/* Note it */
arena_base->gc_runs++;
- --arena_base->DOD_block_level;
+ --arena_base->gc_mark_block_level;
return;
}
Modified: trunk/src/gc/res_lea.c
==============================================================================
--- trunk/src/gc/res_lea.c Thu Feb 12 05:56:38 2009 (r36616)
+++ trunk/src/gc/res_lea.c Thu Feb 12 06:10:36 2009 (r36617)
@@ -46,7 +46,7 @@
Parrot_go_collect(PARROT_INTERP)
{
ASSERT_ARGS(parrot_go_collect)
- if (interp->arena_base->GC_block_level) {
+ if (interp->arena_base->gc_sweep_block_level) {
return;
}
interp->arena_base->collect_runs++; /* fake it */
Modified: trunk/src/gc/resources.c
==============================================================================
--- trunk/src/gc/resources.c Thu Feb 12 05:56:38 2009 (r36616)
+++ trunk/src/gc/resources.c Thu Feb 12 06:10:36 2009 (r36617)
@@ -245,7 +245,7 @@
* TODO pass required allocation size to the DOD system,
* so that collection can be skipped if needed
*/
- if (!interp->arena_base->DOD_block_level
+ if (!interp->arena_base->gc_mark_block_level
&& interp->arena_base->mem_allocs_since_last_collect) {
Parrot_do_gc_run(interp, GC_trace_stack_FLAG);
#if !PARROT_GC_IMS
@@ -374,10 +374,10 @@
Arenas * const arena_base = interp->arena_base;
/* Bail if we're blocked */
- if (arena_base->GC_block_level)
+ if (arena_base->gc_sweep_block_level)
return;
- ++arena_base->GC_block_level;
+ ++arena_base->gc_sweep_block_level;
if (interp->profile)
Parrot_gc_profile_start(interp);
@@ -583,7 +583,7 @@
if (interp->profile)
Parrot_gc_profile_end(interp, PARROT_PROF_GC);
- --arena_base->GC_block_level;
+ --arena_base->gc_sweep_block_level;
}
/*
Modified: trunk/src/inter_create.c
==============================================================================
--- trunk/src/inter_create.c Thu Feb 12 05:56:38 2009 (r36616)
+++ trunk/src/inter_create.c Thu Feb 12 06:10:36 2009 (r36617)
@@ -334,8 +334,8 @@
* Need to turn off DOD blocking, else things stay alive and IO
* handles aren't closed
*/
- interp->arena_base->DOD_block_level =
- interp->arena_base->GC_block_level = 0;
+ interp->arena_base->gc_mark_block_level = 0;
+ interp->arena_base->gc_sweep_block_level = 0;
if (Interp_trace_TEST(interp, ~0)) {
Parrot_io_eprintf(interp, "FileHandle objects (like stdout and stderr)"
Modified: trunk/src/thread.c
==============================================================================
--- trunk/src/thread.c Thu Feb 12 05:56:38 2009 (r36616)
+++ trunk/src/thread.c Thu Feb 12 06:10:36 2009 (r36617)
@@ -1237,7 +1237,7 @@
{
ASSERT_ARGS(pt_suspend_self_for_gc)
PARROT_ASSERT(interp);
- PARROT_ASSERT(!interp->arena_base->DOD_block_level);
+ PARROT_ASSERT(!interp->arena_base->gc_mark_block_level);
DEBUG_ONLY(fprintf(stderr, "%p: suspend_self_for_gc\n", interp));
/* since we are modifying our own state, we need to lock
* the interpreter_array_mutex.
More information about the parrot-commits
mailing list