Changeset 108566 in vbox

Timestamp:

Mar 17, 2025 5:35:54 AM (4 weeks ago)

Author:

vboxsync

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

167971

Message:

bugref:10806. Excluded Machine, Medium, Session support. Only Progress support.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageObjectTracker.cpp (modified) (1 diff)
• Main/src-client/SessionImpl.cpp (modified) (1 diff)
• Main/src-server/MachineImpl.cpp (modified) (1 diff)
• Main/src-server/MediumImpl.cpp (modified) (1 diff)
• Main/src-server/VirtualBoxImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageObjectTracker.cpp

@@ -46 +46 @@
 std::map <com::Utf8Str, supIfaces_T> mapInterfaceNameToEnum = {
     {"IProgress", kProgress},
-    {"ISession", kSession},
-    {"IMedium", kMedium},
-    {"IMachine", kMachine}
 };
 

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

@@ -103 +103 @@
     mClientTokenHolder = NULL;
 
-    setTracked(18000, 60);//5 hours, 1 hour
-
     /* Confirm a successful initialization when it's the case */
     autoInitSpan.setSucceeded();

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

@@ -304 +304 @@
 {
     LogFlowThisFunc(("\n"));
-    setTracked(0, 7200);//infinite, 2 hours
     return BaseFinalConstruct();
 }

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

@@ -986 +986 @@
     vrc = VDIfTcpNetInstDefaultCreate(&m->hTcpNetInst, &m->vdImageIfaces);
     AssertRCReturn(vrc, E_FAIL);
-
-    setTracked(0, 7200);//infinite, 2 hours
 
     return BaseFinalConstruct();

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

@@ -6618 +6618 @@
         return setError(E_INVALIDARG, tr("The provided progress object GUID is invalid"));
 
-#if 0 /** @todo def VBOX_WITH_MAIN_OBJECT_TRACKER - never used */
+#ifdef VBOX_WITH_MAIN_OBJECT_TRACKER //0 /** @todo def VBOX_WITH_MAIN_OBJECT_TRACKER - never used */
     std::vector<com::Utf8Str> lObjIdMap;
     gTrackedObjectsCollector.getObjIdsByClassIID(IID_IProgress, lObjIdMap);
@@ -6636 +6636 @@
                 com::Bstr reqId(aId.toString());
                 Bstr foundId;
-                hrc = pProgress->COMGETTER(Id)(foundId.asOutParam());
+                pProgress->COMGETTER(Id)(foundId.asOutParam());
                 if (reqId == foundId)
                 {
@@ -6644 +6644 @@
                     BOOL aCanceled;
                     pProgress->COMGETTER(Canceled)(&aCanceled);
-                    LogRel(("Requested progress was found:\n  id %s\n  completed %s\n  canceled %s\n",
+                    Log2(("Requested progress was found:\n  id %s\n  completed %s\n  canceled %s\n",
                             aId.toString().c_str(),
                             aCompleted ? "True" : "False",
@@ -6672 +6672 @@
 }
 
+/**
+ * Get the tracked object by the Id.
+ *
+ * @param aTrObjId  tracked object Id
+ * @param aPIface  returns the ComPtr<IUnknown> if the object is found
+ * @param aState  returns TrackedObjectState_T - the actual state of the found
+ *                object
+ * @param aCreationTime  returns the creation time of the object
+ * @param aDeletionTime  returns the deletion time of the object
+ *
+ * @return HRESULT
+ */
 HRESULT VirtualBox::getTrackedObject(const com::Utf8Str &aTrObjId,
                                      ComPtr<IUnknown> &aPIface,
@@ -6692 +6704 @@
             *aDeletionTime = RTTimeSpecGetMilli(&time);
         }
-        /** @todo aDeletionTime isn't set */
+        else
+            /* aDeletionTime is set to 0 */
+            *aDeletionTime = 0;
     }
 
@@ -6707 +6721 @@
 static std::map<com::Utf8Str, com::Utf8Str> const g_lMapInterfaceNameToIID = {
     {"IProgress", Guid(IID_IProgress).toString()},
-    {"ISession", Guid(IID_ISession).toString()},
-    {"IMedium", Guid(IID_IMedium).toString()},
-    {"IMachine", Guid(IID_IMachine).toString()}
 };
 #endif