Merge pull request #197 from eregon/mvm

Prevent the preemption timer to run when termination is requested

Author: sjmackenzie

vm/boostenv/main/boostvm.cc

@@ -164,7 +164,8 @@ void BoostVM::run() {
 }
 
 void BoostVM::onPreemptionTimerExpire(const boost::system::error_code& error) {
-  if (error != boost::asio::error::operation_aborted) {
+  if (error != boost::asio::error::operation_aborted &&
+      !_terminationRequested) {
     // Preemption
     vm->setReferenceTime(env.getReferenceTime());
     vm->requestPreempt();