Merge pull request #234 from eregon/boostvm_refs

sjrd · sjrd · commit d6c547b78c9c · 2014-09-28T18:58:02.000+02:00
Update ASIO wrapper constructors
diff --git a/boosthost/emulator/emulator.cc b/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;
diff --git a/vm/boostenv/main/boostenv-decl.hh b/vm/boostenv/main/boostenv-decl.hh
@@ -64,6 +64,7 @@ public:
   BoostEnvironment(const VMStarter& vmStarter);
 
 // VM Management
+// All public functions may be called by any thread!
 
 public:
   inline
@@ -108,17 +109,6 @@ public:
      });
    }
 
-// Configuration
-
-public:
-  const BootLoader& getBootLoader() {
-    return _bootLoader;
-  }
-
-  void setBootLoader(const BootLoader& loader) {
-    _bootLoader = loader;
-  }
-
 // Run and preemption
 
 public:
@@ -198,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:
diff --git a/vm/boostenv/main/boostenv.hh b/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);
diff --git a/vm/boostenv/main/boostenvpipe-decl.hh b/vm/boostenv/main/boostenvpipe-decl.hh
@@ -41,7 +41,7 @@ class PipeConnection: public BaseSocketConnection<PipeConnection,
   boost::asio::local::stream_protocol> {
 public:
   inline
-  PipeConnection(VM vm);
+  PipeConnection(BoostEnvironment& env, VMIdentifier vm);
 };
 
 #endif // BOOST_ASIO_HAS_LOCAL_SOCKETS
