Changeset 106901 in vbox for trunk/src/VBox

Timestamp:

Nov 8, 2024 11:39:18 PM (3 months ago)

Author:

vboxsync

Message:

Main/ObjectsTracker.h/cpp: Another build fix attempt - the extpack solaris VM doesn't know the C++11 for loop style. It also has trouble with implict c_str conversion or something like that, so switching to com::Utf8Str. jiraref:VBP-1187

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -155 +155 @@
  *       com::Guid which would have much more efficient storage compared
  *       to both the string variants... */
-#if 1
+#if 0 /* The solaris VM seems to have trouble with this or something related to it. */
 typedef std::string ObjIdString_T;
 #else

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

@@ -36 +36 @@
 #include <iprt/asm.h>
 
-typedef std::map<ObjIdString_T, TrackedObjectData>::const_iterator cIterTrObjDataType;
+typedef std::map<ObjIdString_T, TrackedObjectData>::const_iterator ConstIterTrObjDataType;
 typedef std::map<ObjIdString_T, TrackedObjectData>::iterator iterTrObjDataType;
 
@@ -122 +122 @@
 com::Utf8Str TrackedObjectData::updateLastAccessTime()
 {
-    RTTimeNow(unconst(&m_lastAccessTime));
-
-    char szTime[42];
+    RTTimeNow(&m_lastAccessTime);
+
+    char szTime[RTTIME_STR_LEN];
     RTTimeSpecToString(&m_lastAccessTime, szTime, sizeof(szTime));
     return com::Utf8Str(szTime);
 }
 
+/** @todo r=bird: why on earth does this return a string? */
 com::Utf8Str TrackedObjectData::initIdleTime()
 {
@@ -137 +138 @@
     }
 
-    char szTime[42];
+    char szTime[RTTIME_STR_LEN];
     RTTimeSpecToString(&m_idleTimeStart, szTime, sizeof(szTime));
     return com::Utf8Str(szTime);
@@ -144 +145 @@
 com::Utf8Str TrackedObjectData::creationTimeStr() const
 {
-    char szCreationTime[42];
+    char szCreationTime[RTTIME_STR_LEN];
     RTTimeSpecToString(&m_creationTime, szCreationTime, sizeof(szCreationTime));
 
@@ -290 +291 @@
         --m_Added;
     }
-    else
-    {
-        char szCreationTime[42];
+    else if (LogIs2Enabled())
+    {
+        char szCreationTime[RTTIME_STR_LEN];
         RTTIMESPEC time;
         RTTimeSpecToString(RTTimeNow(&time), szCreationTime, sizeof(szCreationTime));
@@ -364 +365 @@
 }
 
-const TrackedObjectData& TrackedObjectsCollector::i_getObj (const com::Utf8Str& aObjId) const
+const TrackedObjectData &TrackedObjectsCollector::i_getObj(const com::Utf8Str &aObjId) const
 {
     /* No check for existence of aObjId */
-    return m_trackedObjectsData.at(aObjId.c_str());
-}
-
-HRESULT TrackedObjectsCollector::initObjIdleTime (const com::Utf8Str& aObjId)
+    return m_trackedObjectsData.at(aObjId);
+}
+
+HRESULT TrackedObjectsCollector::initObjIdleTime(const com::Utf8Str &aObjId)
 {
     LogFlowFuncEnter();
@@ -419 +420 @@
     RTCritSectEnter(&m_CritSectData);
 
-    cIterTrObjDataType pIter = m_trackedObjectsData.find(sTemp);
+    ConstIterTrObjDataType pIter = m_trackedObjectsData.find(sTemp);
     if (pIter != m_trackedObjectsData.end())
     {
@@ -462 +463 @@
 }
 
-int TrackedObjectsCollector::i_getAllObjIds (std::vector<com::Utf8Str>& aObjIdMap) const
-{
-    for (const com::Utf8Str& item : m_trackedObjectIds)
-    {
-        if (!m_trackedInvalidObjectIds.count(item))
-            aObjIdMap.push_back(item);
+int TrackedObjectsCollector::i_getAllObjIds(std::vector<com::Utf8Str> &aObjIdMap) const
+{
+    //for (const com::Utf8Str &item : m_trackedObjectIds) - the gcc in the solaris VM doesn't grok this.
+    for (std::set<com::Utf8Str>::const_iterator Iter = m_trackedObjectIds.cbegin();
+         Iter != m_trackedObjectIds.cend();
+         ++Iter)
+    {
+        if (!m_trackedInvalidObjectIds.count(*Iter))
+            aObjIdMap.push_back(*Iter);
     }