vm: quell MSVC warnings

diff --git a/vm/os-windows.cpp b/vm/os-windows.cpp
index ad0343cc7880873b01597e06c6bdd734d5fe5f67..81c10757d6029c11a2fdd8c09754bcfa5ff3f4e5 100755 (executable)
--- a/vm/os-windows.cpp
+++ b/vm/os-windows.cpp
@@ -348,7 +348,7 @@ void factor_vm::end_sampling_profiler_timer()
        sampling_profiler_p = false;
        atomic::fence();
        DWORD wait_result = WaitForSingleObject(sampler_thread,
-               3000/samples_per_second);
+               3000*(DWORD)samples_per_second);
        if (wait_result != WAIT_OBJECT_0)
                TerminateThread(sampler_thread, 0);
        sampler_thread = NULL;

diff --git a/vm/sampling_profiler.cpp b/vm/sampling_profiler.cpp
index 34fc22f4c2f1f21c20be2047f4d28cbca4e587a6..0f91a14b1346c7eb39ca6f36776fb4b61f137196 100644 (file)
--- a/vm/sampling_profiler.cpp
+++ b/vm/sampling_profiler.cpp
@@ -57,7 +57,7 @@ void factor_vm::record_callstack_sample(cell *begin, cell *end)
        *end = sample_callstacks.size();
 }
 
-void factor_vm::set_sampling_profiler(int rate)
+void factor_vm::set_sampling_profiler(fixnum rate)
 {
        bool sampling_p = !!rate;
        if (sampling_p == sampling_profiler_p)
@@ -79,7 +79,7 @@ void factor_vm::clear_samples()
        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;
        safepoint_sample_counts.clear();

diff --git a/vm/vm.hpp b/vm/vm.hpp
index 4b829c1dd965a97f8d8bec9455e450896e2c06ce..a167e487e5f322a747e2d969e2ada1366480b275 100755 (executable)
--- a/vm/vm.hpp
+++ b/vm/vm.hpp
@@ -63,7 +63,7 @@ struct factor_vm
        /* Is profiling enabled? */
        bool counting_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
        to VM */
@@ -195,9 +195,9 @@ struct factor_vm
        void clear_samples();
        void record_sample();
        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 set_sampling_profiler(int rate);
+       void set_sampling_profiler(fixnum rate);
        void enqueue_safepoint_sample(cell samples, cell pc, bool foreign_thread_p);
        void primitive_sampling_profiler();
        void primitive_get_samples();