Changeset 25732 in vbox for trunk/include/VBox

Timestamp:

Jan 11, 2010 4:23:26 PM (15 years ago)

Author:

vboxsync

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

56476

Message:

PDMCritSect: Deployed lock ordering. (ring-3 only, only DEBUG_bird atm)

Location:

trunk/include/VBox

Files:

• pdmcritsect.h (modified) (1 diff)
• pdmdev.h (modified) (2 diffs)

trunk/include/VBox/pdmcritsect.h

@@ -55 +55 @@
 } PDMCRITSECT;
 
-VMMR3DECL(int)      PDMR3CritSectInit(PVM pVM, PPDMCRITSECT pCritSect, const char *pszName);
+VMMR3DECL(int)      PDMR3CritSectInit(PVM pVM, PPDMCRITSECT pCritSect, RT_SRC_POS_DECL, const char *pszNameFmt, ...);
 VMMDECL(int)        PDMCritSectEnter(PPDMCRITSECT pCritSect, int rcBusy);
 VMMDECL(int)        PDMCritSectEnterDebug(PPDMCRITSECT pCritSect, int rcBusy, RTHCUINTPTR uId, RT_SRC_POS_DECL);

trunk/include/VBox/pdmdev.h

@@ -2360 +2360 @@
      * @param   pDevIns             Device instance.
      * @param   pCritSect           Pointer to the critical section.
-     * @param   pszName             The name of the critical section (for
-     *                              statistics).
-     */
-    DECLR3CALLBACKMEMBER(int, pfnCritSectInit,(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, const char *pszName));
+     * @param   RT_SRC_POS_DECL     Use RT_SRC_POS.
+     * @param   pszNameFmt          Format string for namging the critical section.
+     *                              For statistics and lock validation.
+     * @param   va                  Arguments for the format string.
+     */
+    DECLR3CALLBACKMEMBER(int, pfnCritSectInit,(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, RT_SRC_POS_DECL,
+                                               const char *pszNameFmt, va_list va));
 
     /**
@@ -3702 +3705 @@
 
 /**
- * @copydoc PDMDEVHLPR3::pfnCritSectInit
- */
-DECLINLINE(int) PDMDevHlpCritSectInit(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, const char *pszName)
-{
-    return pDevIns->pDevHlpR3->pfnCritSectInit(pDevIns, pCritSect, pszName);
+ * Initializes a PDM critical section.
+ *
+ * The PDM critical sections are derived from the IPRT critical sections, but
+ * works in GC as well.
+ *
+ * @returns VBox status code.
+ * @param   pDevIns             Device instance.
+ * @param   pCritSect           Pointer to the critical section.
+ * @param   RT_SRC_POS_DECL     Use RT_SRC_POS.
+ * @param   pszNameFmt          Format string for namging the critical section.
+ *                              For statistics and lock validation.
+ * @param   ...                 Arguments for the format string.
+ */
+DECLINLINE(int) PDMDevHlpCritSectInit(PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, RT_SRC_POS_DECL, const char *pszNameFmt, ...)
+{
+    va_list va;
+    va_start(va, pszNameFmt);
+    int rc = pDevIns->pDevHlpR3->pfnCritSectInit(pDevIns, pCritSect, RT_SRC_POS_ARGS, pszNameFmt, va);
+    va_end(va);
+    return rc;
 }