Changeset 104799 in vbox for trunk/src/VBox/Main

Timestamp:

May 28, 2024 11:03:27 AM (8 months ago)

Author:

vboxsync

Message:

Recording/Main: Added (release) statistics (via STAM) for getting some numbers out of the current code. Simplified code path for starting/stopping recording within the Display implementation. Left a @todo in Display::attachFramebuffer(). bugref:10650

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -190 +190 @@
 
 #ifdef VBOX_WITH_RECORDING
-    int  i_recordingInvalidate(void);
+    int  i_recordingStart(void);
+    int  i_recordingStop(void);
+    int  i_recordingInvalidate(bool fForce = false);
     void i_recordingScreenChanged(unsigned uScreenId);
 #endif
@@ -420 +422 @@
 #endif
 
+#ifdef VBOX_WITH_STATISTICS
+    struct
+    {
+        /** Profiling Display::i_displayRefreshCallback(). */
+        STAMPROFILE profileDisplayRefreshCallback;
+        /** Statistics for monitor N. */
+        struct
+        {
+            /** Statistics for recording of monitor N. */
+            struct
+            {
+                /** Profiling recording code of monitor N. */
+                STAMPROFILE profileRecording;
+            } Recording;
+        } Monitor[SchemaDefs::MaxGuestMonitors];
+        /** Statistics for audio/video recording. */
+        struct
+        {
+            /** Profiling recording code of all active monitors. */
+            STAMPROFILE profileRecording;
+        } Recording;
+    } Stats;
+#endif
+
 public:
 

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

@@ -6137 +6137 @@
                             && mRecording.mCtx.IsReady()) /* Any video recording (audio and/or video) feature enabled? */
                         {
-                            vrc = pDisplay->i_recordingInvalidate();
-                            if (RT_SUCCESS(vrc))
-                            {
-                                vrc = i_recordingStart(pAutoLock);
-                                if (RT_FAILURE(vrc))
-                                    setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Recording start failed (%Rrc) -- please consult log file for details"), vrc);
-                            }
+                            vrc = i_recordingStart(pAutoLock);
+                            if (RT_FAILURE(vrc))
+                                setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Recording start failed (%Rrc) -- please consult log file for details"), vrc);
                         }
                     }
@@ -7643 +7639 @@
     int vrc = mRecording.mCtx.Start();
     if (RT_SUCCESS(vrc))
-    {
-        for (unsigned uScreen = 0; uScreen < mRecording.mCtx.GetStreamCount(); uScreen++)
-            mDisplay->i_recordingScreenChanged(uScreen);
-    }
+        vrc = mDisplay->i_recordingStart();
 
     LogFlowFuncLeaveRC(vrc);
@@ -7667 +7660 @@
     int vrc = mRecording.mCtx.Stop();
     if (RT_SUCCESS(vrc))
-    {
-        const size_t cStreams = mRecording.mCtx.GetStreamCount();
-        for (unsigned uScreen = 0; uScreen < cStreams; ++uScreen)
-            mDisplay->i_recordingScreenChanged(uScreen);
-    }
+        vrc = mDisplay->i_recordingStop();
 
     LogFlowFuncLeaveRC(vrc);

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

@@ -1595 +1595 @@
 
     Console::SafeVMPtrQuiet ptrVM(mParent);
-    if (ptrVM.isOk())
+    if (ptrVM.isOk()) /** @todo r=andy This apparently *never* is true at this point? */
         ptrVM.vtable()->pfnVMR3ReqCallNoWaitU(ptrVM.rawUVM(), VMCPUID_ANY, (PFNRT)Display::i_InvalidateAndUpdateEMT,
                                               3, this, aScreenId, false);
