Changeset 107240 in vbox for trunk/src

Timestamp:

Dec 6, 2024 10:46:24 AM (5 months ago)

Author:

vboxsync

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

166254

Message:

bugref:10806. New TrackedObjectState enum usage. Added member m_deletionTime. Added the functions updateState, deletionTime. Added getters idleTime, lifeTime, deletionTime, creationTime. Fixed the function resetState and getter state.

Location:

trunk/src/VBox/Main

Files:

• include/ObjectsTracker.h (modified) (4 diffs)
• src-all/ObjectsTracker.cpp (modified) (9 diffs)

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

@@ -76 +76 @@
 {
 public:
-    enum State { Invalid, Valid };
-
     TrackedObjectData();
 
@@ -117 +115 @@
     }
 
-    inline State state() const
-    {
-        return m_State;
-    }
-
-    inline State resetState()
-    {
-        return m_State = Invalid;
+    inline TrackedObjectState_T state() const
+    {
+        return m_state;
+    }
+
+    inline TrackedObjectState_T resetState()
+    {
+        return m_state = TrackedObjectState_Invalid;
+    }
+
+    inline RTTIMESPEC creationTime() const
+    {
+        return m_creationTime;
+    }
+
+    inline RTTIMESPEC deletionTime() const
+    {
+        return m_deletionTime;
+    }
+
+    inline uint64_t lifeTime() const
+    {
+        return m_lifeTime;
+    }
+
+    inline uint64_t idleTime() const
+    {
+        return m_idleTime;
     }
 
@@ -130 +148 @@
     com::Utf8Str initIdleTime();
     com::Utf8Str creationTimeStr() const;
+    TrackedObjectState_T deletionTime(PRTTIMESPEC aTime) const;
+    TrackedObjectState_T updateState(TrackedObjectState_T aNewState);
 
 private:
@@ -137 +157 @@
     RTTIMESPEC m_creationTime;//creation time
     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
-    State m_State;//state may have only 2 variants Valid or Invalid. State has only one transition from Valid to Invalid
+    TrackedObjectState_T m_state;
     ComPtr<IUnknown> m_pIface;//keeps a reference to a tracked object
 

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

@@ -47 +47 @@
     m_lifeTime(0),
     m_idleTime(1),
-    m_State(TrackedObjectData::Invalid),
+    m_state(TrackedObjectState_None),
     m_pIface(NULL)
     {
@@ -68 +68 @@
     RTTimeNow(unconst(&m_creationTime));
     m_lastAccessTime = m_creationTime;
-    m_State = TrackedObjectData::Valid;
+    m_state = TrackedObjectState_Alive;
 }
 
@@ -83 +83 @@
         m_pIface = that.m_pIface;
         m_creationTime = that.m_creationTime;
+        m_deletionTime = that.m_deletionTime;
         m_lastAccessTime = that.m_lastAccessTime;
         m_idleTimeStart = that.m_idleTimeStart;
         m_fIdleTimeStart = that.m_fIdleTimeStart;
-        m_State = that.m_State;
+        m_state = that.m_state;
     }
 }
@@ -111 +112 @@
         m_pIface = that.m_pIface;
         m_creationTime = that.m_creationTime;
+        m_deletionTime = that.m_deletionTime;
         m_lastAccessTime = that.m_lastAccessTime;
         m_idleTimeStart = that.m_idleTimeStart;
         m_fIdleTimeStart = that.m_fIdleTimeStart;
-        m_State = that.m_State;
+        m_state = that.m_state;
     }
 
@@ -134 +136 @@
     if (!m_fIdleTimeStart)
     {
+        RTTimeNow(unconst(&m_deletionTime));
+        updateState(TrackedObjectState_Deleted);//Alive -> Deleted
         RTTimeNow(unconst(&m_idleTimeStart));
         m_fIdleTimeStart = true;
@@ -149 +153 @@
 
     return com::Utf8Str(szCreationTime);
+}
+
+TrackedObjectState_T TrackedObjectData::deletionTime(PRTTIMESPEC aTime) const
+{
+    if (m_state != TrackedObjectState_Alive)
+        *aTime = m_deletionTime;
+    return m_state;
 }
 
@@ -167 +178 @@
     }
     return cRefs;
+}
+
+TrackedObjectState_T TrackedObjectData::updateState(TrackedObjectState_T aNewState)
+{
+    return m_state < aNewState ? m_state = aNewState : m_state;
 }
 
@@ -345 +361 @@
         if ( i_getObj(aObjId).getInterface().isNotNull() )
         {
-            /* Excessive check because user may get only the valid objects Ids. But for 200% assurance it's here */
-            if (i_getObj(aObjId).state() == TrackedObjectData::Valid)
+            if (i_getObj(aObjId).state() != TrackedObjectState_Invalid)
             {
                 aObjData = i_getObj(aObjId);
@@ -666 +681 @@
     if (pIter != m_trackedObjectsData.end())
     {
-        pIter->second.resetState();
+        pIter->second.updateState(TrackedObjectState_Invalid);//Deleted -> Invalid
         m_trackedInvalidObjectIds.insert(aObjId);
         hrc = S_OK;