Changeset 2628 for XIOS3/trunk/src/io

Timestamp:

04/03/24 10:33:55 (3 months ago)

Author:

jderouillat

Message:

New timers integration/reporting

Location:

XIOS3/trunk/src/io

Files:

• nc4_data_input.cpp (modified) (3 diffs)
• nc4_data_output.cpp (modified) (5 diffs)
• onetcdf4.cpp (modified) (4 diffs)

XIOS3/trunk/src/io/nc4_data_input.cpp

@@ -10 +10 @@
 namespace xios
 {
+  extern CLogType logProfile ;
   CNc4DataInput::CNc4DataInput(const StdString& filename, MPI_Comm comm_file, bool multifile, bool isCollective /*= true*/,
                                bool readMetaDataPar /*= false*/, bool ugridConvention /*= false*/, const StdString& timeCounterName /*= "time_counter"*/)
@@ -57 +58 @@
     {
       case MULTI_FILE:
+        if (info.isActive(logProfile)) CTimer::get("Files : reading data").resume();
         SuperClassWriter::getData(dataOut, fieldId, isCollective, record );
+        if (info.isActive(logProfile)) CTimer::get("Files : reading data").suspend();
         break;
       case ONE_FILE:
@@ -106 +109 @@
         }
 
+        if (info.isActive(logProfile)) CTimer::get("Files : reading data").resume();
         SuperClassWriter::getData(dataOut, fieldId, isCollective, record, &start, &count);
+        if (info.isActive(logProfile)) CTimer::get("Files : reading data").suspend();
         break;
       }

XIOS3/trunk/src/io/nc4_data_output.cpp

@@ -21 +21 @@
 namespace xios
 {
+      extern CLogType logProfile ;
       /// ////////////////////// Dfinitions ////////////////////// ///
       CNc4DataOutput::CNc4DataOutput
@@ -2277 +2278 @@
               case (MULTI_FILE) :
               {
-                 CTimer::get("Files : writing data").resume();
+                 if (info.isActive(logProfile)) CTimer::get("Files : writing data").resume();
                  writeAndConvertData(field, data, nstep - 1);
-                 CTimer::get("Files : writing data").suspend();
+                 if (info.isActive(logProfile)) CTimer::get("Files : writing data").suspend();
                  if (wtime)
                  {
-                   CTimer::get("Files : writing time axis").resume();
+                   if (info.isActive(logProfile)) CTimer::get("Files : writing time axis").resume();
                    if ( wtimeData)
                    {
@@ -2293 +2294 @@
                      if (timeCounterType!=record) SuperClassWriter::writeTimeAxisDataBounds(time_counter_bound, timeBoundId, isCollective, nstep - 1, isRoot);
                    }
-                   CTimer::get("Files : writing time axis").suspend();
+                   if (info.isActive(logProfile)) CTimer::get("Files : writing time axis").suspend();
                  }
                  break;
@@ -2441 +2442 @@
 
 
-                CTimer::get("Files : writing data").resume();
+                if (info.isActive(logProfile)) CTimer::get("Files : writing data").resume();
                 writeAndConvertData(field, data, nstep - 1, &start, &count);
-                CTimer::get("Files : writing data").suspend();
+                if (info.isActive(logProfile)) CTimer::get("Files : writing data").suspend();
 
                  if (wtime)
                  {
-                   CTimer::get("Files : writing time axis").resume();
+                   if (info.isActive(logProfile)) CTimer::get("Files : writing time axis").resume();
                    if ( wtimeData)
                    {
@@ -2459 +2460 @@
 
                    }
-                   CTimer::get("Files : writing time axis").suspend();  
+                   if (info.isActive(logProfile)) CTimer::get("Files : writing time axis").suspend();  
                  }
 

XIOS3/trunk/src/io/onetcdf4.cpp

@@ -13 +13 @@
 namespace xios
 {
+      extern CLogType logProfile ;
       /// ////////////////////// Définitions ////////////////////// ///
 
@@ -58 +59 @@
          if (!append || !std::ifstream(filename.c_str()))
          {
-            CTimer::get("Files : create").resume();
+            if (info.isActive(logProfile)) CTimer::get("Files : create").resume();
             if (wmpi)
                CNetCdfInterface::createPar(filename, mode, *comm, MPI_INFO_NULL, this->ncidp);
             else
                CNetCdfInterface::create(filename, mode, this->ncidp);
-            CTimer::get("Files : create").suspend();
+            if (info.isActive(logProfile)) CTimer::get("Files : create").suspend();
  
             this->appendMode = false;
@@ -70 +71 @@
          {
             mode |= NC_WRITE;
-            CTimer::get("Files : open").resume();
+            if (info.isActive(logProfile)) CTimer::get("Files : open").resume();
             if (wmpi)
                CNetCdfInterface::openPar(filename, mode, *comm, MPI_INFO_NULL, this->ncidp);
             else
                CNetCdfInterface::open(filename, mode, this->ncidp);
-            CTimer::get("Files : open").suspend();
+            if (info.isActive(logProfile)) CTimer::get("Files : open").suspend();
             this->appendMode = true;
          }
@@ -89 +90 @@
       void CONetCDF4::close()
       {
-        CTimer::get("Files : close").resume();
+        if (info.isActive(logProfile)) CTimer::get("Files : close").resume();
         CNetCdfInterface::close(this->ncidp);
-        CTimer::get("Files : close").suspend();
+        if (info.isActive(logProfile)) CTimer::get("Files : close").suspend();
       }