Iteration::close

include/openPMD/IO/ADIOS/ADIOS1IOHandlerImpl.hpp

@@ -56,6 +56,7 @@ namespace openPMD
         void createDataset(Writable*, Parameter< Operation::CREATE_DATASET > const&) override;
         void extendDataset(Writable*, Parameter< Operation::EXTEND_DATASET > const&) override;
         void openFile(Writable*, Parameter< Operation::OPEN_FILE > const&) override;
+        void closeFile(Writable*, Parameter< Operation::CLOSE_FILE > const&) override;
         void openPath(Writable*, Parameter< Operation::OPEN_PATH > const&) override;
         void openDataset(Writable*, Parameter< Operation::OPEN_DATASET > &) override;
         void deleteFile(Writable*, Parameter< Operation::DELETE_FILE > const&) override;

include/openPMD/IO/ADIOS/ADIOS2IOHandler.hpp

@@ -128,6 +128,9 @@ class ADIOS2IOHandlerImpl
     void openFile( Writable *,
                    Parameter< Operation::OPEN_FILE > const & ) override;
 
+    void closeFile( Writable *,
+                    Parameter< Operation::CLOSE_FILE > const & ) override;
+
     void openPath( Writable *,
                    Parameter< Operation::OPEN_PATH > const & ) override;
 

include/openPMD/IO/ADIOS/ParallelADIOS1IOHandlerImpl.hpp

@@ -57,6 +57,7 @@ namespace openPMD
         void createDataset(Writable*, Parameter< Operation::CREATE_DATASET > const&) override;
         void extendDataset(Writable*, Parameter< Operation::EXTEND_DATASET > const&) override;
         void openFile(Writable*, Parameter< Operation::OPEN_FILE > const&) override;
+        void closeFile(Writable*, Parameter< Operation::CLOSE_FILE > const&) override;
         void openPath(Writable*, Parameter< Operation::OPEN_PATH > const&) override;
         void openDataset(Writable*, Parameter< Operation::OPEN_DATASET > &) override;
         void deleteFile(Writable*, Parameter< Operation::DELETE_FILE > const&) override;

include/openPMD/IO/AbstractIOHandlerImpl.hpp

@@ -68,6 +68,9 @@ class AbstractIOHandlerImpl
                     case O::OPEN_FILE:
                         openFile(i.writable, deref_dynamic_cast< Parameter< O::OPEN_FILE > >(i.parameter.get()));
                         break;
+                    case O::CLOSE_FILE:
+                        closeFile(i.writable, *dynamic_cast< Parameter< O::CLOSE_FILE >* >(i.parameter.get()));
+                        break;
                     case O::OPEN_PATH:
                         openPath(i.writable, deref_dynamic_cast< Parameter< O::OPEN_PATH > >(i.parameter.get()));
                         break;
@@ -118,6 +121,12 @@ class AbstractIOHandlerImpl
         return std::future< void >();
     }
 
