Changeset 1037 for XIOS/dev/branch_yushan/src/filter/input_pin.cpp

Timestamp:

01/25/17 16:25:17 (7 years ago)

Author:

yushan

Message:

initialize the branch

File:

• XIOS/dev/branch_yushan/src/filter/input_pin.cpp (modified) (4 diffs)

XIOS/dev/branch_yushan/src/filter/input_pin.cpp

@@ -1 +1 @@
 #include "input_pin.hpp"
-#include "output_pin.hpp"
 #include "garbage_collector.hpp"
 #include "exception.hpp"
@@ -9 +8 @@
     : gc(gc)
     , slotsCount(slotsCount)
-    , triggers(slotsCount)
-    , hasTriggers(false)
   { /* Nothing to do */ }
 
@@ -26 +23 @@
     {
       it = inputs.insert(std::make_pair(packet->timestamp, InputBuffer(slotsCount))).first;
-      gc.registerObject(this, packet->timestamp);
+      gc.registerFilter(this, packet->timestamp);
     }
+
     it->second.slotsFilled++;
     it->second.packets[inputSlot] = packet;
@@ -34 +32 @@
     {
       // Unregister before calling onInputReady in case the filter registers again
-      gc.unregisterObject(this, packet->timestamp);
+      gc.unregisterFilter(this, packet->timestamp);
       onInputReady(it->second.packets);
       inputs.erase(it);
     }
-  }
-
-  void CInputPin::setInputTrigger(size_t inputSlot, COutputPin* trigger)
-  {
-    if (inputSlot >= slotsCount)
-      ERROR("void CInputPin::setInputTrigger(size_t inputSlot, COutputPin* trigger)",
-            "The input slot " << inputSlot << " does not exist.");
-    if (triggers[inputSlot])
-      ERROR("void CInputPin::setInputTrigger(size_t inputSlot, COutputPin* trigger)",
-            "The trigger for input slot " << inputSlot << " has already been set.");
-
-    triggers[inputSlot] = trigger;
-    hasTriggers = true;
-  }
-
-  void CInputPin::trigger(Time timestamp)
-  {
-    if (hasTriggers) // Don't use canBeTriggered here, this function is virtual and can be overriden
-    {
-      std::map<Time, InputBuffer>::iterator it = inputs.find(timestamp);
-      bool nothingReceived = (it == inputs.end());
-
-      for (size_t s = 0; s < slotsCount; s++)
-      {
-        if (triggers[s] && (nothingReceived || !it->second.packets[s]))
-          triggers[s]->trigger(timestamp);
-      }
-    }
-  }
-
-  bool CInputPin::canBeTriggered() const
-  {
-    return hasTriggers;
   }