From 1833beea5212821e71e8e868953e4722ece1a4d0 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 2 Nov 2011 20:26:53 -0700 Subject: [PATCH] vm: fix MSVC warnings --- vm/os-windows.cpp | 2 +- vm/sampling_profiler.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vm/os-windows.cpp b/vm/os-windows.cpp index ec5e359b37..84158cd597 100755 --- a/vm/os-windows.cpp +++ b/vm/os-windows.cpp @@ -304,7 +304,7 @@ void factor_vm::open_console() void factor_vm::sampler_thread_loop() { LARGE_INTEGER counter, new_counter, units_per_second; - bool ok; + DWORD ok; ok = QueryPerformanceFrequency(&units_per_second); assert(ok); diff --git a/vm/sampling_profiler.cpp b/vm/sampling_profiler.cpp index 1f87209f6a..8ffbc27557 100644 --- a/vm/sampling_profiler.cpp +++ b/vm/sampling_profiler.cpp @@ -64,7 +64,7 @@ void factor_vm::record_callstack_sample(cell *begin, cell *end) void factor_vm::set_sampling_profiler(fixnum rate) { bool sampling_p = !!rate; - if (sampling_p == sampling_profiler_p) + if (sampling_p == !!atomic::load(&sampling_profiler_p)) return; if (sampling_p) @@ -90,7 +90,7 @@ void factor_vm::start_sampling_profiler(fixnum rate) clear_samples(); samples.reserve(10*rate); sample_callstacks.reserve(100*rate); - sampling_profiler_p = true; + atomic::store(&sampling_profiler_p, true); start_sampling_profiler_timer(); } @@ -108,7 +108,7 @@ void factor_vm::primitive_sampling_profiler() void factor_vm::primitive_get_samples() { - if (sampling_profiler_p || samples.empty()) { + if (atomic::load(&sampling_profiler_p) || samples.empty()) { ctx->push(false_object); } else { data_root samples_array(allot_array(samples.size(), false_object),this);