Changeset 54705 in vbox for trunk/src/VBox

Timestamp:

Mar 10, 2015 2:02:28 PM (10 years ago)

Author:

vboxsync

Message:

Main: VBoxNetNAT/VBoxNetDHCP: sometimes it's required to kill the runner process (in case of no Main clients)

Location:

trunk/src/VBox/Main

Files:

• include/NetworkServiceRunner.h (modified) (1 diff)
• src-server/DHCPServerImpl.cpp (modified) (5 diffs)
• src-server/NATNetworkImpl.cpp (modified) (2 diffs)
• src-server/NetworkServiceRunner.cpp (modified) (5 diffs)

trunk/src/VBox/Main/include/NetworkServiceRunner.h

@@ -37 +37 @@
     int setOption(const std::string& key, const std::string& val);
 
-    int start();
-    int stop();
+    int  start(bool aKillProcOnStop);
+    int  stop();
     bool isRunning();
-
     void detachFromServer();
 

trunk/src/VBox/Main/src-server/DHCPServerImpl.cpp

@@ -40 +40 @@
 struct DHCPServer::Data
 {
-    Data() : enabled(FALSE) {}
+    Data()
+        : enabled(FALSE)
+        , router(false)
+    {}
 
     Bstr IPAddress;
@@ -47 +50 @@
 
     BOOL enabled;
+    bool router;
     DHCPServerRunner dhcp;
 
@@ -55 +59 @@
 
 DHCPServer::DHCPServer()
-  : m(NULL), mVirtualBox(NULL)
+  : m(NULL)
+  , mVirtualBox(NULL)
 {
     m = new DHCPServer::Data();
@@ -391 +396 @@
     /* Indirect way to understand that we're on NAT network */
     if (aOption == DhcpOpt_Router)
+    {
         m->dhcp.setOption(NetworkServiceRunner::kNsrKeyNeedMain, "on");
+        m->router = true;
+    }
 
     alock.release();
@@ -566 +574 @@
 
     /* XXX: This parameters Dhcp Server will fetch via API */
-    return RT_FAILURE(m->dhcp.start()) ? E_FAIL : S_OK;
+    return RT_FAILURE(m->dhcp.start(!m->router /* KillProcOnExit */)) ? E_FAIL : S_OK;
     //m->dhcp.detachFromServer(); /* need to do this to avoid server shutdown on runner destruction */
 }

trunk/src/VBox/Main/src-server/NATNetworkImpl.cpp

@@ -797 +797 @@
     }
 
-    if (RT_SUCCESS(m->NATRunner.start()))
+    if (RT_SUCCESS(m->NATRunner.start(false /* KillProcOnStop */)))
     {
         mVirtualBox->i_onNATNetworkStartStop(Bstr(mName).raw(), TRUE);
@@ -813 +813 @@
 {
 #ifdef VBOX_WITH_NAT_SERVICE
+    mVirtualBox->i_onNATNetworkStartStop(Bstr(mName).raw(), FALSE);
+
     if (!m->dhcpServer.isNull())
         m->dhcpServer->Stop();
 
     if (RT_SUCCESS(m->NATRunner.stop()))
-    {
-        mVirtualBox->i_onNATNetworkStartStop(Bstr(mName).raw(), FALSE);
         return S_OK;
-    }
+
     /** @todo missing setError()! */
     return E_FAIL;

trunk/src/VBox/Main/src-server/NetworkServiceRunner.cpp

@@ -22 +22 @@
 #include <iprt/param.h>
 #include <iprt/env.h>
+#include <iprt/log.h>
+#include <iprt/thread.h>
 
 
-const std::string NetworkServiceRunner::kNsrKeyName = "--name";
-const std::string NetworkServiceRunner::kNsrKeyNetwork = "--network";
+const std::string NetworkServiceRunner::kNsrKeyName      = "--name";
+const std::string NetworkServiceRunner::kNsrKeyNetwork   = "--network";
 const std::string NetworkServiceRunner::kNsrKeyTrunkType = "--trunk-type";
-const std::string NetworkServiceRunner::kNsrTrunkName = "--trunk-name";
-const std::string NetworkServiceRunner::kNsrMacAddress = "--mac-address";
-const std::string NetworkServiceRunner::kNsrIpAddress = "--ip-address";
-const std::string NetworkServiceRunner::kNsrIpNetmask = "--netmask";
-const std::string NetworkServiceRunner::kNsrKeyNeedMain = "--need-main";
+const std::string NetworkServiceRunner::kNsrTrunkName    = "--trunk-name";
+const std::string NetworkServiceRunner::kNsrMacAddress   = "--mac-address";
+const std::string NetworkServiceRunner::kNsrIpAddress    = "--ip-address";
+const std::string NetworkServiceRunner::kNsrIpNetmask    = "--netmask";
+const std::string NetworkServiceRunner::kNsrKeyNeedMain  = "--need-main";
 
 struct NetworkServiceRunner::Data
 {
-    Data(const char* aProcName):mProcName(aProcName), mProcess(NIL_RTPROCESS){}
+    Data(const char* aProcName)
+        : mProcName(aProcName)
+        , mProcess(NIL_RTPROCESS)
+        , mKillProcOnStop(false)
+    {}
     const char *mProcName;
     RTPROCESS mProcess;
     std::map<std::string, std::string> mOptions;
+    bool mKillProcOnStop;
 };
 
@@ -44 +51 @@
 {
     m = new NetworkServiceRunner::Data(aProcName);
-
 }
 
@@ -69 +75 @@
 
 
-int NetworkServiceRunner::start()
+int NetworkServiceRunner::start(bool aKillProcOnStop)
 {
     if (isRunning())
@@ -108 +114 @@
         m->mProcess = NIL_RTPROCESS;
 
+    m->mKillProcOnStop = aKillProcOnStop;
     return rc;
 }
@@ -114 +121 @@
 int NetworkServiceRunner::stop()
 {
+    /*
+     * If the process already terminated, this function will also grab the exit
+     * status and transition the process out of zombie status.
+     */
     if (!isRunning())
         return VINF_OBJECT_DESTROYED;
+
+    bool fDoKillProc = true;
+
+    if (!m->mKillProcOnStop)
+    {
+        /*
+         * This is a VBoxSVC Main client. Do NOT kill it but assume it was shut
+         * down politely. Wait up to 1 second until the process is killed before
+         * doing the final hard kill.
+         */
+        int rc = VINF_SUCCESS;
+        for (unsigned int i = 0; i < 100; i++)
+        {
+            rc = RTProcWait(m->mProcess, RTPROCWAIT_FLAGS_NOBLOCK, NULL);
+            if (RT_SUCCESS(rc))
+                break;
+            RTThreadSleep(10);
+        }
+        if (rc != VERR_PROCESS_RUNNING)
+            fDoKillProc = false;
+    }
+
+    if (fDoKillProc)
+    {
+        int rc = RTProcTerminate(m->mProcess);
+        rc = RTProcWait(m->mProcess, RTPROCWAIT_FLAGS_BLOCK, NULL);
+    }
 
     m->mProcess = NIL_RTPROCESS;