+  /**
+   * Close the file corresponding with the writable and release file handles.
+   * The operation should succeed in any access mode.
+   */
+  virtual void
+  closeFile( Writable *, Parameter< Operation::CLOSE_FILE > const & ) = 0;
   /** Create a new file in physical storage, possibly overriding an existing file.
    *
    * The operation should fail if m_handler->m_frontendAccess is Access::READ_ONLY.

include/openPMD/IO/HDF5/HDF5IOHandlerImpl.hpp

@@ -43,6 +43,7 @@ namespace openPMD
         void createDataset(Writable*, Parameter< Operation::CREATE_DATASET > const&) override;
         void extendDataset(Writable*, Parameter< Operation::EXTEND_DATASET > const&) override;
         void openFile(Writable*, Parameter< Operation::OPEN_FILE > const&) override;
+        void closeFile(Writable*, Parameter< Operation::CLOSE_FILE > const&) override;
         void openPath(Writable*, Parameter< Operation::OPEN_PATH > const&) override;
         void openDataset(Writable*, Parameter< Operation::OPEN_DATASET > &) override;
         void deleteFile(Writable*, Parameter< Operation::DELETE_FILE > const&) override;

include/openPMD/IO/IOTask.hpp

@@ -46,6 +46,7 @@ OPENPMDAPI_EXPORT_ENUM_CLASS(Operation)
 {
     CREATE_FILE,
     OPEN_FILE,
+    CLOSE_FILE,
     DELETE_FILE,
 
     CREATE_PATH,
@@ -127,6 +128,20 @@ struct OPENPMDAPI_EXPORT Parameter< Operation::OPEN_FILE > : public AbstractPara
     std::string name = "";
 };
 
+template<>
+struct OPENPMDAPI_EXPORT Parameter< Operation::CLOSE_FILE > : public AbstractParameter
+{
+    Parameter() = default;
+    Parameter( Parameter const & ) : AbstractParameter() {}
+
+    std::unique_ptr< AbstractParameter >
+    clone() const override
+    {
+        return std::unique_ptr< AbstractParameter >(
+            new Parameter< Operation::CLOSE_FILE >( *this ) );
+    }
+};
+
 template<>
 struct OPENPMDAPI_EXPORT Parameter< Operation::DELETE_FILE > : public AbstractParameter
 {

include/openPMD/IO/JSON/JSONIOHandlerImpl.hpp

@@ -184,6 +184,11 @@ namespace openPMD
             Parameter< Operation::OPEN_FILE > const &
         ) override;
 
+        void closeFile(
+            Writable *,
+            Parameter< Operation::CLOSE_FILE > const &
+        ) override;
+
         void openPath(
             Writable *,
             Parameter< Operation::OPEN_PATH > const &

include/openPMD/Iteration.hpp

@@ -87,6 +87,44 @@ class Iteration : public Attributable
      */
     Iteration& setTimeUnitSI(double newTimeUnitSI);
 
+    /**
+     * @brief Close an iteration. No further (backend-propagating) accesses
+     *        may be performed on this iteration.
+     *        A closed iteration may not (yet) be reopened.
+     * @return Reference to iteration.
+     */
+    /*
+     * Note: If the API is changed in future to allow reopening closed
+     * iterations, measures should be taken to prevent this in the streaming
+     * API. Currently, disallowing to reopen closed iterations satisfies
+     * the requirements of the streaming API.
+     */
+    Iteration &
+    close( bool flush = true );
+
+    /**
+     * @brief Has the iteration been closed?
+     *        A closed iteration may not (yet) be reopened.
+     *
+     * @return Whether the iteration has been closed.
+     */
+    bool
+    closed() const;
+
+    /**
+     * @brief Has the iteration been closed by the writer?
+     *        Background: Upon calling Iteration::close(), the openPMD API
+     *        will add metadata to the iteration in form of an attribute,
+     *        indicating that the iteration has indeed been closed.
+     *        Useful mainly in streaming context when a reader inquires from
+     *        a writer that it is done writing.
+     *
+     * @return Whether the iteration has been explicitly closed (yet) by the
+     *         writer.
+     */
+    bool
+    closedByWriter() const;
+
     Container< Mesh > meshes;
     Container< ParticleSpecies > particles; //particleSpecies?
 
@@ -99,8 +137,41 @@ class Iteration : public Attributable
     void flush();
     void read();
 
+    /**
+     * @brief Whether an iteration has been closed yet.
+     *
+     */
+    enum class CloseStatus
+    {
+        Open,             //!< Iteration has not been closed
+        ClosedInFrontend, /*!< Iteration has been closed, but task has not yet
+                               been propagated to the backend */
+        ClosedInBackend   /*!< Iteration has been closed and task has been
+                               propagated to the backend */
+    };
+
+    /*
+     * An iteration may be logically closed in the frontend,
+     * but not necessarily yet in the backend.
+     * Will be propagated to the backend upon next flush.
+     * Store the current status.
+     */
+    std::shared_ptr< CloseStatus > m_closed =
+        std::make_shared< CloseStatus >( CloseStatus::Open );
+
+    /*
+     * @brief Check recursively whether this Iteration is dirty.
+     *        It is dirty if any attribute or dataset is read from or written to
+     *        the backend.
+     *
+     * @return true If dirty.
+     * @return false Otherwise.
+     */
+    bool
+    dirtyRecursive() const;
+
     virtual void linkHierarchy(std::shared_ptr< Writable > const& w);
