[svn:parrot] r36619 - in trunk: include/parrot src src/gc src/ops t/op
cotto at svn.parrot.org
cotto at svn.parrot.org
Thu Feb 12 07:58:33 UTC 2009
Author: cotto
Date: Thu Feb 12 07:58:33 2009
New Revision: 36619
URL: https://trac.parrot.org/parrot/changeset/36619
Log:
[gc] various variable, member and macro name changes to get rid of "DOD"
and clarify purpose
Modified:
trunk/include/parrot/resources.h
trunk/src/debug.c
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_misc.c
trunk/src/list.c
trunk/src/ops/core.ops
trunk/src/runops_cores.c
trunk/t/op/string_mem.t
Modified: trunk/include/parrot/resources.h
==============================================================================
--- trunk/include/parrot/resources.h Thu Feb 12 06:59:37 2009 (r36618)
+++ trunk/include/parrot/resources.h Thu Feb 12 07:58:33 2009 (r36619)
@@ -141,11 +141,10 @@
/*
* statistics for DOD and GC
*/
- size_t gc_runs; /* Number of times we've done a DOD sweep */
- size_t lazy_gc_runs; /* Number of successful lazy DOD sweep */
- size_t collect_runs; /* Number of times we've
- * done a memory compaction
- */
+ size_t gc_mark_runs; /* Number of times we've done a mark run*/
+ size_t gc_lazy_mark_runs; /* Number of successful lazy mark runs */
+ size_t gc_collect_runs; /* Number of times we've done a memory
+ compaction */
size_t mem_allocs_since_last_collect; /* The number of memory
* allocations from the
* system since the last
@@ -187,8 +186,8 @@
typedef enum {
TOTAL_MEM_ALLOC = 1,
- GC_RUNS,
- COLLECT_RUNS,
+ GC_MARK_RUNS,
+ GC_COLLECT_RUNS,
ACTIVE_PMCS,
ACTIVE_BUFFERS,
TOTAL_PMCS,
@@ -197,7 +196,7 @@
MEM_ALLOCS_SINCE_COLLECT,
TOTAL_COPIED,
IMPATIENT_PMCS,
- LAZY_GC_RUNS,
+ GC_LAZY_MARK_RUNS,
EXTENDED_PMCS,
CURRENT_RUNCORE,
Modified: trunk/src/debug.c
==============================================================================
--- trunk/src/debug.c Thu Feb 12 06:59:37 2009 (r36618)
+++ trunk/src/debug.c Thu Feb 12 07:58:33 2009 (r36619)
@@ -3329,12 +3329,12 @@
ASSERT_ARGS(PDB_info)
Parrot_io_eprintf(interp, "Total memory allocated = %ld\n",
interpinfo(interp, TOTAL_MEM_ALLOC));
- Parrot_io_eprintf(interp, "gc runs = %ld\n",
- interpinfo(interp, GC_RUNS));
- Parrot_io_eprintf(interp, "Lazy gc runs = %ld\n",
- interpinfo(interp, LAZY_GC_RUNS));
- Parrot_io_eprintf(interp, "Collect runs = %ld\n",
- interpinfo(interp, COLLECT_RUNS));
+ Parrot_io_eprintf(interp, "GC mark runs = %ld\n",
+ interpinfo(interp, GC_MARK_RUNS));
+ Parrot_io_eprintf(interp, "Lazy gc mark runs = %ld\n",
+ interpinfo(interp, GC_LAZY_MARK_RUNS));
+ Parrot_io_eprintf(interp, "GC collect runs = %ld\n",
+ interpinfo(interp, GC_COLLECT_RUNS));
Parrot_io_eprintf(interp, "Collect memory = %ld\n",
interpinfo(interp, TOTAL_COPIED));
Parrot_io_eprintf(interp, "Active PMCs = %ld\n",
Modified: trunk/src/gc/generational_ms.c
==============================================================================
--- trunk/src/gc/generational_ms.c Thu Feb 12 06:59:37 2009 (r36618)
+++ trunk/src/gc/generational_ms.c Thu Feb 12 07:58:33 2009 (r36619)
@@ -1862,8 +1862,8 @@
return;
}
- /* normal or lazy DOD run */
- arena_base->gc_runs++;
+ /* normal or lazy mark run */
+ arena_base->gc_mark_runs++;
arena_base->lazy_gc = (flags & GC_lazy_FLAG);
gc_gms_init_mark(interp);
if (gc_gms_trace_root(interp, !arena_base->lazy_gc) &&
@@ -1873,9 +1873,9 @@
}
else {
/*
- * successful lazy DOD run
+ * successful lazy mark run
*/
- ++arena_base->lazy_gc_runs;
+ ++arena_base->gc_lazy_mark_runs;
}
gc_gms_end_cycle(interp);
--arena_base->gc_mark_block_level;
Modified: trunk/src/gc/incremental_ms.c
==============================================================================
--- trunk/src/gc/incremental_ms.c Thu Feb 12 06:59:37 2009 (r36618)
+++ trunk/src/gc/incremental_ms.c Thu Feb 12 07:58:33 2009 (r36619)
@@ -980,7 +980,7 @@
(void)parrot_gc_ims_collect(interp, 0);
break;
case GC_IMS_FINISHED:
- ++arena_base->gc_runs;
+ ++arena_base->gc_mark_runs;
g_ims->state = GC_IMS_CONSUMING;
/* fall through */
case GC_IMS_CONSUMING:
@@ -1049,7 +1049,7 @@
}
/* make the test happy that checks the count ;) */
- arena_base->gc_runs++;
+ arena_base->gc_mark_runs++;
lazy = flags & GC_lazy_FLAG;
@@ -1104,7 +1104,7 @@
/* if we stopped early, the lazy run was successful */
if (g_ims->state < GC_IMS_COLLECT)
- ++arena_base->lazy_gc_runs;
+ ++arena_base->gc_lazy_mark_runs;
g_ims->lazy = 0;
}
Modified: trunk/src/gc/mark_sweep.c
==============================================================================
--- trunk/src/gc/mark_sweep.c Thu Feb 12 06:59:37 2009 (r36618)
+++ trunk/src/gc/mark_sweep.c Thu Feb 12 07:58:33 2009 (r36619)
@@ -227,8 +227,8 @@
else {
pt_gc_stop_mark(interp); /* XXX */
- /* successful lazy GC count */
- ++arena_base->lazy_gc_runs;
+ /* successful lazy mark run count */
+ ++arena_base->gc_lazy_mark_runs;
Parrot_gc_clear_live_bits(interp);
if (interp->profile)
@@ -236,7 +236,7 @@
}
/* Note it */
- arena_base->gc_runs++;
+ arena_base->gc_mark_runs++;
--arena_base->gc_mark_block_level;
return;
Modified: trunk/src/gc/res_lea.c
==============================================================================
--- trunk/src/gc/res_lea.c Thu Feb 12 06:59:37 2009 (r36618)
+++ trunk/src/gc/res_lea.c Thu Feb 12 07:58:33 2009 (r36619)
@@ -35,7 +35,7 @@
=item C<void Parrot_go_collect(PARROT_INTERP)>
-Does nothing other than increment the interpreter's C<collect_runs>
+Does nothing other than increment the interpreter's C<gc_collect_runs>
count.
=cut
@@ -49,7 +49,7 @@
if (interp->arena_base->gc_sweep_block_level) {
return;
}
- interp->arena_base->collect_runs++; /* fake it */
+ interp->arena_base->gc_collect_runs++; /* fake it */
}
/*
Modified: trunk/src/gc/resources.c
==============================================================================
--- trunk/src/gc/resources.c Thu Feb 12 06:59:37 2009 (r36618)
+++ trunk/src/gc/resources.c Thu Feb 12 07:58:33 2009 (r36619)
@@ -385,7 +385,7 @@
/* We're collecting */
arena_base->mem_allocs_since_last_collect = 0;
arena_base->header_allocs_since_last_collect = 0;
- arena_base->collect_runs++;
+ arena_base->gc_collect_runs++;
/* total - reclaimable == currently used. Add a minimum block to the
* current amount, so we can avoid having to allocate it in the future. */
Modified: trunk/src/inter_misc.c
==============================================================================
--- trunk/src/inter_misc.c Thu Feb 12 06:59:37 2009 (r36618)
+++ trunk/src/inter_misc.c Thu Feb 12 07:58:33 2009 (r36619)
@@ -245,14 +245,14 @@
#endif
ret = arena_base->memory_allocated;
break;
- case GC_RUNS:
- ret = arena_base->gc_runs;
+ case GC_MARK_RUNS:
+ ret = arena_base->gc_mark_runs;
break;
- case LAZY_GC_RUNS:
- ret = arena_base->lazy_gc_runs;
+ case GC_LAZY_MARK_RUNS:
+ ret = arena_base->gc_lazy_mark_runs;
break;
- case COLLECT_RUNS:
- ret = arena_base->collect_runs;
+ case GC_COLLECT_RUNS:
+ ret = arena_base->gc_collect_runs;
break;
case ACTIVE_PMCS:
ret = arena_base->pmc_pool->total_objects -
Modified: trunk/src/list.c
==============================================================================
--- trunk/src/list.c Thu Feb 12 06:59:37 2009 (r36618)
+++ trunk/src/list.c Thu Feb 12 07:58:33 2009 (r36619)
@@ -593,7 +593,7 @@
/* allocate a new chunk_list buffer, if old one has moved or is too small */
len = list->n_chunks;
- if (list->collect_runs != interp->arena_base->collect_runs ||
+ if (list->collect_runs != interp->arena_base->gc_collect_runs ||
len > chunk_list_size(list)) {
/* round up to reasonable size */
len = 1 << (ld(len) + 1);
@@ -604,7 +604,7 @@
if (list->container) {
GC_WRITE_BARRIER(interp, list->container, 0, list);
}
- list->collect_runs = interp->arena_base->collect_runs;
+ list->collect_runs = interp->arena_base->gc_collect_runs;
}
/* reset type, actual state of chunks will show, what we really have */
@@ -934,7 +934,7 @@
UINTVAL i;
#ifndef GC_IS_MALLOC
- if (list->collect_runs != interp->arena_base->collect_runs)
+ if (list->collect_runs != interp->arena_base->gc_collect_runs)
rebuild_chunk_list(interp, list);
#endif
#ifdef SLOW_AND_BORING
Modified: trunk/src/ops/core.ops
==============================================================================
--- trunk/src/ops/core.ops Thu Feb 12 06:59:37 2009 (r36618)
+++ trunk/src/ops/core.ops Thu Feb 12 07:58:33 2009 (r36619)
@@ -1047,9 +1047,9 @@
=item B<interpinfo>(out INT, in INT)
-.TOTAL_MEM_ALLOC, .GC_RUNS, .COLLECT_RUNS, .ACTIVE_PMCS, .ACTIVE_BUFFERS,
+.TOTAL_MEM_ALLOC, .GC_MARK_RUNS, .GC_COLLECT_RUNS, .ACTIVE_PMCS, .ACTIVE_BUFFERS,
.TOTAL_PMCS, .TOTAL_BUFFERS, .HEADER_ALLOCS_SINCE_COLLECT,
-.MEM_ALLOCS_SINCE_COLLECT, .TOTAL_COPIED, .IMPATIENT_PMCS, .LAZY_GC_RUNS,
+.MEM_ALLOCS_SINCE_COLLECT, .TOTAL_COPIED, .IMPATIENT_PMCS, .GC_LAZY_MARK_RUNS,
.EXTENDED_PMCS, .RUNCORE
=item B<interpinfo>(out PMC, in INT)
Modified: trunk/src/runops_cores.c
==============================================================================
--- trunk/src/runops_cores.c Thu Feb 12 06:59:37 2009 (r36618)
+++ trunk/src/runops_cores.c Thu Feb 12 07:58:33 2009 (r36619)
@@ -347,12 +347,12 @@
{
ASSERT_ARGS(runops_trace_core)
- static size_t gc_runs, collect_runs;
+ static size_t gc_mark_runs, gc_collect_runs;
Arenas * const arena_base = interp->arena_base;
Interp *debugger;
- gc_runs = arena_base->gc_runs;
- collect_runs = arena_base->collect_runs;
+ gc_mark_runs = arena_base->gc_mark_runs;
+ gc_collect_runs = arena_base->gc_collect_runs;
if (interp->pdb) {
debugger = interp->pdb->debugger;
PARROT_ASSERT(debugger);
@@ -399,13 +399,13 @@
DO_OP(pc, interp);
trace_op(interp, code_start, code_end, pc);
- if (gc_runs != arena_base->gc_runs) {
- gc_runs = arena_base->gc_runs;
+ if (gc_mark_runs != arena_base->gc_mark_runs) {
+ gc_mark_runs = arena_base->gc_mark_runs;
Parrot_io_eprintf(debugger, " DOD\n");
}
- if (collect_runs != arena_base->collect_runs) {
- collect_runs = arena_base->collect_runs;
+ if (gc_collect_runs != arena_base->gc_collect_runs) {
+ gc_collect_runs = arena_base->gc_collect_runs;
Parrot_io_eprintf(debugger, " GC\n");
}
}
Modified: trunk/t/op/string_mem.t
==============================================================================
--- trunk/t/op/string_mem.t Thu Feb 12 06:59:37 2009 (r36618)
+++ trunk/t/op/string_mem.t Thu Feb 12 07:58:33 2009 (r36619)
@@ -72,19 +72,19 @@
init = stringinfo $S6, .STRINGINFO_STRSTART
- $I0 = interpinfo .INTERPINFO_COLLECT_RUNS
+ $I0 = interpinfo .INTERPINFO_GC_COLLECT_RUNS
loop1:
collect
- $I1 = interpinfo .INTERPINFO_COLLECT_RUNS
+ $I1 = interpinfo .INTERPINFO_GC_COLLECT_RUNS
eq $I0, $I1, loop1
before = stringinfo $S6, .STRINGINFO_STRSTART
unpin $S6
- $I0 = interpinfo .INTERPINFO_COLLECT_RUNS
+ $I0 = interpinfo .INTERPINFO_GC_COLLECT_RUNS
loop2:
collect
- $I1 = interpinfo .INTERPINFO_COLLECT_RUNS
+ $I1 = interpinfo .INTERPINFO_GC_COLLECT_RUNS
eq $I0, $I1, loop1
after = stringinfo $S6, .STRINGINFO_STRSTART
More information about the parrot-commits
mailing list