steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm: fix MSVC warnings

db4
Joe Groff 2011-11-02 20:26:53 -07:00
parent e6bde7c6aa
commit 1833beea52
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vm/os-windows.cpp
View File

@ -304,7 +304,7 @@ void factor_vm::open_console()
void factor_vm::sampler_thread_loop() void factor_vm::sampler_thread_loop()
{ {
LARGE_INTEGER counter, new_counter, units_per_second; LARGE_INTEGER counter, new_counter, units_per_second;
bool ok; DWORD ok;
ok = QueryPerformanceFrequency(&units_per_second); ok = QueryPerformanceFrequency(&units_per_second);
assert(ok); assert(ok);

6
vm/sampling_profiler.cpp
View File

@ -64,7 +64,7 @@ void factor_vm::record_callstack_sample(cell *begin, cell *end)
void factor_vm::set_sampling_profiler(fixnum rate) void factor_vm::set_sampling_profiler(fixnum rate)
{ {
bool sampling_p = !!rate; bool sampling_p = !!rate;
if (sampling_p == sampling_profiler_p) if (sampling_p == !!atomic::load(&sampling_profiler_p))
return; return;
if (sampling_p) if (sampling_p)
@ -90,7 +90,7 @@ void factor_vm::start_sampling_profiler(fixnum rate)
clear_samples(); clear_samples();
samples.reserve(10*rate); samples.reserve(10*rate);
sample_callstacks.reserve(100*rate); sample_callstacks.reserve(100*rate);
sampling_profiler_p = true; atomic::store(&sampling_profiler_p, true);
start_sampling_profiler_timer(); start_sampling_profiler_timer();
} }
@ -108,7 +108,7 @@ void factor_vm::primitive_sampling_profiler()
void factor_vm::primitive_get_samples() void factor_vm::primitive_get_samples()
{ {
if (sampling_profiler_p || samples.empty()) { if (atomic::load(&sampling_profiler_p) || samples.empty()) {
ctx->push(false_object); ctx->push(false_object);
} else { } else {
data_root<array> samples_array(allot_array(samples.size(), false_object),this); data_root<array> samples_array(allot_array(samples.size(), false_object),this);