-};  //Iteration
+};  // Iteration
 
 extern template
 float

include/openPMD/ParticleSpecies.hpp

@@ -45,6 +45,17 @@ class ParticleSpecies : public Container< Record >
 
     void read();
     void flush(std::string const &) override;
+
+    /**
+     * @brief Check recursively whether this ParticleSpecies is dirty.
+     *        It is dirty if any attribute or dataset is read from or written to
+     *        the backend.
+     *
+     * @return true If dirty.
+     * @return false Otherwise.
+     */
+    bool
+    dirtyRecursive() const;
 };
 
 namespace traits

include/openPMD/RecordComponent.hpp

@@ -198,6 +198,17 @@ class RecordComponent : public BaseRecordComponent
      * @return Reference to this RecordComponent instance.
      */
     RecordComponent& makeEmpty( Dataset d );
+
+    /**
+     * @brief Check recursively whether this RecordComponent is dirty.
+     *        It is dirty if any attribute or dataset is read from or written to
+     *        the backend.
+     *
+     * @return true If dirty.
+     * @return false Otherwise.
+     */
+    bool
+    dirtyRecursive() const;
 }; // RecordComponent
 
 

include/openPMD/Series.hpp

@@ -262,8 +262,10 @@ class Series : public Attributable
     std::unique_ptr< ParsedInput > parseInput(std::string);
     void init(std::shared_ptr< AbstractIOHandler >, std::unique_ptr< ParsedInput >);
     void initDefaults();
-    void flushFileBased();
-    void flushGroupBased();
+    template< typename IterationsContainer >
+    void flushFileBased( IterationsContainer && iterationsToFlush );
+    template< typename IterationsContainer >
+    void flushGroupBased( IterationsContainer && iterationsToFlush );
     void flushMeshesPath();
     void flushParticlesPath();
     void readFileBased();

include/openPMD/backend/BaseRecord.hpp

@@ -97,7 +97,18 @@ class BaseRecord : public Container< T_elem >
     void flush(std::string const&) final;
     virtual void flush_impl(std::string const&) = 0;
     virtual void read() = 0;
-};  //BaseRecord
+
+    /**
+     * @brief Check recursively whether this BaseRecord is dirty.
+     *        It is dirty if any attribute or dataset is read from or written to
+     *        the backend.
+     *
+     * @return true If dirty.
+     * @return false Otherwise.
+     */
+    bool
+    dirtyRecursive() const;
+}; // BaseRecord
 
 
 template< typename T_elem >
@@ -295,4 +306,22 @@ BaseRecord< T_elem >::flush(std::string const& name)
 
     this->flush_impl(name);
 }
-} // openPMD
+
+template< typename T_elem >
+inline bool
+BaseRecord< T_elem >::dirtyRecursive() const
+{
+    if( Attributable::dirty )
+    {
+        return true;
+    }
+    for( auto const & pair : *this )
+    {
+        if( pair.second.dirtyRecursive() )
+        {
+            return true;
+        }
+    }
+    return false;
+}
+} // namespace openPMD

src/IO/ADIOS/ADIOS1IOHandler.cpp

@@ -135,6 +135,9 @@ ADIOS1IOHandlerImpl::flush()
                 case O::OPEN_DATASET:
                     openDataset(i.writable, deref_dynamic_cast< Parameter< O::OPEN_DATASET > >(i.parameter.get()));
                     break;
