Changeset 2491

Timestamp:

04/19/23 18:33:40 (13 months ago)

Author:

ymipsl

Message:

Fix the problem of shared_from_this() needed at construction time. Deported at connection output.
YM

Location:

XIOS3/dev/XIOS_ATTACHED/src/filter

Files:

• client_online_reader_filter.cpp (modified) (1 diff)
• client_online_reader_filter.hpp (modified) (1 diff)
• output_pin.hpp (modified) (1 diff)

XIOS3/dev/XIOS_ATTACHED/src/filter/client_online_reader_filter.cpp

@@ -29 +29 @@
 // connect filters
     fileReaderSourceFilter_->connectOutput(redistributeFilter_, 0);
-   
-   // shared_ptr<CClientOnlineReaderFilter> toto = shared_from_this() ;
-    // very bad thing to bypass shared pointer assignement in constructor: just for test !
-    auto sharedThis = new std::shared_ptr<CClientOnlineReaderFilter>(this) ;
-    redistributeFilter_->connectOutput(*sharedThis, 0);
 
     field_ = fieldIn ;
     freqOp_ = fieldOut->getRelFile()->output_freq ;
     offset_ = fieldOut->freq_offset ;
+  }
+
+
+  void CClientOnlineReaderFilter::connectOutput(std::shared_ptr<CInputPin> inputPin, size_t inputSlot)
+  {
+    // connection to redistributeFilter cannot be done at construction time due to shared_from_this(), doing it now
+    redistributeFilter_->connectOutput(shared_from_this(), 0);
+    CFilter::connectOutput(inputPin,inputSlot) ;
   }
 

XIOS3/dev/XIOS_ATTACHED/src/filter/client_online_reader_filter.hpp

@@ -30 +30 @@
        */
       CClientOnlineReaderFilter(CGarbageCollector& gc, CField* field);
-
+      virtual void connectOutput(std::shared_ptr<CInputPin> inputPin, size_t inputSlot) ;
       /*!
        * Transforms the data received from the model into a packet and send it

XIOS3/dev/XIOS_ATTACHED/src/filter/output_pin.hpp

@@ -30 +30 @@
        * \param inputSlot the input slot number
        */
-      void connectOutput(std::shared_ptr<CInputPin> inputPin, size_t inputSlot);
+      void virtual connectOutput(std::shared_ptr<CInputPin> inputPin, size_t inputSlot);
 
       /*!