Changeset 82192 in vbox for trunk/src

Timestamp:

Nov 25, 2019 6:08:10 PM (5 years ago)

Author:

vboxsync

Message:

Main/RecordingSettings: move monitor count query to place before taking the object lock (the recording settings one is much higher lock order than the Machine one)

Location:

trunk/src/VBox/Main

Files:

• include/RecordingSettingsImpl.h (modified) (1 diff)
• src-server/RecordingSettingsImpl.cpp (modified) (5 diffs)

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

@@ -67 +67 @@
 
     void i_reset(void);
-    int i_syncToMachineDisplays(void);
+    int i_syncToMachineDisplays(uint32_t cMonitors);
     int i_createScreenObj(RecordScreenSettingsMap &screenSettingsMap, uint32_t uScreenId, const settings::RecordingScreenSettings &data);
     int i_destroyScreenObj(RecordScreenSettingsMap &screenSettingsMap, uint32_t uScreenId);

trunk/src/VBox/Main/src-server/RecordingSettingsImpl.cpp

@@ -259 +259 @@
     LogFlowThisFuncEnter();
 
-    i_syncToMachineDisplays();
+    AssertPtr(m->pMachine);
+    ComPtr<IGraphicsAdapter> pGraphicsAdapter;
+    m->pMachine->COMGETTER(GraphicsAdapter)(pGraphicsAdapter.asOutParam());
+    ULONG cMonitors = 0;
+    if (!pGraphicsAdapter.isNull())
+        pGraphicsAdapter->COMGETTER(MonitorCount)(&cMonitors);
+
+    i_syncToMachineDisplays(cMonitors);
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -285 +292 @@
     LogFlowThisFuncEnter();
 
-    i_syncToMachineDisplays();
+    AssertPtr(m->pMachine);
+    ComPtr<IGraphicsAdapter> pGraphicsAdapter;
+    m->pMachine->COMGETTER(GraphicsAdapter)(pGraphicsAdapter.asOutParam());
+    ULONG cMonitors = 0;
+    if (!pGraphicsAdapter.isNull())
+        pGraphicsAdapter->COMGETTER(MonitorCount)(&cMonitors);
+
+    i_syncToMachineDisplays(cMonitors);
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -484 +498 @@
     AssertComRCReturnRC(autoCaller.rc());
 
-    int rc2 = i_syncToMachineDisplays();
+    AssertPtr(m->pMachine);
+    ComPtr<IGraphicsAdapter> pGraphicsAdapter;
+    m->pMachine->COMGETTER(GraphicsAdapter)(pGraphicsAdapter.asOutParam());
+    ULONG cMonitors = 0;
+    if (!pGraphicsAdapter.isNull())
+        pGraphicsAdapter->COMGETTER(MonitorCount)(&cMonitors);
+
+    int rc2 = i_syncToMachineDisplays(cMonitors);
     AssertRC(rc2);
 
@@ -566 +587 @@
     AssertComRCReturnVoid(autoCaller.rc());
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    /* Initialize default capturing settings here. */
-    m->bd->fEnabled = false;
-
-    /* First, do a reset so that all internal screen settings objects are destroyed. */
-    i_reset();
-    /* Second, sync (again) to configured machine displays to (re-)create screen settings objects. */
-    i_syncToMachineDisplays();
-}
-
-/**
- * Returns the full path to the default video capture file.
- */
-int RecordingSettings::i_getDefaultFilename(Utf8Str &strFile, bool fWithFileExtension)
-{
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    strFile = m->pMachine->i_getSettingsFileFull(); // path/to/machinesfolder/vmname/vmname.vbox
-    strFile.stripSuffix();                          // path/to/machinesfolder/vmname/vmname
-    if (fWithFileExtension)
-        strFile.append(".webm");                    // path/to/machinesfolder/vmname/vmname.webm
-
-    return VINF_SUCCESS;
-}
-
-/**
- * Determines whether the recording settings currently can be changed or not.
- *
- * @returns \c true if the settings can be changed, \c false if not.
- */
-bool RecordingSettings::i_canChangeSettings(void)
-{
-    AutoAnyStateDependency adep(m->pMachine);
-    if (FAILED(adep.rc()))
-        return false;
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    /* Only allow settings to be changed when recording is disabled when the machine is running. */
-    if (   Global::IsOnline(adep.machineState())
-        && m->bd->fEnabled)
-    {
-        return false;
-    }
-
-    return true;
-}
-
-/**
- * Gets called when the machine object needs to know that the recording settings
- * have been changed.
- */
-void RecordingSettings::i_onSettingsChanged(void)
-{
-    LogFlowThisFuncEnter();
-
-    AutoWriteLock mlock(m->pMachine COMMA_LOCKVAL_SRC_POS);
-    m->pMachine->i_setModified(Machine::IsModified_Recording);
-    mlock.release();
-
-    LogFlowThisFuncLeave();
-}
-
-/**
- * Synchronizes the screen settings (COM) objects and configuration data
- * to the number of the machine's configured displays.
- */
-int RecordingSettings::i_syncToMachineDisplays(void)
-{
     AssertPtr(m->pMachine);
     ComPtr<IGraphicsAdapter> pGraphicsAdapter;
@@ -643 +594 @@
         pGraphicsAdapter->COMGETTER(MonitorCount)(&cMonitors);
 
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    /* Initialize default capturing settings here. */
+    m->bd->fEnabled = false;
+
+    /* First, do a reset so that all internal screen settings objects are destroyed. */
+    i_reset();
+    /* Second, sync (again) to configured machine displays to (re-)create screen settings objects. */
+    i_syncToMachineDisplays(cMonitors);
+}
+
+/**
+ * Returns the full path to the default video capture file.
+ */
+int RecordingSettings::i_getDefaultFilename(Utf8Str &strFile, bool fWithFileExtension)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    strFile = m->pMachine->i_getSettingsFileFull(); // path/to/machinesfolder/vmname/vmname.vbox
+    strFile.stripSuffix();                          // path/to/machinesfolder/vmname/vmname
+    if (fWithFileExtension)
+        strFile.append(".webm");                    // path/to/machinesfolder/vmname/vmname.webm
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * Determines whether the recording settings currently can be changed or not.
+ *
+ * @returns \c true if the settings can be changed, \c false if not.
+ */
+bool RecordingSettings::i_canChangeSettings(void)
+{
+    AutoAnyStateDependency adep(m->pMachine);
+    if (FAILED(adep.rc()))
+        return false;
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    /* Only allow settings to be changed when recording is disabled when the machine is running. */
+    if (   Global::IsOnline(adep.machineState())
+        && m->bd->fEnabled)
+    {
+        return false;
+    }
+
+    return true;
+}
+
+/**
+ * Gets called when the machine object needs to know that the recording settings
+ * have been changed.
+ */
+void RecordingSettings::i_onSettingsChanged(void)
+{
+    LogFlowThisFuncEnter();
+
+    AutoWriteLock mlock(m->pMachine COMMA_LOCKVAL_SRC_POS);
+    m->pMachine->i_setModified(Machine::IsModified_Recording);
+    mlock.release();
+
+    LogFlowThisFuncLeave();
+}
+
+/**
+ * Synchronizes the screen settings (COM) objects and configuration data
+ * to the number of the machine's configured displays.
+ */
+int RecordingSettings::i_syncToMachineDisplays(uint32_t cMonitors)
+{
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);