Loading source/adios2/engine/sst/SstReader.cpp +11 −9 Original line number Diff line number Diff line Loading @@ -121,10 +121,12 @@ StepStatus SstReader::BeginStep(StepMode Mode, const float timeout_sec) SstStatusValue result; SstStepMode StepMode; switch (Mode) { switch (Mode) { case StepMode::Append: case StepMode::Update: throw std::invalid_argument("ERROR: SstReader::BeginStep inappropriate StepMode specified" + throw std::invalid_argument( "ERROR: SstReader::BeginStep inappropriate StepMode specified" + m_EndMessage); break; case StepMode::NextAvailable: Loading source/adios2/toolkit/sst/cp/cp_internal.h +2 −1 Original line number Diff line number Diff line Loading @@ -50,7 +50,8 @@ enum StreamStatus Closed }; static char *SSTStreamStatusStr[] = {"NotOpen", "Established", "PeerClosed", "PeerFailed", "Closed"}; static char *SSTStreamStatusStr[] = {"NotOpen", "Established", "PeerClosed", "PeerFailed", "Closed"}; typedef struct _WS_ReaderInfo { Loading source/adios2/toolkit/sst/cp/cp_writer.c +2 −3 Original line number Diff line number Diff line Loading @@ -833,9 +833,8 @@ static void CP_PeerFailCloseWSReader(WS_ReaderInfo CP_WSR_Stream, CMadd_delayed_task(ParentStream->CPInfo->cm, 2, 0, CloseWSRStream, CP_WSR_Stream); } CP_verbose(ParentStream, "Moving stream %p to status %s\n", CP_WSR_Stream, SSTStreamStatusStr[NewState]); CP_verbose(ParentStream, "Moving stream %p to status %s\n", CP_WSR_Stream, SSTStreamStatusStr[NewState]); CP_WSR_Stream->ReaderStatus = NewState; /* main thread might be waiting on timesteps going away */ pthread_cond_signal(&ParentStream->DataCondition); Loading source/adios2/toolkit/sst/sst.h +1 −3 Original line number Diff line number Diff line Loading @@ -36,15 +36,13 @@ typedef enum { } SstStatusValue; /* The SST version of enum class StepMode in ADIOSTypes.h */ typedef enum { typedef enum { SstAppend, // writer modes ignored in SST SstUpdate, // writer modes ignored in SST SstNextAvailable, SstLatestAvailable // reader advance mode } SstStepMode; /* * Struct that represents statistics tracked by SST */ Loading Loading
source/adios2/engine/sst/SstReader.cpp +11 −9 Original line number Diff line number Diff line Loading @@ -121,10 +121,12 @@ StepStatus SstReader::BeginStep(StepMode Mode, const float timeout_sec) SstStatusValue result; SstStepMode StepMode; switch (Mode) { switch (Mode) { case StepMode::Append: case StepMode::Update: throw std::invalid_argument("ERROR: SstReader::BeginStep inappropriate StepMode specified" + throw std::invalid_argument( "ERROR: SstReader::BeginStep inappropriate StepMode specified" + m_EndMessage); break; case StepMode::NextAvailable: Loading
source/adios2/toolkit/sst/cp/cp_internal.h +2 −1 Original line number Diff line number Diff line Loading @@ -50,7 +50,8 @@ enum StreamStatus Closed }; static char *SSTStreamStatusStr[] = {"NotOpen", "Established", "PeerClosed", "PeerFailed", "Closed"}; static char *SSTStreamStatusStr[] = {"NotOpen", "Established", "PeerClosed", "PeerFailed", "Closed"}; typedef struct _WS_ReaderInfo { Loading
source/adios2/toolkit/sst/cp/cp_writer.c +2 −3 Original line number Diff line number Diff line Loading @@ -833,9 +833,8 @@ static void CP_PeerFailCloseWSReader(WS_ReaderInfo CP_WSR_Stream, CMadd_delayed_task(ParentStream->CPInfo->cm, 2, 0, CloseWSRStream, CP_WSR_Stream); } CP_verbose(ParentStream, "Moving stream %p to status %s\n", CP_WSR_Stream, SSTStreamStatusStr[NewState]); CP_verbose(ParentStream, "Moving stream %p to status %s\n", CP_WSR_Stream, SSTStreamStatusStr[NewState]); CP_WSR_Stream->ReaderStatus = NewState; /* main thread might be waiting on timesteps going away */ pthread_cond_signal(&ParentStream->DataCondition); Loading
source/adios2/toolkit/sst/sst.h +1 −3 Original line number Diff line number Diff line Loading @@ -36,15 +36,13 @@ typedef enum { } SstStatusValue; /* The SST version of enum class StepMode in ADIOSTypes.h */ typedef enum { typedef enum { SstAppend, // writer modes ignored in SST SstUpdate, // writer modes ignored in SST SstNextAvailable, SstLatestAvailable // reader advance mode } SstStepMode; /* * Struct that represents statistics tracked by SST */ Loading