Changeset 28263 in vbox

Timestamp:

Apr 13, 2010 3:55:36 PM (15 years ago)

Author:

vboxsync

Message:

PDM: Put pAsyncCompletionTemplates under the ListCritSect.

Location:

trunk/src/VBox/VMM

Files:

• PDMAsyncCompletion.cpp (modified) (17 diffs)
• PDMAsyncCompletionInternal.h (modified) (4 diffs)
• PDMInternal.h (modified) (4 diffs)

trunk/src/VBox/VMM/PDMAsyncCompletion.cpp

@@ -151 +151 @@
      * Add template to the global VM template list.
      */
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
     pTemplate->pNext = pUVM->pdm.s.pAsyncCompletionTemplates;
     if (pUVM->pdm.s.pAsyncCompletionTemplates)
         pUVM->pdm.s.pAsyncCompletionTemplates->pPrev = pTemplate;
     pUVM->pdm.s.pAsyncCompletionTemplates = pTemplate;
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
 
     *ppTemplate = pTemplate;
@@ -398 +400 @@
      */
     PUVM pUVM = pTemplate->pVM->pUVM;
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
+
     PPDMASYNCCOMPLETIONTEMPLATE pPrev = pTemplate->pPrev;
     PPDMASYNCCOMPLETIONTEMPLATE pNext = pTemplate->pNext;
@@ -409 +413 @@
         pNext->pPrev = pPrev;
 
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
+
     /*
      * Free the template.
@@ -441 +447 @@
      * Unlink it.
      */
-    PPDMASYNCCOMPLETIONTEMPLATE pTemplate = pVM->pUVM->pdm.s.pAsyncCompletionTemplates;
+    PUVM pUVM = pVM->pUVM;
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
+    PPDMASYNCCOMPLETIONTEMPLATE pTemplate = pUVM->pdm.s.pAsyncCompletionTemplates;
     while (pTemplate)
     {
@@ -451 +459 @@
             int rc = PDMR3AsyncCompletionTemplateDestroy(pTemplateDestroy);
             if (RT_FAILURE(rc))
+            {
+                RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
                 return rc;
+            }
         }
         else
@@ -457 +468 @@
     }
 
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
     return VINF_SUCCESS;
 }
@@ -484 +496 @@
      * Unlink it.
      */
-    PPDMASYNCCOMPLETIONTEMPLATE pTemplate = pVM->pUVM->pdm.s.pAsyncCompletionTemplates;
+    PUVM pUVM = pVM->pUVM;
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
+    PPDMASYNCCOMPLETIONTEMPLATE pTemplate = pUVM->pdm.s.pAsyncCompletionTemplates;
     while (pTemplate)
     {
@@ -494 +508 @@
             int rc = PDMR3AsyncCompletionTemplateDestroy(pTemplateDestroy);
             if (RT_FAILURE(rc))
+            {
+                RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
                 return rc;
+            }
         }
         else
@@ -500 +517 @@
     }
 
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
     return VINF_SUCCESS;
 }
@@ -527 +545 @@
      * Unlink it.
      */
-    PPDMASYNCCOMPLETIONTEMPLATE pTemplate = pVM->pUVM->pdm.s.pAsyncCompletionTemplates;
+    PUVM pUVM = pVM->pUVM;
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
+    PPDMASYNCCOMPLETIONTEMPLATE pTemplate = pUVM->pdm.s.pAsyncCompletionTemplates;
     while (pTemplate)
     {
@@ -537 +557 @@
             int rc = PDMR3AsyncCompletionTemplateDestroy(pTemplateDestroy);
             if (RT_FAILURE(rc))
+            {
+                RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
                 return rc;
+            }
         }
         else
@@ -543 +566 @@
     }
 
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
     return VINF_SUCCESS;
 }