diff --git a/vm/boostenv/main/boostenvpipe.hh b/vm/boostenv/main/boostenvpipe.hh
@@ -39,8 +39,8 @@ namespace mozart { namespace boostenv {
 // PipeConnection //
 ////////////////////
 
-PipeConnection::PipeConnection(VM vm):
-  BaseSocketConnection(vm) {
+PipeConnection::PipeConnection(BoostEnvironment& env, VMIdentifier vm):
+  BaseSocketConnection(env, vm) {
 }
 
 #endif // BOOST_ASIO_HAS_LOCAL_SOCKETS
diff --git a/vm/boostenv/main/boostenvtcp-decl.hh b/vm/boostenv/main/boostenvtcp-decl.hh
@@ -39,7 +39,7 @@ class TCPConnection: public BaseSocketConnection<TCPConnection,
   boost::asio::ip::tcp> {
 public:
   inline
-  TCPConnection(VM vm);
+  TCPConnection(BoostEnvironment& env, VMIdentifier vm);
 
 public:
   inline
@@ -61,9 +61,9 @@ private:
 public:
   typedef std::shared_ptr<TCPAcceptor> pointer;
 
-  static pointer create(VM vm, const tcp::endpoint& endpoint) {
+  static pointer create(BoostEnvironment& env, VMIdentifier vm, const tcp::endpoint& endpoint) {
     // Cannot use make_shared as constructor is private
-    return pointer(new TCPAcceptor(vm, endpoint));
+    return pointer(new TCPAcceptor(env, vm, endpoint));
   }
 
 public:
@@ -72,8 +72,7 @@ public:
   }
 
   inline
-  void startAsyncAccept(TCPConnection::pointer connection,
-                        const ProtectedNode& connectionNode);
+  void startAsyncAccept(const ProtectedNode& connectionNode);
 
   inline
   boost::system::error_code cancel();
@@ -83,7 +82,7 @@ public:
 
 private:
   inline
-  TCPAcceptor(VM vm, const tcp::endpoint& endpoint);
+  TCPAcceptor(BoostEnvironment& env, VMIdentifier vm, const tcp::endpoint& endpoint);
 
 private:
   BoostEnvironment& env;
diff --git a/vm/boostenv/main/boostenvtcp.hh b/vm/boostenv/main/boostenvtcp.hh
@@ -37,8 +37,8 @@ namespace mozart { namespace boostenv {
 // TCPConnection //
 ///////////////////
 
-TCPConnection::TCPConnection(VM vm):
-  BaseSocketConnection(vm), _resolver(env.io_service) {
+TCPConnection::TCPConnection(BoostEnvironment& env, VMIdentifier vm):
+  BaseSocketConnection(env, vm), _resolver(env.io_service) {
 }
 
 void TCPConnection::startAsyncConnect(std::string host, std::string service,
@@ -80,15 +80,14 @@ void TCPConnection::startAsyncConnect(std::string host, std::string service,
 // TCPAcceptor //
 /////////////////
 
-TCPAcceptor::TCPAcceptor(VM vm,
+TCPAcceptor::TCPAcceptor(BoostEnvironment& env, VMIdentifier vm,
                          const tcp::endpoint& endpoint):
-  env(BoostEnvironment::forVM(vm)),
-  vm(BoostVM::forVM(vm).identifier),
-  _acceptor(env.io_service, endpoint) {
+  env(env), vm(vm), _acceptor(env.io_service, endpoint) {
 }
 
-void TCPAcceptor::startAsyncAccept(TCPConnection::pointer connection,
-                                   const ProtectedNode& connectionNode) {
+void TCPAcceptor::startAsyncAccept(const ProtectedNode& connectionNode) {
+  TCPConnection::pointer connection = TCPConnection::create(env, vm);
+
   auto handler = [=] (const boost::system::error_code& error) {
     if (!error) {
       env.postVMEvent(vm, [=] (BoostVM& boostVM) {
@@ -101,7 +100,7 @@ void TCPAcceptor::startAsyncAccept(TCPConnection::pointer connection,
       });
     } else {
       // Try again
-      startAsyncAccept(connection, connectionNode);
+      startAsyncAccept(connectionNode);
     }
   };
 
diff --git a/vm/boostenv/main/boostenvutils-decl.hh b/vm/boostenv/main/boostenvutils-decl.hh
@@ -49,13 +49,13 @@ public:
 public:
   typedef std::shared_ptr<T> pointer;
 
-  static pointer create(VM vm) {
-    return std::make_shared<T>(vm);
+  static pointer create(BoostEnvironment& env, VMIdentifier vm) {
+    return std::make_shared<T>(env, vm);
   }
 
 public:
   inline
-  BaseSocketConnection(VM vm);
+  BaseSocketConnection(BoostEnvironment& env, VMIdentifier vm);
 
 public:
   typename protocol::socket& socket() {
diff --git a/vm/boostenv/main/boostenvutils.hh b/vm/boostenv/main/boostenvutils.hh
@@ -38,10 +38,8 @@ namespace mozart { namespace boostenv {
 //////////////////////////
 
 template <typename T, typename P>
-BaseSocketConnection<T, P>::BaseSocketConnection(VM vm):
-  env(BoostEnvironment::forVM(vm)),
-  vm(BoostVM::forVM(vm).identifier),
-  _socket(env.io_service) {
+BaseSocketConnection<T, P>::BaseSocketConnection(BoostEnvironment& env, VMIdentifier vm):
+  env(env), vm(vm), _socket(env.io_service) {
 }
 
 template <typename T, typename P>
diff --git a/vm/boostenv/main/boostvm-decl.hh b/vm/boostenv/main/boostvm-decl.hh
@@ -134,9 +134,9 @@ public:
   }
 
 public:
-  VM vm;
   BoostEnvironment& env;
-  VMIdentifier identifier;
+  const VM vm;
+  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;
 };
 
 } }
diff --git a/vm/boostenv/main/boostvm.cc b/vm/boostenv/main/boostvm.cc
@@ -39,19 +39,18 @@ BoostVM::BoostVM(BoostEnvironment& environment,
                  VMIdentifier identifier,
                  VirtualMachineOptions options,
                  std::unique_ptr<std::string>&& app, bool isURL) :
-  VirtualMachine(environment, options), vm(this),
-  env(environment), identifier(identifier),
+  VirtualMachine(environment, options), env(environment),
+  vm(this), identifier(identifier),
   uuidGenerator(random_generator),
   portClosed(false),
   _asyncIONodeCount(0),
   preemptionTimer(environment.io_service),
   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);
@@ -163,6 +162,7 @@ void BoostVM::run() {
   }
 }
 
+// Called by the *IO thread*
 void BoostVM::onPreemptionTimerExpire(const boost::system::error_code& error) {
   if (error != boost::asio::error::operation_aborted &&
       !_terminationRequested) {
diff --git a/vm/boostenv/main/modos.hh b/vm/boostenv/main/modos.hh
@@ -59,6 +59,15 @@ using namespace ::mozart::builtins;
 class ModOS: public Module {
 private:
   static const size_t MaxBufferSize = 1024*1024;
+
+  static BoostEnvironment& env(VM vm) {
+    return BoostEnvironment::forVM(vm);
+  }
+
+  static VMIdentifier ident(VM vm) {
+    return BoostVM::forVM(vm).identifier;
+  }
+
 public:
   ModOS(): Module("OS") {}
 
@@ -76,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);
       }
 
@@ -483,7 +492,7 @@ public:
         endpoint = tcp::endpoint(tcp::v6(), intPort);
 
       try {
-        auto acceptor = TCPAcceptor::create(vm, endpoint);
+        auto acceptor = TCPAcceptor::create(env(vm), ident(vm), endpoint);
         result = build(vm, acceptor);
       } catch (const boost::system::system_error& error) {
         raiseOSError(vm, "tcpAcceptorCreate", error);
@@ -501,7 +510,7 @@ public:
       auto connectionNode =
         BoostVM::forVM(vm).createAsyncIOFeedbackNode(result);
 
-      tcpAcceptor->startAsyncAccept(TCPConnection::create(vm), connectionNode);
+      tcpAcceptor->startAsyncAccept(connectionNode);
     }
   };
 
@@ -544,7 +553,7 @@ public:
         ozVSGet(vm, host, hostBufSize, strHost);
         ozVSGet(vm, service, serviceBufSize, strService);
 
-        auto tcpConnection = TCPConnection::create(vm);
+        auto tcpConnection = TCPConnection::create(env(vm), ident(vm));
 
         auto statusNode =
           BoostVM::forVM(vm).createAsyncIOFeedbackNode(status);
@@ -1004,7 +1013,7 @@ public:
 
 #else  /* !MOZART_WINDOWS */
 
-      auto pipeConnection = PipeConnection::create(vm);
+      auto pipeConnection = PipeConnection::create(env(vm), ident(vm));
 
       // Build the Oz value now so that it is registered for GC
       auto ozPipe = build(vm, pipeConnection);

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ namespace mozart { namespace boostenv {`
`39`	`39`	`// PipeConnection //`
`40`	`40`	`////////////////////`
`41`	`41`
`42`		`-PipeConnection::PipeConnection(VM vm):`
`43`		`- BaseSocketConnection(vm) {`
	`42`	`+PipeConnection::PipeConnection(BoostEnvironment& env, VMIdentifier vm):`
	`43`	`+ BaseSocketConnection(env, vm) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`#endif // BOOST_ASIO_HAS_LOCAL_SOCKETS`