From 77ac49c17fbed60cc742b2afc050d8857919817a Mon Sep 17 00:00:00 2001 From: Mark Probst Date: Sat, 29 Sep 2012 14:48:01 +0200 Subject: [PATCH] [dtrace] Turns out "sweeped" is not a word. --- data/mono.d | 4 ++-- mono/metadata/sgen-marksweep.c | 2 +- mono/metadata/sgen-nursery-allocator.c | 2 +- mono/utils/dtrace.h | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/mono.d b/data/mono.d index 566508e2688..e2f4153beff 100644 --- a/data/mono.d +++ b/data/mono.d @@ -36,8 +36,8 @@ provider mono { /* Can be nursery->nursery, nursery->major or major->major */ probe gc__obj__moved (uintptr_t dest, uintptr_t src, int dest_gen, int src_gen, uintptr_t size, char *ns_name, char *class_name); - probe gc__nursery__sweeped (uintptr_t addr, uintptr_t len); - probe gc__major__sweeped (uintptr_t addr, uintptr_t len); + probe gc__nursery__swept (uintptr_t addr, uintptr_t len); + probe gc__major__swept (uintptr_t addr, uintptr_t len); probe gc__obj__pinned (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name, int generation); }; diff --git a/mono/metadata/sgen-marksweep.c b/mono/metadata/sgen-marksweep.c index 61a93ef26ea..5546a929d38 100644 --- a/mono/metadata/sgen-marksweep.c +++ b/mono/metadata/sgen-marksweep.c @@ -1467,7 +1467,7 @@ ms_sweep (void) * will also benefit? */ binary_protocol_empty (obj, block->obj_size); - MONO_GC_MAJOR_SWEEPED ((mword)obj, block->obj_size); + MONO_GC_MAJOR_SWEPT ((mword)obj, block->obj_size); memset (obj, 0, block->obj_size); } *(void**)obj = block->free_list; diff --git a/mono/metadata/sgen-nursery-allocator.c b/mono/metadata/sgen-nursery-allocator.c index fe0d4845530..73901bcbd9e 100644 --- a/mono/metadata/sgen-nursery-allocator.c +++ b/mono/metadata/sgen-nursery-allocator.c @@ -712,7 +712,7 @@ add_nursery_frag (SgenFragmentAllocator *allocator, size_t frag_size, char* frag { DEBUG (4, fprintf (gc_debug_file, "Found empty fragment: %p-%p, size: %zd\n", frag_start, frag_end, frag_size)); binary_protocol_empty (frag_start, frag_size); - MONO_GC_NURSERY_SWEEPED ((mword)frag_start, frag_end - frag_start); + MONO_GC_NURSERY_SWEPT ((mword)frag_start, frag_end - frag_start); /* Not worth dealing with smaller fragments: need to tune */ if (frag_size >= SGEN_MAX_NURSERY_WASTE) { /* memsetting just the first chunk start is bound to provide better cache locality */ diff --git a/mono/utils/dtrace.h b/mono/utils/dtrace.h index 7567b735a1f..0e2492c73d3 100644 --- a/mono/utils/dtrace.h +++ b/mono/utils/dtrace.h @@ -86,11 +86,11 @@ #define MONO_GC_OBJ_MOVED_ENABLED() (0) -#define MONO_GC_NURSERY_SWEEPED(addr,len) -#define MONO_GC_NURSERY_SWEEPED_ENABLED() (0) +#define MONO_GC_NURSERY_SWEPT(addr,len) +#define MONO_GC_NURSERY_SWEPT_ENABLED() (0) -#define MONO_GC_MAJOR_SWEEPED(addr,len) -#define MONO_GC_MAJOR_SWEEPED_ENABLED() (0) +#define MONO_GC_MAJOR_SWEPT(addr,len) +#define MONO_GC_MAJOR_SWEPT_ENABLED() (0) #define MONO_GC_OBJ_PINNED(addr,size,ns_name,class_name,generation) -- 2.25.1