Changeset 1318 for XIOS/dev/XIOS_DEV_CMIP6/src/node/field.hpp

Timestamp:

10/26/17 10:23:17 (7 years ago)

Author:

rlacroix

Message:

Fix: Handle end-of-file correctly for files in read mode.

Previously desynchronizations between clients could occur, leading to invalid events being received by the server(s).

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/field.hpp (modified) (2 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/field.hpp

@@ -172 +172 @@
         static void recvReadDataReady(CEventServer& event);
         void recvReadDataReady(vector<int> ranks, vector<CBufferIn*> buffers);
+        void checkForLateDataFromServer(void);
         void outputField(CArray<double,3>& fieldOut);
         void outputField(CArray<double,2>& fieldOut);
@@ -217 +218 @@
          bool isEOF;
          CDate lastlast_Write_srv, last_Write_srv, last_operation_srv;
-         CDate lastDataRequestedFromServer, lastDataReceivedFromServer;
-         bool wasDataAlreadyReceivedFromServer;
+         CDate lastDataRequestedFromServer, lastDataReceivedFromServer, dateEOF;
+         bool wasDataRequestedFromServer, wasDataAlreadyReceivedFromServer;
 
          map<int,boost::shared_ptr<func::CFunctor> > foperation_srv;