Changeset 106900 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 8, 2024 10:45:15 PM (4 months ago)

Author:

vboxsync

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

165821

Message:

Main/ObjectsTracker.h/cpp: Build fix - the extpack solaris VM doesn't have std::unordered_map, so we have to use std::map or something else. Fixed atomic fFinish handling. jiraref:VBP-1187

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -33 +33 @@
 
 #include <set>
-#include <unordered_map>
+#include <map>
 #include <vector>
 #include <string>
@@ -150 +150 @@
 };
 
+/** The string representation for object IDs in the internal map.
+ * @todo r=bird: Why are you using std::string here? We use 
+ *       should use com::Utf8Str where possible. In this case, though, it's a
+ *       com::Guid which would have much more efficient storage compared
+ *       to both the string variants... */
+#if 1
+typedef std::string ObjIdString_T;
+#else
+typedef com::Utf8Str ObjIdString_T;
+#endif
+
 /////////////////////////////////////////////////////////////////////////////
 // TrackedObjectsCollector
-/////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////// 
 class TrackedObjectsCollector
 {
@@ -160 +171 @@
     std::set<com::Utf8Str> m_trackedObjectIds;//Full list of valid + invalid objects
     std::set<com::Utf8Str> m_trackedInvalidObjectIds;//List of invalid objects only
-    std::unordered_map<std::string, TrackedObjectData> m_trackedObjectsData;//Mapping Object Id -> Object Data
+    std::map<ObjIdString_T, TrackedObjectData> m_trackedObjectsData;//Mapping Object Id -> Object Data
 
     uint64_t m_Added;//Counter of the added objects

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

@@ -34 +34 @@
 #include <iprt/stream.h>
 #include <iprt/time.h>
-# include <iprt/asm.h>
-
-typedef std::unordered_map<std::string, TrackedObjectData>::const_iterator cIterTrObjDataType;
-typedef std::unordered_map<std::string, TrackedObjectData>::iterator iterTrObjDataType;
+#include <iprt/asm.h>
+
+typedef std::map<ObjIdString_T, TrackedObjectData>::const_iterator cIterTrObjDataType;
+typedef std::map<ObjIdString_T, TrackedObjectData>::iterator iterTrObjDataType;
 
 /////////////////////////////////////////////////////////////////////////////
@@ -329 +329 @@
     RTCritSectEnter(&m_CritSectData);
 
-    std::string sTemp(aObjId.c_str());
+    ObjIdString_T sTemp(aObjId.c_str());
     HRESULT hrc = E_FAIL;
 
@@ -383 +383 @@
     RTCritSectEnter(&m_CritSectData);
 
-    std::string sTemp(aObjId.c_str());
+    ObjIdString_T sTemp(aObjId.c_str());
 
     iterTrObjDataType pIter = m_trackedObjectsData.find(sTemp);
@@ -412 +412 @@
         return VBOX_E_INVALID_OBJECT_STATE;
 
-    std::string sTemp(aObjId.c_str());
+    ObjIdString_T sTemp(aObjId.c_str());
 
     vrc = VERR_NOT_FOUND;
@@ -498 +498 @@
                                                         std::vector<com::Utf8Str>& aObjIdMap) const
 {
-    for (const std::pair<const std::string, TrackedObjectData>& item : m_trackedObjectsData)
+    for (const std::pair<const ObjIdString_T, TrackedObjectData> &item : m_trackedObjectsData)
     {
         /* IID found and the object is valid */
@@ -655 +655 @@
     RTCritSectEnter(&m_CritSectData);
 
-    std::string sTemp(aObjId.c_str());
+    ObjIdString_T sTemp(aObjId.c_str());
     vrc = VERR_NOT_FOUND;
 
@@ -697 +697 @@
     LogFlowFuncEnter();
     ASMAtomicWriteBool(&fFinish, true);
-    return fFinish;
+    return true;
 }
 
@@ -703 +703 @@
 {
     LogFlowFuncEnter();
-    ASMAtomicReadBool(&fFinish);
-    return fFinish;
+    return ASMAtomicReadBool(&fFinish);
 }