Changeset 44421 in vbox for trunk/src

Timestamp:

Jan 28, 2013 12:42:07 PM (12 years ago)

Author:

vboxsync

Message:

mpVM -> mpUVM in comments and such.

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (2 diffs)
• src-client/ConsoleImpl.cpp (modified) (14 diffs)
• src-client/DisplayImpl.cpp (modified) (6 diffs)

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

@@ -333 +333 @@
 #if 0
     /**
-     *  Helper class that protects sections of code using the mpVM pointer by
+     *  Helper class that protects sections of code using the mpUVM pointer by
      *  automatically calling addVMCaller() on construction and
      *  releaseVMCaller() on destruction. Intended for Console methods dealing
-     *  with mpVM. The usage pattern is:
+     *  with mpUVM. The usage pattern is:
      *  <code>
      *      AutoVMCaller autoVMCaller(this);
      *      if (FAILED(autoVMCaller.rc())) return autoVMCaller.rc();
      *      ...
-     *      VMR3ReqCall (mpVM, ...
+     *      VMR3ReqCall (mpUVM, ...
      *  </code>
      *
@@ -737 +737 @@
     /** The user mode VM handle. */
     PUVM mpUVM;
-    /** Holds the number of "readonly" mpVM/mpUVM callers (users) */
+    /** Holds the number of "readonly" mpUVM callers (users). */
     uint32_t mVMCallers;
-    /** Semaphore posted when the number of mpVM callers drops to zero */
+    /** Semaphore posted when the number of mpUVM callers drops to zero. */
     RTSEMEVENT mVMZeroCallersSem;
-    /** true when Console has entered the mpVM destruction phase */
+    /** true when Console has entered the mpUVM destruction phase. */
     bool mVMDestroying : 1;
-    /** true when power down is initiated by vmstateChangeCallback (EMT) */
+    /** true when power down is initiated by vmstateChangeCallback (EMT). */
     bool mVMPoweredOff : 1;
     /** true when vmstateChangeCallback shouldn't initiate a power down.  */

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -2836 +2836 @@
         }
 
-        /* create a task object early to ensure mpVM protection is successful */
+        /* Create a task object early to ensure mpUVM protection is successful. */
         std::auto_ptr<VMSaveTask> task(new VMSaveTask(this, pProgress,
                                                       stateFilePath,
@@ -5417 +5417 @@
     AssertComRCReturnRC(autoCaller.rc());
 
-    /* protect mpVM (if not NULL) */
+    /* protect mpUVM (if not NULL) */
     AutoVMCallerWeak autoVMCaller(this);
-    if (FAILED(autoVMCaller.rc())) return autoVMCaller.rc();
+    if (FAILED(autoVMCaller.rc()))
+        return autoVMCaller.rc();
 
     /* Note: validity of mVMMDev which is bound to uninit() is guaranteed by
@@ -5496 +5497 @@
     AssertComRCReturnRC(autoCaller.rc());
 
-    /* protect mpVM (if not NULL) */
+    /* protect mpUVM (if not NULL) */
     AutoVMCallerWeak autoVMCaller(this);
-    if (FAILED(autoVMCaller.rc())) return autoVMCaller.rc();
+    if (FAILED(autoVMCaller.rc()))
+        return autoVMCaller.rc();
 
     /* Note: validity of mVMMDev which is bound to uninit() is guaranteed by
@@ -5576 +5578 @@
     AssertComRCReturnRC(autoCaller.rc());
 
-    /* protect mpVM (if not NULL) */
+    /* protect mpUVM (if not NULL) */
     AutoVMCallerWeak autoVMCaller(this);
-    if (FAILED(autoVMCaller.rc())) return autoVMCaller.rc();
+    if (FAILED(autoVMCaller.rc()))
+        return autoVMCaller.rc();
 
     /* Note: validity of mVMMDev which is bound to uninit() is guaranteed by
@@ -6091 +6094 @@
 
 /**
- * Increases the usage counter of the mpVM pointer. Guarantees that
- * VMR3Destroy() will not be called on it at least until releaseVMCaller()
- * is called.
- *
- * If this method returns a failure, the caller is not allowed to use mpVM
- * and may return the failed result code to the upper level. This method sets
- * the extended error info on failure if \a aQuiet is false.
+ * Increases the usage counter of the mpUVM pointer.
+ *
+ * Guarantees that VMR3Destroy() will not be called on it at least until
+ * releaseVMCaller() is called.
+ *
+ * If this method returns a failure, the caller is not allowed to use mpUVM and
+ * may return the failed result code to the upper level. This method sets the
+ * extended error info on failure if \a aQuiet is false.
  *
  * Setting \a aQuiet to true is useful for methods that don't want to return
  * the failed result code to the caller when this method fails (e.g. need to
- * silently check for the mpVM availability).
- *
- * When mpVM is NULL but \a aAllowNullVM is true, a corresponding error will be
+ * silently check for the mpUVM availability).
+ *
+ * When mpUVM is NULL but \a aAllowNullVM is true, a corresponding error will be
  * returned instead of asserting. Having it false is intended as a sanity check
- * for methods that have checked mMachineState and expect mpVM *NOT* to be NULL.
+ * for methods that have checked mMachineState and expect mpUVM *NOT* to be
+ * NULL.
  *
  * @param aQuiet       true to suppress setting error info
- * @param aAllowNullVM true to accept mpVM being NULL and return a failure
- *                     (otherwise this method will assert if mpVM is NULL)
+ * @param aAllowNullVM true to accept mpUVM being NULL and return a failure
+ *                     (otherwise this method will assert if mpUVM is NULL)
  *
  * @note Locks this object for writing.
@@ -6146 +6151 @@
 
 /**
- * Decreases the usage counter of the mpVM pointer. Must always complete
- * the addVMCaller() call after the mpVM pointer is no more necessary.
+ * Decreases the usage counter of the mpUVM pointer.
+ *
+ * Must always complete the addVMCaller() call after the mpUVM pointer is no
+ * more necessary.
  *
  * @note Locks this object for writing.
@@ -6768 +6775 @@
  * Calling it in situations other than the above will cause unexpected behavior.
  *
- * Note that this method should be the only one that destroys mpVM and sets it
+ * Note that this method should be the only one that destroys mpUVM and sets it
  * to NULL.
  *
@@ -6875 +6882 @@
 
     /* ----------------------------------------------------------------------
-     * Now, wait for all mpVM callers to finish their work if there are still
-     * some on other threads. NO methods that need mpVM (or initiate other calls
+     * Now, wait for all mpUVM callers to finish their work if there are still
+     * some on other threads. NO methods that need mpUVM (or initiate other calls
      * that need it) may be called after this point
      * ---------------------------------------------------------------------- */
@@ -6889 +6896 @@
             RTSemEventCreate(&mVMZeroCallersSem);
 
-        LogFlowThisFunc(("Waiting for mpVM callers (%d) to drop to zero...\n",
-                          mVMCallers));
+        LogFlowThisFunc(("Waiting for mpUVM callers (%d) to drop to zero...\n", mVMCallers));
 
         alock.release();
@@ -6969 +6975 @@
         }
 
-        /* Now we've got to destroy the VM as well. (mpVM is not valid beyond
+        /* Now we've got to destroy the VM as well. (mpUVM is not valid beyond
          * this point). We release the lock before calling VMR3Destroy() because
          * it will result into calling destructors of drivers associated with
          * Console children which may in turn try to lock Console (e.g. by
-         * instantiating SafeVMPtr to access mpVM). It's safe here because
+         * instantiating SafeVMPtr to access mpUVM). It's safe here because
          * mVMDestroying is set which should prevent any activity. */
 
@@ -6997 +7003 @@
         {
             LogFlowThisFunc(("Machine has been destroyed (mMachineState=%d)\n",
-                              mMachineState));
+                             mMachineState));
             /* Note: the Console-level machine state change happens on the
              * VMSTATE_TERMINATE state change in vmstateChangeCallback(). If
@@ -7323 +7329 @@
  * @param aHostPath    Shared folder path.
  *
- * @note Must be called from under AutoVMCaller and when mpVM != NULL!
+ * @note Must be called from under AutoVMCaller and when mpUVM != NULL!
  * @note Doesn't lock anything.
  */
