Changeset 1013 for XIOS/trunk

Timestamp:

12/12/16 16:55:28 (7 years ago)

Author:

rlacroix

Message:

Improve the prefetching of the fields read from a file.

Previously the data was requested at the beginning of the timestep where it would be used which was too late and could cause performance issue.

Location:

XIOS/trunk/src/node

Files:

• field.cpp (modified) (6 diffs)
• field.hpp (modified) (3 diffs)
• file.cpp (modified) (1 diff)

XIOS/trunk/src/node/field.cpp

@@ -36 +36 @@
       , domAxisScalarIds_(vector<StdString>(3,"")), areAllReferenceSolved(false), isReferenceSolved(false)
       , useCompressedOutput(false)
-      , isReadDataRequestPending(false)
       , hasTimeInstant(false)
       , hasTimeCentered(false)
+      , wasDataAlreadyReceivedFromServer(false)
    { setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group")); }
 
@@ -49 +49 @@
       , domAxisScalarIds_(vector<StdString>(3,"")), areAllReferenceSolved(false), isReferenceSolved(false)
       , useCompressedOutput(false)
-      , isReadDataRequestPending(false)
       , hasTimeInstant(false)
       , hasTimeCentered(false)
+      , wasDataAlreadyReceivedFromServer(false)
    { setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group")); }
 
@@ -251 +251 @@
   }
 
-  void CField::sendReadDataRequest(void)
+  void CField::sendReadDataRequest(const CDate& tsDataRequested)
   {
     CContext* context = CContext::getCurrent();
     CContextClient* client = context->client;
 
-    lastDataRequestedFromServer = context->getCalendar()->getCurrentDate();
-    isReadDataRequestPending = true;
+    lastDataRequestedFromServer = tsDataRequested;
 
     CEventClient event(getType(), EVENT_ID_READ_DATA);
@@ -280 +279 @@
     const CDate& currentDate = CContext::getCurrent()->getCalendar()->getCurrentDate();
 
-    bool requestData = (currentDate >= lastDataRequestedFromServer + file->output_freq.getValue());
-
-    if (requestData)
-    {
-      info(20) <<"currentDate : "<<currentDate<<endl ;
-      info(20) <<"lastDataRequestedFromServer : "<<lastDataRequestedFromServer<<endl ;
-      info(20) <<"file->output_freq.getValue() : "<<file->output_freq.getValue()<<endl ;
-      info(20) <<"lastDataRequestedFromServer + file->output_freq.getValue() : "<<lastDataRequestedFromServer + file->output_freq.getValue()<<endl ;
-
-      sendReadDataRequest();
-    }
-
-    return requestData;
+    bool dataRequested = false;
+
+    while (currentDate >= lastDataRequestedFromServer)
+    {
+      info(20) << "currentDate : " << currentDate << endl ;
+      info(20) << "lastDataRequestedFromServer : " << lastDataRequestedFromServer << endl ;
+      info(20) << "file->output_freq.getValue() : " << file->output_freq.getValue() << endl ;
+      info(20) << "lastDataRequestedFromServer + file->output_freq.getValue() : " << lastDataRequestedFromServer + file->output_freq << endl ;
+
+      sendReadDataRequest(lastDataRequestedFromServer + file->output_freq);
+
+      dataRequested = true;
+    }
+
+    return dataRequested;
   }
 
@@ -394 +395 @@
         this->incrementNStep();
 
-
-
         if (getNStep() > nstepMax && (getRelFile()->cyclic.isEmpty() || !getRelFile()->cyclic) )
           return false;
@@ -443 +442 @@
     }
 
+    if (wasDataAlreadyReceivedFromServer)
+      lastDataReceivedFromServer = lastDataReceivedFromServer + file->output_freq;
+    else
+    {
+      lastDataReceivedFromServer = context->getCalendar()->getInitDate();
+      wasDataAlreadyReceivedFromServer = true;
+    }
+
     if (isEOF)
-      serverSourceFilter->signalEndOfStream(lastDataRequestedFromServer);
+      serverSourceFilter->signalEndOfStream(lastDataReceivedFromServer);
     else
-      serverSourceFilter->streamDataFromServer(lastDataRequestedFromServer, data);
-
-    isReadDataRequestPending = false;
+      serverSourceFilter->streamDataFromServer(lastDataReceivedFromServer, data);
   }
 

XIOS/trunk/src/node/field.hpp

@@ -143 +143 @@
         void recvUpdateData(vector<int>& ranks, vector<CBufferIn*>& buffers);
         void writeField(void);
-        void sendReadDataRequest(void);
+        void sendReadDataRequest(const CDate& tsDataRequested);
         bool sendReadDataRequestIfNeeded(void);
         static void recvReadDataRequest(CEventServer& event);
@@ -195 +195 @@
          bool isEOF;
          CDate lastlast_Write_srv, last_Write_srv, last_operation_srv;
-         CDate lastDataRequestedFromServer;
+         CDate lastDataRequestedFromServer, lastDataReceivedFromServer;
+         bool wasDataAlreadyReceivedFromServer;
 
          map<int,boost::shared_ptr<func::CFunctor> > foperation_srv;
@@ -205 +206 @@
          bool isReferenceSolved;
          std::vector<StdString> domAxisScalarIds_;
-         bool isReadDataRequestPending;
          bool useCompressedOutput;
 

XIOS/trunk/src/node/file.cpp

@@ -745 +745 @@
      int size = this->enabledFields.size();
      for (int i = 0; i < size; ++i)
-       this->enabledFields[i]->sendReadDataRequest();
+       this->enabledFields[i]->sendReadDataRequest(CContext::getCurrent()->getCalendar()->getCurrentDate());
    }