Changeset 106903 in vbox for trunk/src/VBox/Main/src-all

Timestamp:

Nov 9, 2024 12:38:48 AM (6 months ago)

Author:

vboxsync

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

165826

Message:

Main/ObjectsTracker.h/cpp: Another build fix attempt - the extpack solaris VM doesn't know the C++11 for loop style. It also doesn't have std::map::at(). Kicked out the std::string variant of the map type, it just clutters up the code with unnecessary string copies. jiraref:VBP-1187

File:

• trunk/src/VBox/Main/src-all/ObjectsTracker.cpp (modified) (19 diffs)

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

@@ -35 +35 @@
 #include <iprt/time.h>
 #include <iprt/asm.h>
-
-typedef std::map<ObjIdString_T, TrackedObjectData>::const_iterator ConstIterTrObjDataType;
-typedef std::map<ObjIdString_T, TrackedObjectData>::iterator iterTrObjDataType;
+#include <stdexcept>
+
+typedef std::map<com::Utf8Str, TrackedObjectData>::iterator IterTrObjData_T;
+typedef std::map<com::Utf8Str, TrackedObjectData>::const_iterator ConstIterTrObjData_T;
 
 /////////////////////////////////////////////////////////////////////////////
@@ -317 +318 @@
 }
 
-HRESULT TrackedObjectsCollector::getObj (const com::Utf8Str& aObjId,
-                                         TrackedObjectData& aObjData,
-                                         bool fUpdate)
+HRESULT TrackedObjectsCollector::getObj(const com::Utf8Str &aObjId,
+                                        TrackedObjectData &aObjData,
+                                        bool fUpdate)
 {
     LogFlowFuncEnter();
@@ -330 +331 @@
     RTCritSectEnter(&m_CritSectData);
 
-    ObjIdString_T sTemp(aObjId.c_str());
     HRESULT hrc = E_FAIL;
 
-    iterTrObjDataType pIter = m_trackedObjectsData.find(sTemp);
+    IterTrObjData_T pIter = m_trackedObjectsData.find(aObjId);
     if (pIter != m_trackedObjectsData.end() && fUpdate == true)
     {
@@ -342 +342 @@
     }
 
-    if (RT_SUCCESS(vrc))
-    {
+    if (RT_SUCCESS(vrc)) /** @todo r=bird: This won't ever fail. Did you mixup vrc and hrc above? */
+    {
+        /** @todo r=bird: Why do three lookups? */
         if ( i_getObj(aObjId).getInterface().isNotNull() )
         {
@@ -368 +369 @@
 {
     /* No check for existence of aObjId */
+#if 0 /* the solaris VM's stl_map.h code doesn't have any at() function. */
     return m_trackedObjectsData.at(aObjId);
+#else
+    ConstIterTrObjData_T const Iter = m_trackedObjectsData.find(aObjId);
+    if (Iter == m_trackedObjectsData.cend())
+        throw std::out_of_range(aObjId.c_str());
+    return (*Iter).second;
+#endif
 }
 
@@ -384 +392 @@
     RTCritSectEnter(&m_CritSectData);
 
-    ObjIdString_T sTemp(aObjId.c_str());
-
-    iterTrObjDataType pIter = m_trackedObjectsData.find(sTemp);
+    IterTrObjData_T pIter = m_trackedObjectsData.find(aObjId);
     if (pIter != m_trackedObjectsData.end())
     {
@@ -404 +410 @@
 }
 
-HRESULT TrackedObjectsCollector::removeObj (const com::Utf8Str& aObjId)
+HRESULT TrackedObjectsCollector::removeObj(const com::Utf8Str &aObjId)
 {
     Log2(("%s: object Id %s\n", __FUNCTION__, aObjId.c_str()));
@@ -412 +418 @@
     if (RT_FAILURE(vrc))
         return VBOX_E_INVALID_OBJECT_STATE;
-
-    ObjIdString_T sTemp(aObjId.c_str());
 
     vrc = VERR_NOT_FOUND;
@@ -420 +424 @@
     RTCritSectEnter(&m_CritSectData);
 
-    ConstIterTrObjDataType pIter = m_trackedObjectsData.find(sTemp);
-    if (pIter != m_trackedObjectsData.end())
+    IterTrObjData_T Iter = m_trackedObjectsData.find(aObjId);
+    if (Iter != m_trackedObjectsData.end())
     {
         Log2(("RELEASED TrackedObjectData: creation time %s, object Id %s, class IID %s\n",
-               pIter->second.creationTimeStr().c_str(), pIter->second.objectIdStr().c_str(), pIter->second.classIIDStr().c_str()));
-
-        m_trackedObjectsData.erase(pIter);
+               Iter->second.creationTimeStr().c_str(), Iter->second.objectIdStr().c_str(), Iter->second.classIIDStr().c_str()));
+
+        m_trackedObjectsData.erase(Iter);
         m_trackedObjectIds.erase(aObjId);
         m_trackedInvalidObjectIds.erase(aObjId);
@@ -499 +503 @@
 }
 
-int TrackedObjectsCollector::i_getObjIdsByClassIID (const Guid& iid,
-                                                        std::vector<com::Utf8Str>& aObjIdMap) const
-{
-    for (const std::pair<const ObjIdString_T, TrackedObjectData> &item : m_trackedObjectsData)
+int TrackedObjectsCollector::i_getObjIdsByClassIID(const Guid &aIId, std::vector<com::Utf8Str> &aObjIdMap) const
+{
+    //for (const std::pair<const com::Utf8Str, TrackedObjectData> &item : m_trackedObjectsData)  - the gcc in the solaris VM doesn't grok this.
+    for (ConstIterTrObjData_T Iter = m_trackedObjectsData.cbegin();
+         Iter != m_trackedObjectsData.cend();
+         ++Iter)
     {
         /* IID found and the object is valid */
-        if (item.second.classIID() == iid && !m_trackedInvalidObjectIds.count(item.first.c_str()))
-            aObjIdMap.push_back(item.first.c_str());
+        if (Iter->second.classIID() == aIId && !m_trackedInvalidObjectIds.count(Iter->first))
+            aObjIdMap.push_back(Iter->first);
     }
 
@@ -512 +518 @@
 }
 
-bool TrackedObjectsCollector::checkObj(const com::Utf8Str& aObjId)
+bool TrackedObjectsCollector::checkObj(const com::Utf8Str &aObjId)
 {
     Log2(("%s: Checking object with Id %s\n", __FUNCTION__, aObjId.c_str()));
@@ -604 +610 @@
     RTCritSectEnter(&m_CritSectData);
 
-    iterTrObjDataType pIter = m_trackedObjectsData.find(aObjId.c_str());
+    IterTrObjData_T pIter = m_trackedObjectsData.find(aObjId.c_str());
     if (pIter != m_trackedObjectsData.end())
     {
@@ -651 +657 @@
     LogFlowFuncEnter();
 
-    HRESULT hrc = S_OK;
     int vrc = i_checkInitialization();
     if (RT_FAILURE(vrc))
@@ -659 +664 @@
     RTCritSectEnter(&m_CritSectData);
 
-    ObjIdString_T sTemp(aObjId.c_str());
-    vrc = VERR_NOT_FOUND;
-
-    iterTrObjDataType pIter = m_trackedObjectsData.find(sTemp);
+    HRESULT hrc = VBOX_E_OBJECT_NOT_FOUND;
+    IterTrObjData_T pIter = m_trackedObjectsData.find(aObjId);
     if (pIter != m_trackedObjectsData.end())
     {
         pIter->second.resetState();
         m_trackedInvalidObjectIds.insert(aObjId);
-        vrc = VINF_SUCCESS;
-    }
-
-    if (RT_FAILURE(vrc))
-        hrc = VBOX_E_OBJECT_NOT_FOUND;
+        hrc = S_OK;
+    }
 
     /* Leave critical section here */
@@ -723 +723 @@
     {
         std::vector<com::Utf8Str> lObjIdMap;
-
         hrc = gTrackedObjectsCollector.getAllObjIds(lObjIdMap);
-        for (const com::Utf8Str& item : lObjIdMap)
+
+        //for (const com::Utf8Str& item : lObjIdMap) - the gcc in the solaris VM doesn't grok this.
+        for (std::vector<com::Utf8Str>::const_iterator Iter = lObjIdMap.cbegin();
+             Iter != lObjIdMap.cend();
+             ++Iter)
         {
             TrackedObjectData temp;
-            if(gTrackedObjectsCollector.checkObj(item.c_str()))
+            if(gTrackedObjectsCollector.checkObj(*Iter))
             {
-                hrc = gTrackedObjectsCollector.getObj(item.c_str(), temp);
+                hrc = gTrackedObjectsCollector.getObj(*Iter, temp);
                 if (SUCCEEDED(hrc))
                 {
@@ -762 +765 @@
                             if (temp.m_fIdleTimeStart == false)
                             {
-                                gTrackedObjectsCollector.initObjIdleTime(item);
-                                Log2(("Idle time for the object with Id %s has been started\n", item.c_str()));
+                                gTrackedObjectsCollector.initObjIdleTime(*Iter);
+                                Log2(("Idle time for the object with Id %s has been started\n", Iter->c_str()));
                             }
                             else
@@ -773 +776 @@
                                 {
                                     Log2(("Object with Id %s removed from Object Collector "
-                                            "(recount is %u, idle time exceeded %u sec)\n", item.c_str(), cRefs - 1, temp.m_idleTime));
-                                    gTrackedObjectsCollector.removeObj(item.c_str());
+                                            "(recount is %u, idle time exceeded %u sec)\n", Iter->c_str(), cRefs - 1, temp.m_idleTime));
+                                    gTrackedObjectsCollector.removeObj(*Iter);
                                 }
                             }
@@ -804 +807 @@
                             {
                                 Log2(("Object with Id %s removed from Object Collector "
-                                        "(lifetime exceeded %u sec)\n", item.c_str(), temp.m_lifeTime));
-                                gTrackedObjectsCollector.removeObj(item.c_str());
+                                        "(lifetime exceeded %u sec)\n", Iter->c_str(), temp.m_lifeTime));
+                                gTrackedObjectsCollector.removeObj(*Iter);
                             }
                         }
@@ -812 +815 @@
             }
             else
-                Log2(("Tracked Object with ID %s was not found\n", item.c_str()));
+                Log2(("Tracked Object with ID %s was not found\n", Iter->c_str()));
         }