@@ -2096 +2096 @@
 #ifdef VBOX_WITH_RECORDING
 /**
+ * Starts video (+ audio) recording.
+ *
+ * @returns VBox status code.
+ */
+int Display::i_recordingStart(void)
+{
+#ifdef VBOX_WITH_STATISTICS
+    Console::SafeVMPtrQuiet ptrVM(mParent);
+    if (ptrVM.isOk())
+    {
+        ptrVM.vtable()->pfnSTAMR3RegisterFU(ptrVM.rawUVM(), &Stats.profileDisplayRefreshCallback,
+                                                STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL,
+                                                "Profiling display refresh.", "/Main/Display/ProfRefresh");
+        ptrVM.vtable()->pfnSTAMR3RegisterFU(ptrVM.rawUVM(), &Stats.Recording.profileRecording,
+                                            STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL,
+                                            "Profiling recording time for all monitors.", "/Main/Display/ProfRecording");
+
+        for (unsigned i = 0; i < mcMonitors; i++)
+            ptrVM.vtable()->pfnSTAMR3RegisterFU(ptrVM.rawUVM(), &Stats.Monitor[i].Recording.profileRecording,
+                                                STAMTYPE_PROFILE, STAMVISIBILITY_ALWAYS, STAMUNIT_TICKS_PER_CALL,
+                                                "Profiling recording time for this monitor.", "/Main/Display/Monitor%RU32/ProfRecording", i);
+    }
+#endif
+
+    return i_recordingInvalidate(true /* fForce */);
+}
+
+/**
+ * Stops video (+ audio) recording.
+ *
+ * @returns VBox status code.
+ */
+int Display::i_recordingStop(void)
+{
+#ifdef VBOX_WITH_STATISTICS
+    Console::SafeVMPtrQuiet ptrVM(mParent);
+    if (ptrVM.isOk())
+    {
+        ptrVM.vtable()->pfnSTAMR3DeregisterF(ptrVM.rawUVM(), "/Main/Display/ProfRefresh");
+        ptrVM.vtable()->pfnSTAMR3DeregisterF(ptrVM.rawUVM(), "/Main/Display/ProfRecording");
+
+        for (unsigned i = 0; i < mcMonitors; i++)
+            ptrVM.vtable()->pfnSTAMR3DeregisterF(ptrVM.rawUVM(), "/Main/Display/Monitor%RU32/ProfRecording", i);
+    }
+#endif
+
+    return i_recordingInvalidate(true /* fForce */);
+}
+
+/**
  * Invalidates the recording configuration.
  *
- * @returns IPRT status code.
+ * @returns VBox status code.
+ * @param   fForce              Whether to force invalidation or not. Default is @c false.
  */
-int Display::i_recordingInvalidate(void)
+int Display::i_recordingInvalidate(bool fForce /* = false */)
 {
     RecordingContext *pCtx = mParent->i_recordingGetContext();
-    if (!pCtx || !pCtx->IsStarted())
+    if (!pCtx)
         return VINF_SUCCESS;
 
@@ -2111 +2162 @@
     for (unsigned uScreen = 0; uScreen < mcMonitors; uScreen++)
     {
-        RecordingStream *pRecordingStream = pCtx->GetStream(uScreen);
-
-        const bool fStreamEnabled = pRecordingStream->IsReady();
-              bool fChanged       = maRecordingEnabled[uScreen] != fStreamEnabled;
+        const RecordingStream *pRecordingStream = pCtx->GetStream(uScreen);
+
+        bool const fStreamEnabled = pRecordingStream->IsReady();
+        bool const fChanged       = (maRecordingEnabled[uScreen] != fStreamEnabled) || fForce;
 
         maRecordingEnabled[uScreen] = fStreamEnabled;
@@ -2125 +2176 @@
 }
 
+/**
+ * Called when the recording state of a screen got changed.
+ *
+ * @param   uScreenId           ID of screen for which the recording state got changed.
+ */
 void Display::i_recordingScreenChanged(unsigned uScreenId)
 {
@@ -2942 +2998 @@
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
 
-#ifdef DEBUG_sunlover_2
-    LogFlowFunc(("pDrv->pDisplay->mfVideoAccelEnabled = %d\n",
-                 pDrv->pDisplay->mfVideoAccelEnabled));
-#endif /* DEBUG_sunlover_2 */
+    STAM_PROFILE_START(&pDisplay->Stats.profileDisplayRefreshCallback, a);
 
     Display *pDisplay = pDrv->pDisplay;
@@ -2990 +3043 @@
             }
 
+            STAM_REL_PROFILE_START(&pDisplay->Stats.Recording.profileRecording, b);
+
             uint64_t tsNowMs = RTTimeProgramMilliTS();
             for (uScreenId = 0; uScreenId < pDisplay->mcMonitors; uScreenId++)
@@ -2998 +3053 @@
                 if (!pCtx->NeedsUpdate(uScreenId, tsNowMs))
                     continue;
+
+                STAM_REL_PROFILE_START(&pDisplay->Stats.Monitor[uScreenId].Recording.profileRecording, c);
 
                 DISPLAYFBINFO *pFBInfo = &pDisplay->maFramebuffers[uScreenId];
@@ -3039 +3096 @@
                         break;
                 }
+
+                STAM_REL_PROFILE_STOP(&pDisplay->Stats.Monitor[uScreenId].Recording.profileRecording, c);
             }
+
+            STAM_REL_PROFILE_STOP(&pDisplay->Stats.Recording.profileRecording, b);
+
         } while (0);
     }
 #endif /* VBOX_WITH_RECORDING */
 
-#ifdef DEBUG_sunlover_2
-    LogFlowFunc(("leave\n"));
-#endif /* DEBUG_sunlover_2 */
+    STAM_PROFILE_STOP(&pDisplay->Stats.profileDisplayRefreshCallback, a);
 }