Changeset 2243 for XIOS/dev/dev_ym/XIOS_COUPLING/src/cxios.cpp

Timestamp:

10/01/21 10:40:31 (3 years ago)

Author:

jderouillat

Message:

Move context cleaning in xios_finalize (for clients) and when servers have finished their work

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/cxios.cpp (modified) (2 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/cxios.cpp

@@ -175 +175 @@
 
 #endif
-     
-     // Delete CContext
-     xios_map<StdString, xios_map<StdString, std::shared_ptr<CContext> > >* contextMap = CObjectTemplate<CContext>::GetAllMapobject();
-     for(auto it = contextMap->begin(); it != contextMap->end(); ++it)
-     {
-       for(auto it2 = it->second.begin(); it2 != it->second.end(); ++it2)
-       {
-           std::shared_ptr<CContext> todel = it2->second;
-           todel.reset();
-       }
-       it->second.clear();
-
-       std::vector<std::shared_ptr<CContext> >*  contextVect = CObjectTemplate<CContext>::GetAllVectobjectPtr(it->first);
-       for(auto it = contextVect->begin(); it != contextVect->end(); ++it)
-       {
-           it->reset();
-       }
-       contextVect->clear();
-       
-     }
-     contextMap->clear();
-     
   }
 
@@ -247 +225 @@
     report(0)<<CMemChecker::getAllCumulatedMem() ;
     CServer::closeInfoStream();
-    
-    // Delete CContext
-    xios_map<StdString, xios_map<StdString, std::shared_ptr<CContext> > >* contextMap = CObjectTemplate<CContext>::GetAllMapobject();
-    for(auto it = contextMap->begin(); it != contextMap->end(); ++it)
-    {
-      for(auto it2 = it->second.begin(); it2 != it->second.end(); ++it2)
-      {
-          std::shared_ptr<CContext> todel = it2->second;
-          todel.reset();
-      }
-      it->second.clear();
-
-      std::vector<std::shared_ptr<CContext> >*  contextVect = CObjectTemplate<CContext>::GetAllVectobjectPtr(it->first);
-      for(auto it = contextVect->begin(); it != contextVect->end(); ++it)
-      {
-          it->reset();
-      }
-      contextVect->clear();
-      
-    }
-    contextMap->clear();
   }