Destructor for ~DeferredComputation

Author: franzpoeschel

include/openPMD/IO/ADIOS/ADIOS2IOHandler.hpp

@@ -957,7 +957,7 @@ class ADIOS2IOHandler : public AbstractIOHandler
         try
         {
             auto params = internal::defaultParsedFlushParams;
-            this->flush(params);
+            this->flush_impl(params);
         }
         catch (std::exception const &ex)
         {
@@ -1005,6 +1005,6 @@ class ADIOS2IOHandler : public AbstractIOHandler
         return true;
     }
 
-    std::future<void> flush(internal::ParsedFlushParams &) override;
+    std::future<void> flush_impl(internal::ParsedFlushParams &) override;
 }; // ADIOS2IOHandler
 } // namespace openPMD

include/openPMD/IO/AbstractIOHandler.hpp

@@ -265,13 +265,15 @@ class AbstractIOHandler
      * backends that decide to implement this operation asynchronously.
      */
     std::future<void> flush(internal::FlushParams const &);
+    std::shared_ptr<unsigned long long> m_flushCounter =
+        std::make_shared<unsigned long long>(0);
 
     /** Process operations in queue according to FIFO.
      *
      * @return  Future indicating the completion state of the operation for
      * backends that decide to implement this operation asynchronously.
      */
-    virtual std::future<void> flush(internal::ParsedFlushParams &) = 0;
+    std::future<void> flush(internal::ParsedFlushParams &);
 
     /** The currently used backend */
     virtual std::string backendName() const = 0;
@@ -315,6 +317,9 @@ class AbstractIOHandler
     IterationEncoding m_encoding = IterationEncoding::groupBased;
     OpenpmdStandard m_standard = auxiliary::parseStandard(getStandardDefault());
     bool m_verify_homogeneous_extents = true;
+
+protected:
+    virtual std::future<void> flush_impl(internal::ParsedFlushParams &) = 0;
 }; // AbstractIOHandler
 
 } // namespace openPMD

include/openPMD/IO/DummyIOHandler.hpp

@@ -44,7 +44,7 @@ class DummyIOHandler : public AbstractIOHandler
     /** No-op consistent with the IOHandler interface to enable library use
      * without IO.
      */
-    std::future<void> flush(internal::ParsedFlushParams &) override;
+    std::future<void> flush_impl(internal::ParsedFlushParams &) override;
     std::string backendName() const override;
 }; // DummyIOHandler
 } // namespace openPMD

include/openPMD/IO/HDF5/HDF5IOHandler.hpp

@@ -46,7 +46,7 @@ class HDF5IOHandler : public AbstractIOHandler
         return "HDF5";
     }
 
-    std::future<void> flush(internal::ParsedFlushParams &) override;
+    std::future<void> flush_impl(internal::ParsedFlushParams &) override;
 
 private:
     std::unique_ptr<HDF5IOHandlerImpl> m_impl;

include/openPMD/IO/HDF5/ParallelHDF5IOHandler.hpp

@@ -56,7 +56,7 @@ class ParallelHDF5IOHandler : public AbstractIOHandler
         return "MPI_HDF5";
     }
 
-    std::future<void> flush(internal::ParsedFlushParams &) override;
+    std::future<void> flush_impl(internal::ParsedFlushParams &) override;
 
 private:
     std::unique_ptr<ParallelHDF5IOHandlerImpl> m_impl;

include/openPMD/IO/JSON/JSONIOHandler.hpp

@@ -59,7 +59,7 @@ class JSONIOHandler : public AbstractIOHandler
         return "JSON";
     }
 
-    std::future<void> flush(internal::ParsedFlushParams &) override;
+    std::future<void> flush_impl(internal::ParsedFlushParams &) override;
 
 private:
     JSONIOHandlerImpl m_impl;

include/openPMD/LoadStoreChunk.hpp

@@ -22,6 +22,7 @@ template <typename Ptr_Type>
 class ConfigureLoadStoreFromBuffer;
 template <typename T>
 class DynamicMemoryView;
+class Attributable;
 
 namespace internal
 {
@@ -87,6 +88,8 @@ namespace core
         [[nodiscard]] auto dim() const -> uint8_t;
         auto storeChunkConfig() -> internal::LoadStoreConfig;
 
+        auto deferFlush(Attributable &);
+
     public:
         auto getOffset() -> Offset const &;
         auto getExtent() -> Extent const &;
@@ -228,9 +231,12 @@ namespace compose
     template <typename ChildClass>
     class ConfigureLoadStore
     {
+        ConfigureLoadStore() = default;
+
     public:
         auto offset(Offset) -> ChildClass &;
         auto extent(Extent) -> ChildClass &;
+        friend ChildClass;
     };
 
     /** Configuration for a Store operation with a buffer type.

include/openPMD/auxiliary/Future.hpp

@@ -15,6 +15,7 @@ class DeferredComputation
 
 public:
     DeferredComputation(task_type);
+    ~DeferredComputation();
 
     auto get() -> T;
 

include/openPMD/backend/Attributable.hpp

@@ -213,6 +213,11 @@ namespace debug
     void printDirty(Series const &);
 }
 
+namespace core
+{
+    class ConfigureLoadStore;
+}
+
 /** @brief Layer to manage storage of attributes associated with file objects.
  *
  * Mandatory and user-defined Attributes and their data for every object in the
@@ -244,6 +249,7 @@ class Attributable
     friend class internal::AttributableData;
     friend class Snapshots;
     friend struct internal::HomogenizeExtents;
+    friend class core::ConfigureLoadStore;
 
 protected:
     // tag for internal constructor

src/IO/ADIOS/ADIOS2IOHandler.cpp

@@ -2614,7 +2614,7 @@ ADIOS2IOHandler::ADIOS2IOHandler(
 {}
 
 std::future<void>
-ADIOS2IOHandler::flush(internal::ParsedFlushParams &flushParams)
+ADIOS2IOHandler::flush_impl(internal::ParsedFlushParams &flushParams)
 {
     return m_impl.flush(flushParams);
 }