Constify a couple members of BoostEnvironment and BoostVM

Author: eregon

boosthost/emulator/emulator.cc

@@ -349,9 +349,8 @@ int main(int argc, char** argv) {
       baseEnv = vm->protect(OptVar::build(vm));
 
       UnstableNode baseValue;
-      auto& bootLoader = boostEnv.getBootLoader();
 
-      if (!bootLoader(vm, baseFunctorPath.string(), baseValue)) {
+      if (!boostEnv.bootLoader(vm, baseFunctorPath.string(), baseValue)) {
         std::cerr << "panic: could not load Base functor at "
                   << baseFunctorPath << std::endl;
         return false;
@@ -376,9 +375,8 @@ int main(int argc, char** argv) {
       initFunctor = vm->protect(OptVar::build(vm));
 
       UnstableNode initValue;
-      auto& bootLoader = boostEnv.getBootLoader();
 
-      if (!bootLoader(vm, initFunctorPath.string(), initValue)) {
+      if (!boostEnv.bootLoader(vm, initFunctorPath.string(), initValue)) {
         std::cerr << "panic: could not load Init functor at "
                   << initFunctorPath << std::endl;
         return false;

vm/boostenv/main/boostenv-decl.hh

@@ -109,17 +109,6 @@ public:
      });
    }
 
-// Configuration
-
-public:
-  const BootLoader& getBootLoader() {
-    return _bootLoader;
-  }
-
-  void setBootLoader(const BootLoader& loader) {
-    _bootLoader = loader;
-  }
-
 // Run and preemption
 
 public:
@@ -199,10 +188,9 @@ private:
   boost::mutex _gcMutex;
 
 // Bootstrap
-private:
-  BootLoader _bootLoader;
 public:
-  VMStarter vmStarter;
+  const BootLoader bootLoader;
+  const VMStarter vmStarter;
 
 // Unsafe process-wide operations
 private:

vm/boostenv/main/boostenv.hh

@@ -113,10 +113,8 @@ namespace internal {
 
 BoostEnvironment::BoostEnvironment(const VMStarter& vmStarter) :
   _nextVMIdentifier(InitialVMIdentifier), _exitCode(0),
+  bootLoader(&internal::defaultBootLoader),
   vmStarter(vmStarter) {
-  // Set up a default boot loader
-  setBootLoader(&internal::defaultBootLoader);
-
   // Ignore SIGPIPE ourselves since Boost does not always do it
 #ifdef SIGPIPE
   std::signal(SIGPIPE, SIG_IGN);

vm/boostenv/main/boostvm-decl.hh

@@ -134,9 +134,9 @@ public:
   }
 
 public:
-  VM vm;
+  const VM vm;
   BoostEnvironment& env;
-  VMIdentifier identifier;
+  const VMIdentifier identifier;
 
 // Random number and UUID generation
 public:
@@ -182,7 +182,7 @@ private:
 
 // Running thread management
 private:
-  boost::asio::io_service::work* _work;
+  boost::asio::io_service::work* const _work;
 };
 
 } }

vm/boostenv/main/boostvm.cc

@@ -48,10 +48,9 @@ BoostVM::BoostVM(BoostEnvironment& environment,
   alarmTimer(environment.io_service),
   _terminationRequested(false),
   _terminationStatus(0),
-  _terminationReason("normal") {
-
+  _terminationReason("normal"),
   // Make sure the IO thread will wait for us
-  _work = new boost::asio::io_service::work(environment.io_service);
+  _work(new boost::asio::io_service::work(environment.io_service)) {
 
   if (identifier != parent)
     addMonitor(parent);

vm/boostenv/main/modos.hh

@@ -85,7 +85,7 @@ public:
         std::string urlString;
         ozVSGet(vm, url, urlBufSize, urlString);
 
-        auto& bootLoader = BoostEnvironment::forVM(vm).getBootLoader();
+        auto& bootLoader = BoostEnvironment::forVM(vm).bootLoader;
         ok = bootLoader && bootLoader(vm, urlString, result);
       }