Changeset 1021 for XIOS/dev/dev_olga/src/filter/store_filter.cpp

Timestamp:

01/10/17 14:36:29 (8 years ago)

Author:

oabramkina

Message:

Intermeadiate version for merging with new server functionalities.

File:

• XIOS/dev/dev_olga/src/filter/store_filter.cpp (modified) (4 diffs)

XIOS/dev/dev_olga/src/filter/store_filter.cpp

@@ -8 +8 @@
   CStoreFilter::CStoreFilter(CGarbageCollector& gc, CContext* context, CGrid* grid)
     : CInputPin(gc, 1)
+    , gc(gc)
     , context(context)
     , grid(grid)
@@ -23 +24 @@
     CTimer timer("CStoreFilter::getPacket");
     CConstDataPacketPtr packet;
-    const double timeout = 10; // 10 seconds timeout
+    const double timeout = 10 ; // 10 seconds timeout
 
     do
     {
+      if (canBeTriggered())
+        trigger(timestamp);
+
       timer.resume();
 
@@ -39 +43 @@
 
     if (!packet)
+    {
+      std::map<Time, CDataPacketPtr>::const_iterator it ;
+      info(0)<<"Impossible to get the packet with timestamp = " << timestamp<<std::endl<<"Available timestamp are : "<<std::endl ;
+      for(it=packets.begin();it!=packets.end();++it) info(0)<<it->first<<"  ";
+      info(0)<<std::endl ;
       ERROR("CConstDataPacketPtr CStoreFilter::getPacket(Time timestamp) const",
             << "Impossible to get the packet with timestamp = " << timestamp);
-
+    }
     return packet;
   }
@@ -69 +78 @@
     // The packet is always destroyed by the garbage collector
     // so we register but never unregister
-    gc.registerFilter(this, data[0]->timestamp);
+    gc.registerObject(this, data[0]->timestamp);
   }