Changeset 1158 for XIOS/dev/dev_olga/src/cxios.cpp

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:

• XIOS/dev/dev_olga/src/cxios.cpp (modified) (6 diffs)

XIOS/dev/dev_olga/src/cxios.cpp

@@ -16 +16 @@
   string CXios::rootFile="./iodef.xml" ;
   string CXios::xiosCodeId="xios.x" ;
-//  string CXios::xiosCodeIdPrm="xios.x.1" ;
-//  string CXios::xiosCodeIdSnd="xios.x.2" ;
   string CXios::clientFile="./xios_client";
   string CXios::serverFile="./xios_server";
@@ -36 +34 @@
   bool CXios::isOptPerformance = true;
   CRegistry* CXios::globalRegistry = 0;
+  double CXios::recvFieldTimeout = 10.0;
 
   //! Parse configuration file and create some objects from it
@@ -71 +70 @@
     bufferSizeFactor = getin<double>("buffer_size_factor", defaultBufferSizeFactor);
     minBufferSize = getin<int>("min_buffer_size", 1024 * sizeof(double));
+    recvFieldTimeout = getin<double>("recv_field_timeout", 10.0);
+    if (recvFieldTimeout < 0.0)
+      ERROR("CXios::parseXiosConfig()", "recv_field_timeout cannot be negative.");
 
     globalComm=MPI_COMM_WORLD ;
@@ -115 +117 @@
        delete globalRegistry ;
      }
-     CClient::closeInfoStream();
-  
 
 #ifdef XIOS_MEMTRACK
+
+#ifdef XIOS_MEMTRACK_LIGHT
+       report(10) << " Memory report : current memory used by XIOS : "<<  MemTrack::getCurrentMemorySize()*1.0/(1024*1024)<<" Mbyte" << endl ;
+       report(10) << " Memory report : maximum memory used by XIOS : "<<  MemTrack::getMaxMemorySize()*1.0/(1024*1024)<<" Mbyte" << endl ;
+#endif
+
+#ifdef XIOS_MEMTRACK_FULL
      MemTrack::TrackListMemoryUsage() ;
      MemTrack::TrackDumpBlocks();
+#endif
+
+     CClient::closeInfoStream();
+
 #endif
   }
@@ -138 +149 @@
   {
     initServer();
+    isClient = false;
+    isServer = true;
 
     // Initialize all aspects MPI
     CServer::initialize();
-    isServer = true;
-    isClient = false;
-
     if (CServer::getRank()==0) globalRegistry = new CRegistry(CServer::intraComm) ;
     
@@ -181 +191 @@
      }
     CServer::finalize();
+
+#ifdef XIOS_MEMTRACK
+
+#ifdef XIOS_MEMTRACK_LIGHT
+       report(10) << " Memory report : current memory used by XIOS : "<<  MemTrack::getCurrentMemorySize()*1.0/(1024*1024)<<" Mbyte" << endl ;
+       report(10) << " Memory report : maximum memory used by XIOS : "<<  MemTrack::getMaxMemorySize()*1.0/(1024*1024)<<" Mbyte" << endl ;
+#endif
+
+#ifdef XIOS_MEMTRACK_FULL
+     MemTrack::TrackListMemoryUsage() ;
+     MemTrack::TrackDumpBlocks();
+#endif
+#endif
     CServer::closeInfoStream();
   }