vm: strip out call-counting profiler

[factor.git] / vm / vm.cpp

diff --git a/vm/vm.cpp b/vm/vm.cpp
index e9ade19cc6f3bfc362e36b12d3e2dead26a231b1..0029dd8c3570f0cdf27cf522541e3e60199bccc4 100755 (executable)
--- a/vm/vm.cpp
+++ b/vm/vm.cpp
@@ -3,18 +3,27 @@
 namespace factor
 {
 
-factor_vm::factor_vm() :
+factor_vm::factor_vm(THREADHANDLE thread) :
        nursery(0,0),
+        thread(thread),
        callback_id(0),
        c_to_factor_func(NULL),
-       profiling_p(false),
+       sampling_profiler_p(false),
+       signal_pipe_input(0),
+       signal_pipe_output(0),
        gc_off(false),
        current_gc(NULL),
+       current_gc_p(false),
+       current_jit_count(0),
        gc_events(NULL),
+       fep_p(false),
+       fep_help_was_shown(false),
        fep_disabled(false),
        full_output(false),
        last_nano_count(0),
-       signal_callstack_seg(NULL)
+       signal_callstack_seg(NULL),
+       faulting_p(false),
+       safepoint()
 {
        primitive_reset_dispatch_stats();
 }
@@ -27,6 +36,13 @@ factor_vm::~factor_vm()
                delete signal_callstack_seg;
                signal_callstack_seg = NULL;
        }
+       std::list<void **>::const_iterator iter = function_descriptors.begin();
+       std::list<void **>::const_iterator end = function_descriptors.end();
+       while(iter != end)
+       {
+               delete [] *iter;
+               iter++;
+       }
 }
 
 }