@@ -7435 +7441 @@
  * @param aName        Shared folder name.
  *
- * @note Must be called from under AutoVMCaller and when mpVM != NULL!
+ * @note Must be called from under AutoVMCaller and when mpUVM != NULL!
  * @note Doesn't lock anything.
  */
@@ -7546 +7552 @@
                 /* Setup task object and thread to carry out the operation
                  * asynchronously (if we call powerDown() right here but there
-                 * is one or more mpVM callers (added with addVMCaller()) we'll
+                 * is one or more mpUVM callers (added with addVMCaller()) we'll
                  * deadlock).
                  */

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -77 +77 @@
 
 #ifdef DEBUG_sunlover
-static STAMPROFILE StatDisplayRefresh;
-static int stam = 0;
+static STAMPROFILE g_StatDisplayRefresh;
+static int g_stam = 0;
 #endif /* DEBUG_sunlover */
 
@@ -856 +856 @@
 
 #ifdef DEBUG_sunlover
-        if (!stam)
-        {
-            /* protect mpVM */
-            Console::SafeVMPtr ptrVM (mParent);
-            AssertComRC (ptrVM.rc());
-
-            STAM_REG(ptrVM.raw(), &StatDisplayRefresh, STAMTYPE_PROFILE, "/PROF/Display/Refresh", STAMUNIT_TICKS_PER_CALL, "Time spent in EMT for display updates.");
-            stam = 1;
+        if (!g_stam)
+        {
+            Console::SafeVMPtr ptrVM(mParent);
+            AssertComRC(ptrVM.rc());
+            STAMR3RegisterU(ptrVM.rawUVM(), &g_StatDisplayRefresh, STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS,
+                            "/PROF/Display/Refresh", STAMUNIT_TICKS_PER_CALL, "Time spent in EMT for display updates.");
+            g_stam = 1;
         }
 #endif /* DEBUG_sunlover */
@@ -3210 +3209 @@
 
 #ifdef DEBUG_sunlover
-    STAM_PROFILE_START(&StatDisplayRefresh, a);
+    STAM_PROFILE_START(&g_StatDisplayRefresh, a);
 #endif /* DEBUG_sunlover */
 
@@ -3349 +3348 @@
 
                 /* Just return in case of failure without any assertion */
-                if( RT_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                     if (RT_SUCCESS(VideoRecDoRGBToYUV(pDisplay->mpVideoRecContext, u32VideoRecImgFormat)))
                         VideoRecEncodeAndWrite(pDisplay->mpVideoRecContext, ulGuestWidth, ulGuestHeight);
@@ -3357 +3356 @@
 
 #ifdef DEBUG_sunlover
-    STAM_PROFILE_STOP(&StatDisplayRefresh, a);
+    STAM_PROFILE_STOP(&g_StatDisplayRefresh, a);
 #endif /* DEBUG_sunlover */
 #ifdef DEBUG_sunlover_2