Changeset 107254 in vbox

Timestamp:

Dec 9, 2024 1:09:34 PM (7 weeks ago)

Author:

vboxsync

Message:

bugref:10806. Added member TrackedObjectData:m_fLifeTimeExpired, the getters isIdleTimeStarted() and isLifeTimeExpired(), function TrackedObjectsCollector::updateObj(). jiraref:VBP-1459.

Location:

trunk/src/VBox/Main

Files:

• include/ObjectsTracker.h (modified) (3 diffs)
• src-all/ObjectsTracker.cpp (modified) (5 diffs)

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

@@ -145 +145 @@
     }
 
+    inline bool isIdleTimeStarted() const
+    {
+        return m_fIdleTimeStart;
+    }
+
+    inline bool isLifeTimeExpired() const
+    {
+        return m_fLifeTimeExpired;
+    }
+
     com::Utf8Str updateLastAccessTime();
     com::Utf8Str initIdleTime();
@@ -156 +166 @@
     com::Utf8Str m_componentName;
     RTTIMESPEC m_creationTime;//creation time
+    RTTIMESPEC m_deletionTime;//deletion time (m_creationTime + m_lifeTime + m_idleTime)
     RTTIMESPEC m_idleTimeStart;//idle time beginning (ref counter is 1)
-    RTTIMESPEC m_deletionTime;//deletion time (m_creationTime + m_lifeTime + m_idleTime)
     RTTIMESPEC m_lastAccessTime;//last access time
     uint64_t m_lifeTime;//lifetime after creation in seconds, 0 - live till the VBoxSVC lives
     uint64_t m_idleTime;//lifetime after out of usage in seconds, 0 - keep forever
     bool m_fIdleTimeStart;//when ref counter of m_pIface is 1 or m_lifeTime exceeded
+    bool m_fLifeTimeExpired;//set to True only one time during the whole object life
     TrackedObjectState_T m_state;
     ComPtr<IUnknown> m_pIface;//keeps a reference to a tracked object
@@ -200 +211 @@
                     uint64_t afterLifeTime,
                     IUnknown* ptrIface);
+
+    HRESULT updateObj (const TrackedObjectData& aObjData);
 
     HRESULT getObj (const com::Utf8Str &aObjId,

trunk/src/VBox/Main/src-all/ObjectsTracker.cpp

@@ -64 +64 @@
     m_idleTime(aIdleTime),
     m_fIdleTimeStart(false),
+    m_fLifeTimeExpired(false),
     m_pIface(aPtr)
 {
@@ -87 +88 @@
         m_idleTimeStart = that.m_idleTimeStart;
         m_fIdleTimeStart = that.m_fIdleTimeStart;
+        m_fLifeTimeExpired = that.m_fLifeTimeExpired;
         m_state = that.m_state;
     }
@@ -116 +118 @@
         m_idleTimeStart = that.m_idleTimeStart;
         m_fIdleTimeStart = that.m_fIdleTimeStart;
+        m_fLifeTimeExpired = that.m_fLifeTimeExpired;
         m_state = that.m_state;
     }
@@ -140 +143 @@
         RTTimeNow(unconst(&m_idleTimeStart));
         m_fIdleTimeStart = true;
+        m_fLifeTimeExpired = true;
     }
 
@@ -325 +329 @@
     /* increase the counter */
     ++m_Added;
+
+    /* Leave critical section here */
+    RTCritSectLeave(&m_CritSectData);
+
+    return hrc;
+}
+
+
+HRESULT TrackedObjectsCollector::updateObj (const TrackedObjectData& aObjData)
+{
+    LogFlowFuncEnter();
+
+    HRESULT hrc = S_OK;
+    int vrc = i_checkInitialization();
+    if (RT_FAILURE(vrc))
+        return VBOX_E_INVALID_OBJECT_STATE;
+
+    /* Enter critical section here */
+    RTCritSectEnter(&m_CritSectData);
+
+    std::pair < std::set<com::Utf8Str>::iterator, bool > opRes = m_trackedObjectIds.insert(aObjData.objectIdStr());
+
+    /*
+     * The case for updating the tracked object data.
+     * The Id is presented in the m_trackedObjectIds. The original object is removed from m_trackedObjectsData.
+     */
+    if (!opRes.second)
+    {
+        Log2(("UPDATING TrackedObjectData:\n state %i\n object Id %s\n class IID %s\n life time %i\n idle time %i"
+                "\n life time expired - %s\n idle time started - %s\n",
+                aObjData.state(),
+                aObjData.objectIdStr().c_str(),
+                aObjData.classIIDStr().c_str(),
+                aObjData.lifeTime(),
+                aObjData.idleTime(),
+                (aObjData.isLifeTimeExpired() == true ? "True" : "False"),
+                (aObjData.isIdleTimeStarted() == true ? "True" : "False")));
+
+        m_trackedObjectsData.erase(aObjData.objectIdStr().c_str());
+        /* decrease the counter */
+        --m_Added;
+
+        /* Data is stored in the m_trackedObjectsData under the passed Id. */
+        m_trackedObjectsData.insert(std::make_pair(aObjData.objectIdStr(), aObjData));
+
+        /* increase the counter */
+        ++m_Added;
+    }
+    else
+    {
+        Log2(("UPDATING failed because the object Id %s hasn't existed.\n", aObjData.objectIdStr().c_str()));
+        m_trackedObjectIds.erase(aObjData.objectIdStr());
+    }
 
     /* Leave critical section here */