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

vm: quell MSVC warnings

db4
Joe Groff 2011-10-31 21:46:44 -07:00
parent 30ed9b535b
commit 29fa23c40a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vm/os-windows.cpp
View File

@ -348,7 +348,7 @@ void factor_vm::end_sampling_profiler_timer()
sampling_profiler_p = false; sampling_profiler_p = false;
atomic::fence(); atomic::fence();
DWORD wait_result = WaitForSingleObject(sampler_thread, DWORD wait_result = WaitForSingleObject(sampler_thread,
3000/samples_per_second); 3000*(DWORD)samples_per_second);
if (wait_result != WAIT_OBJECT_0) if (wait_result != WAIT_OBJECT_0)
TerminateThread(sampler_thread, 0); TerminateThread(sampler_thread, 0);
sampler_thread = NULL; sampler_thread = NULL;

4
vm/sampling_profiler.cpp
View File

@ -57,7 +57,7 @@ void factor_vm::record_callstack_sample(cell *begin, cell *end)
*end = sample_callstacks.size(); *end = sample_callstacks.size();
} }
void factor_vm::set_sampling_profiler(int 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 == sampling_profiler_p)
@ -79,7 +79,7 @@ void factor_vm::clear_samples()
sample_callstacks.swap(sample_callstack_graveyard); sample_callstacks.swap(sample_callstack_graveyard);
} }
void factor_vm::start_sampling_profiler(int rate) void factor_vm::start_sampling_profiler(fixnum rate)
{ {
samples_per_second = rate; samples_per_second = rate;
safepoint_sample_counts.clear(); safepoint_sample_counts.clear();

6
vm/vm.hpp
View File

@ -63,7 +63,7 @@ struct factor_vm
/* Is profiling enabled? */ /* Is profiling enabled? */
bool counting_profiler_p; bool counting_profiler_p;
volatile bool sampling_profiler_p; volatile bool sampling_profiler_p;
int samples_per_second; fixnum samples_per_second;
/* Global variables used to pass fault handler state from signal handler /* Global variables used to pass fault handler state from signal handler
to VM */ to VM */
@ -195,9 +195,9 @@ struct factor_vm
void clear_samples(); void clear_samples();
void record_sample(); void record_sample();
void record_callstack_sample(cell *begin, cell *end); void record_callstack_sample(cell *begin, cell *end);
void start_sampling_profiler(int rate); void start_sampling_profiler(fixnum rate);
void end_sampling_profiler(); void end_sampling_profiler();
void set_sampling_profiler(int rate); void set_sampling_profiler(fixnum rate);
void enqueue_safepoint_sample(cell samples, cell pc, bool foreign_thread_p); void enqueue_safepoint_sample(cell samples, cell pc, bool foreign_thread_p);
void primitive_sampling_profiler(); void primitive_sampling_profiler();
void primitive_get_samples(); void primitive_get_samples();