Changeset 64252 in vbox

Timestamp:

Oct 13, 2016 2:20:01 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

111262

Message:

Devices/Storage/DrvHost*: Move destroying the host specific resources to the host specific code

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvHostBase-darwin.cpp (modified) (1 diff)
• DrvHostBase-freebsd.cpp (modified) (1 diff)
• DrvHostBase-linux.cpp (modified) (1 diff)
• DrvHostBase-solaris.cpp (modified) (1 diff)
• DrvHostBase-win.cpp (modified) (1 diff)
• DrvHostBase.cpp (modified) (2 diffs)
• DrvHostBase.h (modified) (2 diffs)
• DrvHostDVD.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/DrvHostBase-darwin.cpp

@@ -208 +208 @@
 }
 
+
+DECLHIDDEN(int) drvHostBasePollerWakeupOs(PDRVHOSTBASE pThis)
+{
+    return RTSemEventSignal(pThis->EventPoller);
+}
+
+
+DECLHIDDEN(void) drvHostBaseDestructOs(PDRVHOSTBASE pThis)
+{
+    if (pThis->EventPoller != NULL)
+    {
+        RTSemEventDestroy(pThis->EventPoller);
+        pThis->EventPoller = NULL;
+    }
+
+    /*
+     * The unclaiming doesn't seem to mean much, the DVD is actually
+     * remounted when we release exclusive access. I'm not quite sure
+     * if I should put the unclaim first or not...
+     *
+     * Anyway, that it's automatically remounted very good news for us,
+     * because that means we don't have to mess with that ourselves. Of
+     * course there is the unlikely scenario that we've succeeded in claiming
+     * and umount the DVD but somehow failed to gain exclusive scsi access...
+     */
+    if (pThis->ppScsiTaskDI)
+    {
+        LogFlow(("%s-%d: releasing exclusive scsi access!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
+        (*pThis->ppScsiTaskDI)->ReleaseExclusiveAccess(pThis->ppScsiTaskDI);
+        (*pThis->ppScsiTaskDI)->Release(pThis->ppScsiTaskDI);
+        pThis->ppScsiTaskDI = NULL;
+    }
+    if (pThis->pDADisk)
+    {
+        LogFlow(("%s-%d: unclaiming the disk!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
+        DADiskUnclaim(pThis->pDADisk);
+        CFRelease(pThis->pDADisk);
+        pThis->pDADisk = NULL;
+    }
+    if (pThis->ppMMCDI)
+    {
+        LogFlow(("%s-%d: releasing the MMC object!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
+        (*pThis->ppMMCDI)->Release(pThis->ppMMCDI);
+        pThis->ppMMCDI = NULL;
+    }
+    if (pThis->MasterPort != IO_OBJECT_NULL)
+    {
+        mach_port_deallocate(mach_task_self(), pThis->MasterPort);
+        pThis->MasterPort = IO_OBJECT_NULL;
+    }
+    if (pThis->pDASession)
+    {
+        LogFlow(("%s-%d: releasing the DA session!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
+        CFRelease(pThis->pDASession);
+        pThis->pDASession = NULL;
+    }
+}
+

trunk/src/VBox/Devices/Storage/DrvHostBase-freebsd.cpp

@@ -208 +208 @@
 }
 
+
+DECLHIDDEN(int) drvHostBasePollerWakeupOs(PDRVHOSTBASE pThis)
+{
+    return RTSemEventSignal(pThis->EventPoller);
+}
+
+
+DECLHIDDEN(void) drvHostBaseDestructOs(PDRVHOSTBASE pThis)
+{
+    if (pThis->EventPoller != NULL)
+    {
+        RTSemEventDestroy(pThis->EventPoller);
+        pThis->EventPoller = NULL;
+    }
+
+    if (pThis->hFileDevice != NIL_RTFILE)
+    {
+        int rc = RTFileClose(pThis->hFileDevice);
+        AssertRC(rc);
+        pThis->hFileDevice = NIL_RTFILE;
+    }
+}
+

trunk/src/VBox/Devices/Storage/DrvHostBase-linux.cpp

@@ -181 +181 @@
 }
 
+
+DECLHIDDEN(int) drvHostBasePollerWakeupOs(PDRVHOSTBASE pThis)
+{
+    return RTSemEventSignal(pThis->EventPoller);
+}
+
+
+DECLHIDDEN(void) drvHostBaseDestructOs(PDRVHOSTBASE pThis)
+{
+    if (pThis->pbDoubleBuffer)
+    {
+        RTMemFree(pThis->pbDoubleBuffer);
+        pThis->pbDoubleBuffer = NULL;
+    }
+
+    if (pThis->EventPoller != NULL)
+    {
+        RTSemEventDestroy(pThis->EventPoller);
+        pThis->EventPoller = NULL;
+    }
+
+    if (pThis->hFileDevice != NIL_RTFILE)
+    {
+        int rc = RTFileClose(pThis->hFileDevice);
+        AssertRC(rc);
+        pThis->hFileDevice = NIL_RTFILE;
+    }
+}
+

trunk/src/VBox/Devices/Storage/DrvHostBase-solaris.cpp

@@ -201 +201 @@
 }
 
+
+DECLHIDDEN(int) drvHostBasePollerWakeupOs(PDRVHOSTBASE pThis)
+{
+    return RTSemEventSignal(pThis->EventPoller);
+}
+
+
+DECLHIDDEN(void) drvHostBaseDestructOs(PDRVHOSTBASE pThis)
+{
+    if (pThis->EventPoller != NULL)
+    {
+        RTSemEventDestroy(pThis->EventPoller);
+        pThis->EventPoller = NULL;
+    }
+
+    if (pThis->hFileDevice != NIL_RTFILE)
+    {
+        int rc = RTFileClose(pThis->hFileDevice);
+        AssertRC(rc);
+        pThis->hFileDevice = NIL_RTFILE;
+    }
+
+    if (pThis->hFileRawDevice != NIL_RTFILE)
+    {
+        int rc = RTFileClose(pThis->hFileRawDevice);
+        AssertRC(rc);
+        pThis->hFileRawDevice = NIL_RTFILE;
+    }
+
+    if (pThis->pszRawDeviceOpen)
+    {
+        RTStrFree(pThis->pszRawDeviceOpen);
+        pThis->pszRawDeviceOpen = NULL;
+    }
+}
+

trunk/src/VBox/Devices/Storage/DrvHostBase-win.cpp

@@ -239 +239 @@
 }
 
+
+DECLHIDDEN(int) drvHostBasePollerWakeupOs(PDRVHOSTBASE pThis)
+{
+    if (pThis->hwndDeviceChange)
+        PostMessage(pThis->hwndDeviceChange, WM_CLOSE, 0, 0); /* default win proc will destroy the window */
+
+    return VINF_SUCCESS;
+}
+
+
+DECLHIDDEN(void) drvHostBaseDestructOs(PDRVHOSTBASE pThis)
+{
+    if (pThis->EventPoller != NULL)
+    {
+        RTSemEventDestroy(pThis->EventPoller);
+        pThis->EventPoller = NULL;
+    }
+
+    if (pThis->hwndDeviceChange)
+    {
+        if (SetWindowLongPtr(pThis->hwndDeviceChange, GWLP_USERDATA, 0) == (LONG_PTR)pThis)
+            PostMessage(pThis->hwndDeviceChange, WM_CLOSE, 0, 0); /* default win proc will destroy the window */
+        pThis->hwndDeviceChange = NULL;
+    }
+
+    if (pThis->hFileDevice != NIL_RTFILE)
+    {
+        int rc = RTFileClose(pThis->hFileDevice);
+        AssertRC(rc);
+        pThis->hFileDevice = NIL_RTFILE;
+    }
+}
+

trunk/src/VBox/Devices/Storage/DrvHostBase.cpp

@@ -1369 +1369 @@
         do
         {
-#ifdef RT_OS_WINDOWS
-            if (pThis->hwndDeviceChange)
-                PostMessage(pThis->hwndDeviceChange, WM_CLOSE, 0, 0); /* default win proc will destroy the window */
-#else
-            RTSemEventSignal(pThis->EventPoller);
-#endif
+            drvHostBasePollerWakeupOs(pThis);
             rc = RTThreadWait(pThis->ThreadPoller, 100, NULL);
         } while (cTimes-- > 0 && rc == VERR_TIMEOUT);
@@ -1404 +1399 @@
      * Cleanup the other resources.
      */
-#ifdef RT_OS_WINDOWS
-    if (pThis->hwndDeviceChange)
-    {
-        if (SetWindowLongPtr(pThis->hwndDeviceChange, GWLP_USERDATA, 0) == (LONG_PTR)pThis)
-            PostMessage(pThis->hwndDeviceChange, WM_CLOSE, 0, 0); /* default win proc will destroy the window */
-        pThis->hwndDeviceChange = NULL;
-    }
-#else
-    if (pThis->EventPoller != NULL)
-    {
-        RTSemEventDestroy(pThis->EventPoller);
-        pThis->EventPoller = NULL;
-    }
-#endif
-
-#ifdef RT_OS_DARWIN
-    /*
-     * The unclaiming doesn't seem to mean much, the DVD is actually
-     * remounted when we release exclusive access. I'm not quite sure
-     * if I should put the unclaim first or not...
-     *
-     * Anyway, that it's automatically remounted very good news for us,
-     * because that means we don't have to mess with that ourselves. Of
-     * course there is the unlikely scenario that we've succeeded in claiming
-     * and umount the DVD but somehow failed to gain exclusive scsi access...
-     */
-    if (pThis->ppScsiTaskDI)
-    {
-        LogFlow(("%s-%d: releasing exclusive scsi access!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
-        (*pThis->ppScsiTaskDI)->ReleaseExclusiveAccess(pThis->ppScsiTaskDI);
-        (*pThis->ppScsiTaskDI)->Release(pThis->ppScsiTaskDI);
-        pThis->ppScsiTaskDI = NULL;
-    }
-    if (pThis->pDADisk)
-    {
-        LogFlow(("%s-%d: unclaiming the disk!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
-        DADiskUnclaim(pThis->pDADisk);
-        CFRelease(pThis->pDADisk);
-        pThis->pDADisk = NULL;
-    }
-    if (pThis->ppMMCDI)
-    {
-        LogFlow(("%s-%d: releasing the MMC object!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
-        (*pThis->ppMMCDI)->Release(pThis->ppMMCDI);
-        pThis->ppMMCDI = NULL;
-    }
-    if (pThis->MasterPort != IO_OBJECT_NULL)
-    {
-        mach_port_deallocate(mach_task_self(), pThis->MasterPort);
-        pThis->MasterPort = IO_OBJECT_NULL;
-    }
-    if (pThis->pDASession)
-    {
-        LogFlow(("%s-%d: releasing the DA session!\n", pDrvIns->pReg->szName, pDrvIns->iInstance));
-        CFRelease(pThis->pDASession);
-        pThis->pDASession = NULL;
-    }
-#else
-    if (pThis->hFileDevice != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->hFileDevice);
-        AssertRC(rc);
-        pThis->hFileDevice = NIL_RTFILE;
-    }
-#endif
-
-#ifdef RT_OS_SOLARIS
-    if (pThis->hFileRawDevice != NIL_RTFILE)
-    {
-        int rc = RTFileClose(pThis->hFileRawDevice);
-        AssertRC(rc);
-        pThis->hFileRawDevice = NIL_RTFILE;
-    }
-
-    if (pThis->pszRawDeviceOpen)
-    {
-        RTStrFree(pThis->pszRawDeviceOpen);
-        pThis->pszRawDeviceOpen = NULL;
-    }
-#endif
+    drvHostBaseDestructOs(pThis);
 
     if (pThis->pszDevice)

trunk/src/VBox/Devices/Storage/DrvHostBase.h

@@ -23 +23 @@
 #include <iprt/critsect.h>
 #include <iprt/log.h>
+#include <iprt/semaphore.h>
 #include <VBox/cdefs.h>
 #include <VBox/vmm/pdmdrv.h>
@@ -197 +198 @@
 DECLHIDDEN(int) drvHostBaseFlushOs(PDRVHOSTBASE pThis);
 
+DECLHIDDEN(int) drvHostBasePollerWakeupOs(PDRVHOSTBASE pThis);
+DECLHIDDEN(void) drvHostBaseDestructOs(PDRVHOSTBASE pThis);
+
 /** Makes a PDRVHOSTBASE out of a PPDMIMOUNT. */
 #define PDMIMOUNT_2_DRVHOSTBASE(pInterface)        ( (PDRVHOSTBASE)((uintptr_t)pInterface - RT_OFFSETOF(DRVHOSTBASE, IMount)) )

trunk/src/VBox/Devices/Storage/DrvHostDVD.cpp

@@ -442 +442 @@
 static DECLCALLBACK(void) drvHostDvdDestruct(PPDMDRVINS pDrvIns)
 {
-#ifdef RT_OS_LINUX
-    PDRVHOSTBASE pThis = PDMINS_2_DATA(pDrvIns, PDRVHOSTBASE);
-
-    if (pThis->pbDoubleBuffer)
-    {
-        RTMemFree(pThis->pbDoubleBuffer);
-        pThis->pbDoubleBuffer = NULL;
-    }
-#endif
     return DRVHostBaseDestruct(pDrvIns);
 }