From 6e83e00d220dcf18f564610dcb3636c62a412153 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Fri, 14 Aug 2020 10:40:54 -0700 Subject: [PATCH] vm: rename primitive_sampling_profiler to primitive_set_profiling. also rename the private primitives words in tools.profiler.sampling. --- basis/bootstrap/image/primitives/primitives.factor | 4 ++-- basis/tools/profiler/sampling/sampling-tests.factor | 4 ++-- basis/tools/profiler/sampling/sampling.factor | 8 ++++---- vm/primitives.hpp | 4 ++-- vm/sampling_profiler.cpp | 6 +++--- vm/vm.hpp | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/basis/bootstrap/image/primitives/primitives.factor b/basis/bootstrap/image/primitives/primitives.factor index 6554f74162..f2bffd9b88 100644 --- a/basis/bootstrap/image/primitives/primitives.factor +++ b/basis/bootstrap/image/primitives/primitives.factor @@ -778,8 +778,8 @@ CONSTANT: all-primitives { { "tools.profiler.sampling.private" { - { "profiling" ( n -- ) "sampling_profiler" { object } { } f } - { "(get-samples)" ( -- samples/f ) "get_samples" { } { object } f } + { "set-profiling" ( n -- ) "set_profiling" { object } { } f } + { "get-samples" ( -- samples/f ) "get_samples" { } { object } f } } } { diff --git a/basis/tools/profiler/sampling/sampling-tests.factor b/basis/tools/profiler/sampling/sampling-tests.factor index 6493f3c9bd..765da7af14 100644 --- a/basis/tools/profiler/sampling/sampling-tests.factor +++ b/basis/tools/profiler/sampling/sampling-tests.factor @@ -49,7 +49,7 @@ gc { t t } [ ! Seed the samples data [ "resource:basis/tools/memory/memory.factor" run-file ] profile - (get-samples) length 0 > + get-samples length 0 > OBJ-SAMPLE-CALLSTACKS special-object first 0 > ] unit-test @@ -57,5 +57,5 @@ gc ! On x86.64, [ ] profile doesn't generate any samples at all ! because it runs so quickly. On x86.32, one spurious sample is ! sometimes generated for some unknown reason. - gc [ ] profile (get-samples) length 1 <= + gc [ ] profile get-samples length 1 <= ] unit-test diff --git a/basis/tools/profiler/sampling/sampling.factor b/basis/tools/profiler/sampling/sampling.factor index c0ba754fe9..5ee805c4d5 100644 --- a/basis/tools/profiler/sampling/sampling.factor +++ b/basis/tools/profiler/sampling/sampling.factor @@ -8,8 +8,8 @@ sequences.generalizations sets sorting ; IN: tools.profiler.sampling SYMBOL: samples-per-second @@ -28,8 +28,8 @@ PRIVATE> raw-profile-data get-global [ "No profile data" throw ] unless* ; : profile ( quot -- ) - samples-per-second get-global profiling - [ 0 profiling (get-samples) raw-profile-data set-global ] + samples-per-second get-global set-profiling + [ 0 set-profiling get-samples raw-profile-data set-global ] finally ; inline : total-sample-count ( sample -- count ) 0 swap nth ; diff --git a/vm/primitives.hpp b/vm/primitives.hpp index 8c88658f71..ea45a3faa4 100644 --- a/vm/primitives.hpp +++ b/vm/primitives.hpp @@ -32,8 +32,8 @@ namespace factor { _(minor_gc) _(modify_code_heap) _(nano_count) _(quotation_code) \ _(quotation_compiled_p) _(reset_dispatch_stats) _(resize_array) \ _(resize_byte_array) _(resize_string) _(retainstack_for) \ - _(sampling_profiler) _(save_image) _(set_context_object) \ - _(set_datastack) _(set_innermost_stack_frame_quotation) \ + _(save_image) _(set_context_object) _(set_datastack) \ + _(set_innermost_stack_frame_quotation) _(set_profiling) \ _(set_retainstack) _(set_slot) _(set_special_object) \ _(set_string_nth_fast) _(size) _(sleep) _(special_object) _(string) \ _(strip_stack_traces) _(tuple) _(tuple_boa) \ diff --git a/vm/sampling_profiler.cpp b/vm/sampling_profiler.cpp index 4bf74729cb..0388feaf07 100644 --- a/vm/sampling_profiler.cpp +++ b/vm/sampling_profiler.cpp @@ -93,7 +93,7 @@ void factor_vm::record_sample(bool prolog_p) { } // Allocates memory -void factor_vm::set_sampling_profiler(fixnum rate) { +void factor_vm::set_profiling(fixnum rate) { bool running_p = atomic::load(&sampling_profiler_p); if (rate > 0 && !running_p) start_sampling_profiler(rate); @@ -121,8 +121,8 @@ void factor_vm::end_sampling_profiler() { } // Allocates memory -void factor_vm::primitive_sampling_profiler() { - set_sampling_profiler(to_fixnum(ctx->pop())); +void factor_vm::primitive_set_profiling() { + set_profiling(to_fixnum(ctx->pop())); } // Allocates memory diff --git a/vm/vm.hpp b/vm/vm.hpp index ba92de3592..dd10a05f6b 100644 --- a/vm/vm.hpp +++ b/vm/vm.hpp @@ -189,8 +189,8 @@ struct factor_vm { void record_sample(bool prolog_p); void start_sampling_profiler(fixnum rate); void end_sampling_profiler(); - void set_sampling_profiler(fixnum rate); - void primitive_sampling_profiler(); + void set_profiling(fixnum rate); + void primitive_set_profiling(); void primitive_get_samples(); array* allot_growarr(); void growarr_add(array *growarr_, cell value); -- 2.34.1