move MinBlocksInfoMap as a private member and free it up in EndStep()

ornladios · Aug 12, 2024 · d6c5fb8 · d6c5fb8
1 parent 464077b
commit d6c5fb8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/source/adios2/engine/bp5/BP5Reader.cpp b/source/adios2/engine/bp5/BP5Reader.cpp
@@ -200,6 +200,11 @@ void BP5Reader::EndStep()
     m_BetweenStepPairs = false;
     PERFSTUBS_SCOPED_TIMER("BP5Reader::EndStep");
     PerformGets();
+    for (auto &item : MinBlocksInfoMap)
+    {
+        delete item.second;
+    }
+    MinBlocksInfoMap.clear();
 }
 
 std::pair<double, double> BP5Reader::ReadData(adios2::transportman::TransportMan &FileManager,
@@ -382,7 +387,6 @@ void BP5Reader::PerformRemoteGetsWithKVCache()
     };
     std::vector<RequestInfo> remoteRequestsInfo;
     std::vector<RequestInfo> cachedRequestsInfo;
-    std::unordered_map<std::string, MinVarInfo *> MinBlocksInfoMap;
 
     for (size_t req_seq = 0; req_seq < GetRequests.size(); req_seq++)
     {
@@ -539,11 +543,6 @@ void BP5Reader::PerformRemoteGetsWithKVCache()
         auto &ReqInfo = remoteRequestsInfo[handle_seq];
         m_KVCache.ExecuteBatch(ReqInfo.CacheKey.c_str(), 0, 0, nullptr);
     }
-
-    for (auto& item : MinBlocksInfoMap) {
-        delete item.second;
-    }
-    MinBlocksInfoMap.clear();
 }
 
 void BP5Reader::PerformRemoteGets()

diff --git a/source/adios2/engine/bp5/BP5Reader.h b/source/adios2/engine/bp5/BP5Reader.h
@@ -104,6 +104,7 @@ class BP5Reader : public BP5Engine, public Engine
 
     /* KVCache for remote data */
     kvcache::KVCacheCommon m_KVCache;
+    std::unordered_map<std::string, MinVarInfo *> MinBlocksInfoMap;
 
     /* Fingerprint to verify local validity against remote data */
     std::string m_Fingerprint = "";

diff --git a/source/adios2/toolkit/format/bp5/BP5Deserializer.h b/source/adios2/toolkit/format/bp5/BP5Deserializer.h
@@ -249,8 +249,10 @@ class BP5Deserializer : virtual public BP5Base
     std::mutex mutexDecompress;
 
 public:
-    VariableBase *GetVariableBaseFromBP5VarRec(void *VarRec) {return static_cast<VariableBase *>(static_cast<BP5VarRec *>(VarRec)->Variable);};
-
+    VariableBase *GetVariableBaseFromBP5VarRec(void *VarRec)
+    {
+        return static_cast<VariableBase *>(static_cast<BP5VarRec *>(VarRec)->Variable);
+    };
 };
 
 } // end namespace format