Commit 54c4c753 authored by Eisenhauer, Greg's avatar Eisenhauer, Greg
Browse files

Take care of timeoutSeconds default values in many locations

parent 8de7f057

source/adios2/core/Engine.h

+2 −3
Original line number Diff line number Diff line
@@ -90,9 +90,8 @@ public: 
     * @param timeoutSeconds (not yet implemented)

     * @return current step status

     */

    virtual StepStatus

    BeginStep(StepMode mode,

              const float timeoutSeconds = std::numeric_limits<float>::max());

    virtual StepStatus BeginStep(StepMode mode,

                                 const float timeoutSeconds = -1.0);



    /**

     * Returns current step information for each engine.

source/adios2/engine/bp3/BP3Reader.h

+2 −3
Original line number Diff line number Diff line
@@ -39,9 +39,8 @@ public: 


    virtual ~BP3Reader() = default;



    StepStatus BeginStep(

        StepMode mode = StepMode::NextAvailable,

        const float timeoutSeconds = std::numeric_limits<float>::max()) final;

    StepStatus BeginStep(StepMode mode = StepMode::NextAvailable,

                         const float timeoutSeconds = -1.0) final;



    size_t CurrentStep() const final;

source/adios2/engine/bp3/BP3Writer.h

+2 −3
Original line number Diff line number Diff line
@@ -38,9 +38,8 @@ public: 


    ~BP3Writer();



    StepStatus BeginStep(

        StepMode mode,

        const float timeoutSeconds = std::numeric_limits<float>::max()) final;

    StepStatus BeginStep(StepMode mode,

                         const float timeoutSeconds = -1.0) final;

    size_t CurrentStep() const final;

    void PerformPuts() final;

    void EndStep() final;

source/adios2/engine/dataman/DataManReader.cpp

+2 −1
Original line number Diff line number Diff line
@@ -59,10 +59,11 @@ StepStatus DataManReader::BeginStep(StepMode stepMode, 
        // timeout == std::numeric_limits<float>::max() means there is no

        // timeout, and it should block

        // forever until it receives something.

        if (timeoutSeconds != std::numeric_limits<float>::max())

        if (timeoutSeconds >= 0.0)

        {

            if (duration.count() > timeoutSeconds)

            {

                std::cout << "Dataman Reader timeing out" << std::endl;

                return StepStatus::NotReady;

            }

        }

source/adios2/engine/dataman/DataManReader.h

+2 −3
Original line number Diff line number Diff line
@@ -29,9 +29,8 @@ public: 
    DataManReader(IO &io, const std::string &name, const Mode mode,

                  MPI_Comm mpiComm);

    virtual ~DataManReader();

    StepStatus BeginStep(

        StepMode stepMode,

        const float timeoutSeconds = std::numeric_limits<float>::max()) final;

    StepStatus BeginStep(StepMode stepMode,

                         const float timeoutSeconds = -1.0) final;

    size_t CurrentStep() const final;

    void PerformGets() final;

    void EndStep() final;