[vslib] Fix VirtualObjectIdManager multi arch logging

kcudnik · kcudnik · commit 3951504ddbcc · 2021-08-21T15:01:16.000+02:00
diff --git a/lib/src/VirtualObjectIdManager.cpp b/lib/src/VirtualObjectIdManager.cpp
@@ -241,11 +241,13 @@ sai_object_id_t VirtualObjectIdManager::allocateNewObjectId(
 
     uint64_t objectIndex = m_oidIndexGenerator->increment(); // get new object index
 
+    const uint64_t indexMax = SAI_REDIS_OBJECT_INDEX_MAX;
+
     if (objectIndex > SAI_REDIS_OBJECT_INDEX_MAX)
     {
-        SWSS_LOG_THROW("no more object indexes available, given: 0x%" PRIu64 " but limit is 0x%" PRIu64 " ",
+        SWSS_LOG_THROW("no more object indexes available, given: 0x%" PRIx64 " but limit is 0x%" PRIx64 " ",
                 objectIndex,
-                SAI_REDIS_OBJECT_INDEX_MAX);
+                indexMax);
     }
 
     sai_object_id_t objectId = constructObjectId(objectType, switchIndex, objectIndex, m_globalContext);

Original file line number	Diff line number	Diff line change
`@@ -241,11 +241,13 @@ sai_object_id_t VirtualObjectIdManager::allocateNewObjectId(`
`241`	`241`
`242`	`242`	`uint64_t objectIndex = m_oidIndexGenerator->increment(); // get new object index`
`243`	`243`
	`244`	`+ const uint64_t indexMax = SAI_REDIS_OBJECT_INDEX_MAX;`
	`245`	`+`
`244`	`246`	`if (objectIndex > SAI_REDIS_OBJECT_INDEX_MAX)`
`245`	`247`	`{`
`246`		`- SWSS_LOG_THROW("no more object indexes available, given: 0x%" PRIu64 " but limit is 0x%" PRIu64 " ",`
	`248`	`+ SWSS_LOG_THROW("no more object indexes available, given: 0x%" PRIx64 " but limit is 0x%" PRIx64 " ",`
`247`	`249`	`objectIndex,`
`248`		`- SAI_REDIS_OBJECT_INDEX_MAX);`
	`250`	`+ indexMax);`
`249`	`251`	`}`
`250`	`252`
`251`	`253`	`sai_object_id_t objectId = constructObjectId(objectType, switchIndex, objectIndex, m_globalContext);`