@@ -631 +655 @@
                 {
                     PUVM pUVM = pVM->pUVM;
-                    AssertMsg(!pUVM->pdm.s.papAsyncCompletionEndpointClass[pEpClassOps->enmClassType],
+                    AssertMsg(!pUVM->pdm.s.apAsyncCompletionEndpointClass[pEpClassOps->enmClassType],
                               ("Endpoint class was already initialized\n"));
 
-                    pUVM->pdm.s.papAsyncCompletionEndpointClass[pEpClassOps->enmClassType] = pEndpointClass;
+                    pUVM->pdm.s.apAsyncCompletionEndpointClass[pEpClassOps->enmClassType] = pEndpointClass;
                     LogFlowFunc((": Initialized endpoint class \"%s\" rc=%Rrc\n", pEpClassOps->pcszName, rc));
                     return VINF_SUCCESS;
@@ -674 +698 @@
 
     /* Free the memory of the class finally and clear the entry in the class array. */
-    pVM->pUVM->pdm.s.papAsyncCompletionEndpointClass[pEndpointClass->pEndpointOps->enmClassType] = NULL;
+    pVM->pUVM->pdm.s.apAsyncCompletionEndpointClass[pEndpointClass->pEndpointOps->enmClassType] = NULL;
     MMR3HeapFree(pEndpointClass);
 }
@@ -693 +717 @@
     VM_ASSERT_EMT(pVM);
 
-    do
-    {
-        /* Allocate array for global class data. */
-        rc = MMR3HeapAllocZEx(pVM, MM_TAG_PDM_ASYNC_COMPLETION,
-                              sizeof(PPDMASYNCCOMPLETIONEPCLASS) * PDMASYNCCOMPLETIONEPCLASSTYPE_MAX,
-                              (void **)&pUVM->pdm.s.papAsyncCompletionEndpointClass);
-        if (RT_FAILURE(rc))
-            break;
-
-        PCFGMNODE pCfgRoot = CFGMR3GetRoot(pVM);
-        PCFGMNODE pCfgAsyncCompletion = CFGMR3GetChild(CFGMR3GetChild(pCfgRoot, "PDM"), "AsyncCompletion");
-
-        rc = pdmR3AsyncCompletionEpClassInit(pVM, &g_PDMAsyncCompletionEndpointClassFile, pCfgAsyncCompletion);
-        if (RT_FAILURE(rc))
-            break;
-
-        /* Put other classes here. */
-    } while (0);
+    PCFGMNODE pCfgRoot            = CFGMR3GetRoot(pVM);
+    PCFGMNODE pCfgAsyncCompletion = CFGMR3GetChild(CFGMR3GetChild(pCfgRoot, "PDM"), "AsyncCompletion");
+
+    rc = pdmR3AsyncCompletionEpClassInit(pVM, &g_PDMAsyncCompletionEndpointClassFile, pCfgAsyncCompletion);
 
     LogFlowFunc((": pVM=%p rc=%Rrc\n", pVM, rc));
@@ -728 +738 @@
     PUVM pUVM = pVM->pUVM;
 
-    if (pUVM->pdm.s.papAsyncCompletionEndpointClass)
-    {
-        pdmR3AsyncCompletionEpClassTerminate(pUVM->pdm.s.papAsyncCompletionEndpointClass[PDMASYNCCOMPLETIONEPCLASSTYPE_FILE]);
-        MMR3HeapFree(pUVM->pdm.s.papAsyncCompletionEndpointClass);
-    }
+    for (size_t i = 0; i < RT_ELEMENTS(pUVM->pdm.s.apAsyncCompletionEndpointClass); i++)
+        if (pUVM->pdm.s.apAsyncCompletionEndpointClass[i])
+            pdmR3AsyncCompletionEpClassTerminate(pUVM->pdm.s.apAsyncCompletionEndpointClass[i]);
+
     return VINF_SUCCESS;
 }
@@ -880 +889 @@
     PVM  pVM  = pTemplate->pVM;
     PUVM pUVM = pVM->pUVM;
-    PPDMASYNCCOMPLETIONEPCLASS  pEndpointClass = pUVM->pdm.s.papAsyncCompletionEndpointClass[PDMASYNCCOMPLETIONEPCLASSTYPE_FILE];
+    PPDMASYNCCOMPLETIONEPCLASS  pEndpointClass = pUVM->pdm.s.apAsyncCompletionEndpointClass[PDMASYNCCOMPLETIONEPCLASSTYPE_FILE];
     PPDMASYNCCOMPLETIONENDPOINT pEndpoint = NULL;
 