+                case O::CLOSE_FILE:
+                    closeFile(i.writable, *dynamic_cast< Parameter< O::CLOSE_FILE >* >(i.parameter.get()));
+                    break;
                 case O::DELETE_FILE:
                     deleteFile(i.writable, deref_dynamic_cast< Parameter< O::DELETE_FILE > >(i.parameter.get()));
                     break;

src/IO/ADIOS/ADIOS2IOHandler.cpp

@@ -324,6 +324,24 @@ void ADIOS2IOHandlerImpl::openFile(
     writable->abstractFilePosition = std::make_shared< ADIOS2FilePosition >( );
 }
 
+void
+ADIOS2IOHandlerImpl::closeFile(
+    Writable * writable,
+    Parameter< Operation::CLOSE_FILE > const & )
+{
+    auto fileIterator = m_files.find( writable );
+    if ( fileIterator != m_files.end( ) )
+    {
+        fileIterator->second.invalidate( );
+        auto it = m_fileData.find( fileIterator->second );
+        if ( it != m_fileData.end( ) )
+        {
+            it->second->flush( );
+            m_fileData.erase( it );
+        }
+    }
+}
+
 void ADIOS2IOHandlerImpl::openPath(
     Writable * writable, const Parameter< Operation::OPEN_PATH > & parameters )
 {

src/IO/ADIOS/CommonADIOS1IOHandler.cpp

@@ -540,8 +540,68 @@ CommonADIOS1IOHandlerImpl::openFile(Writable* writable,
 }
 
 void
-CommonADIOS1IOHandlerImpl::openPath(Writable* writable,
-                              Parameter< Operation::OPEN_PATH > const& parameters)
+CommonADIOS1IOHandlerImpl::closeFile(
+    Writable * writable,
+    Parameter< Operation::CLOSE_FILE > const & )
+{
+    auto myFile = m_filePaths.find( writable );
+    if( myFile == m_filePaths.end() )
+    {
+        return;
+    }
+
+    // finish write operations
+    auto myGroup = m_groups.find( myFile->second );
+    if( myGroup != m_groups.end() )
+    {
+        auto attributeWrites = m_attributeWrites.find( myGroup->second );
+        if( this->m_handler->m_backendAccess != Access::READ_ONLY &&
+            attributeWrites != m_attributeWrites.end() )
+        {
+            for( auto & att : attributeWrites->second )
+            {
+                flush_attribute( myGroup->second, att.first, att.second );
+            }
+            m_attributeWrites.erase( attributeWrites );
+        }
+        m_groups.erase( myGroup );
+    }
+
+    auto handle_write = m_openWriteFileHandles.find( myFile->second );
+    if( handle_write != m_openWriteFileHandles.end() )
+    {
+        close( handle_write->second );
+        m_openWriteFileHandles.erase( handle_write );
+    }
+
+    // finish read operations
+    auto handle_read = m_openReadFileHandles.find( myFile->second );
+    if( handle_read != m_openReadFileHandles.end() )
+    {
+        auto scheduled = m_scheduledReads.find( handle_read->second );
+        if( scheduled != m_scheduledReads.end() )
+        {
+            auto status = adios_perform_reads( scheduled->first, 1 );
+            VERIFY(
+                status == err_no_error,
+                "[ADIOS1] Internal error: Failed to perform ADIOS reads during "
+                "dataset reading" );
+
+            for( auto & sel : scheduled->second )
+                adios_selection_delete( sel );
+            m_scheduledReads.erase( scheduled );
+        }
+        close( handle_read->second );
+        m_openReadFileHandles.erase( handle_read );
+    }
+    m_existsOnDisk.erase( myFile->second );
+    m_filePaths.erase( myFile );
+}
+
+void
+CommonADIOS1IOHandlerImpl::openPath(
+    Writable * writable,
+    Parameter< Operation::OPEN_PATH > const & parameters )
 {
     /* Sanitize path */
     std::string path = parameters.path;