Update ASIO wrapper constructors to only take BoostEnvironment and VMIdentifier

* Restore the behavior of creating a new TCPConnection
  in every call of startAsyncAccept().

Author: eregon

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

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

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;

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);
     }
   };
 

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() {

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>

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") {}
 
@@ -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);