trunk/src/VBox/VMM/PDMAsyncCompletionInternal.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2008 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -19 +19 @@
  * additional information or have any questions.
  */
-#ifndef __PDMAsyncCompletionInternal_h
-#define __PDMAsyncCompletionInternal_h
-
-#include "PDMInternal.h"
-#include <iprt/cdefs.h>
+
+#ifndef ___PDMAsyncCompletionInternal_h
+#define ___PDMAsyncCompletionInternal_h
+
 #include <iprt/critsect.h>
 #include <iprt/memcache.h>
@@ -31 +30 @@
 #include <VBox/stam.h>
 #include <VBox/pdmasynccompletion.h>
+#include "PDMInternal.h"
 
 RT_C_DECLS_BEGIN
 
-/**
- * Supported endpoint classes.
- */
-typedef enum PDMASYNCCOMPLETIONEPCLASSTYPE
-{
-    /** File class. */
-    PDMASYNCCOMPLETIONEPCLASSTYPE_FILE = 0,
-    /** Number of supported classes. */
-    PDMASYNCCOMPLETIONEPCLASSTYPE_MAX,
-    /** 32bit hack. */
-    PDMASYNCCOMPLETIONEPCLASSTYPE_32BIT_HACK = 0x7fffffff
-} PDMASYNCCOMPLETIONEPCLASSTYPE;
 
 /**
@@ -274 +262 @@
 extern const PDMASYNCCOMPLETIONEPCLASSOPS g_PDMAsyncCompletionEndpointClassFile;
 
-#endif /* __PDMAsyncCompletionInternal_h */
+#endif /* !___PDMAsyncCompletionInternal_h */
+

trunk/src/VBox/VMM/PDMInternal.h

@@ -91 +91 @@
 /** Pointer to an USB HUB registration record. */
 typedef struct PDMUSBHUB *PPDMUSBHUB;
+
+/**
+ * Supported asynchronous completion endpoint classes.
+ */
+typedef enum PDMASYNCCOMPLETIONEPCLASSTYPE
+{
+    /** File class. */
+    PDMASYNCCOMPLETIONEPCLASSTYPE_FILE = 0,
+    /** Number of supported classes. */
+    PDMASYNCCOMPLETIONEPCLASSTYPE_MAX,
+    /** 32bit hack. */
+    PDMASYNCCOMPLETIONEPCLASSTYPE_32BIT_HACK = 0x7fffffff
+} PDMASYNCCOMPLETIONEPCLASSTYPE;
 
 /**
@@ -1000 +1013 @@
 
 
+
 /**
  * PDM data kept in the UVM.
@@ -1016 +1030 @@
     /** Tail of the PDM Thread list. (singly linked) */
     R3PTRTYPE(PPDMTHREAD)           pThreadsTail;
-
-    /** @name   PDM Async Completion
-     * @{ */
-    /** Pointer to the array of supported endpoint classes. */
-    R3PTRTYPE(PPDMASYNCCOMPLETIONEPCLASS *)  papAsyncCompletionEndpointClass;
-    /** Head of the templates. (singly linked) */
-    R3PTRTYPE(PPDMASYNCCOMPLETIONTEMPLATE) pAsyncCompletionTemplates;
-    /** @} */
 
     /** Lock protecting the lists below it. */
@@ -1031 +1037 @@
     /** List of initialized critical sections. (LIFO) */
     R3PTRTYPE(PPDMCRITSECTINT)      pCritSects;
+
+    /** @name   PDM Async Completion
+     * @{ */
+    /** Pointer to the array of supported endpoint classes. */
+    PPDMASYNCCOMPLETIONEPCLASS      apAsyncCompletionEndpointClass[PDMASYNCCOMPLETIONEPCLASSTYPE_MAX];
+    /** Head of the templates. Singly linked, protected by ListCritSect. */
+    R3PTRTYPE(PPDMASYNCCOMPLETIONTEMPLATE) pAsyncCompletionTemplates;
+    /** @} */
 
 } PDMUSERPERVM;