Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle pending releases when closing writer #2225

Merged
merged 7 commits into from
May 12, 2020
Merged

Handle pending releases when closing writer #2225

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
402f9c7
More complex release at writer close
philip-davis Dec 27, 2019
9b743db
Update writer release to use revamped locking macros
philip-davis May 11, 2020
5d47d4a
Removed double locking
philip-davis May 11, 2020
4684df9
Removed double unlock
philip-davis May 11, 2020
127d94b
Conditionalize MPI operations on using CommMin
philip-davis May 11, 2020
69c4e14
Format
philip-davis May 11, 2020
fe4f9b8
Changed ReleaseData to stack variable
philip-davis May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 68 additions & 2 deletions source/adios2/toolkit/sst/cp/cp_writer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ extern void CP_verbose(SstStream Stream, char *Format, ...);
static void CP_PeerFailCloseWSReader(WS_ReaderInfo CP_WSR_Stream,
enum StreamStatus NewState);

static void ProcessReleaseList(SstStream Stream, ReturnMetadataInfo Metadata);

#define gettid() pthread_self()
#ifdef MUTEX_DEBUG
#define STREAM_MUTEX_LOCK(Stream) \
Expand Down Expand Up @@ -1488,6 +1490,21 @@ void SstWriterClose(SstStream Stream)
if ((Stream->ConfigParams->CPCommPattern == SstCPCommPeer) ||
(Stream->Rank == 0))
{
if (Stream->ReleaseCount > 0)
{
if (Stream->ConfigParams->CPCommPattern == SstCPCommMin)
{
SMPI_Bcast(&Stream->ReleaseCount, 1, SMPI_INT, 0,
Stream->mpiComm);
SMPI_Bcast(Stream->ReleaseList,
Stream->ReleaseCount *
sizeof(*(Stream->ReleaseList)),
SMPI_BYTE, 0, Stream->mpiComm);
}
Stream->ReleaseCount = 0;
free(Stream->ReleaseList);
Stream->ReleaseList = NULL;
}
while (Stream->QueuedTimesteps)
{
CP_verbose(Stream,
Expand All @@ -1502,7 +1519,7 @@ void SstWriterClose(SstStream Stream)
{
char tmp[20];
CP_verbose(Stream,
"IN TS WAIT, ENTRIES areTimestep %ld (exp %d, "
"IN TS WAIT, ENTRIES are Timestep %ld (exp %d, "
"Prec %d, Ref %d), Count now %d\n",
List->Timestep, List->Expired,
List->PreciousTimestep, List->ReferenceCount,
Expand All @@ -1526,18 +1543,67 @@ void SstWriterClose(SstStream Stream)
}
/* NEED TO HANDLE FAILURE HERE */
STREAM_CONDITION_WAIT(Stream);
if (Stream->ConfigParams->CPCommPattern == SstCPCommMin)
{
SMPI_Bcast(&Stream->ReleaseCount, 1, SMPI_INT, 0,
Stream->mpiComm);
if (Stream->ReleaseCount > 0)
{
SMPI_Bcast(Stream->ReleaseList,
Stream->ReleaseCount *
sizeof(*(Stream->ReleaseList)),
SMPI_BYTE, 0, Stream->mpiComm);
Stream->ReleaseCount = 0;
free(Stream->ReleaseList);
Stream->ReleaseList = NULL;
}
}
}
if (Stream->ConfigParams->CPCommPattern == SstCPCommMin)
{
Stream->ReleaseCount = -1;
SMPI_Bcast(&Stream->ReleaseCount, 1, SMPI_INT, 0, Stream->mpiComm);
Stream->ReleaseCount = 0;
}
}

if (Stream->ConfigParams->CPCommPattern == SstCPCommMin)
{
if (Stream->Rank != 0)
{
struct _ReturnMetadataInfo ReleaseData;
while (1)
{
SMPI_Bcast(&ReleaseData.ReleaseCount, 1, SMPI_INT, 0,
Stream->mpiComm);
if (ReleaseData.ReleaseCount == -1)
{
break;
}
else if (ReleaseData.ReleaseCount > 0)
{
ReleaseData.ReleaseList =
malloc(ReleaseData.ReleaseCount *
sizeof(*ReleaseData.ReleaseList));
SMPI_Bcast(ReleaseData.ReleaseList,
ReleaseData.ReleaseCount *
sizeof(*ReleaseData.ReleaseList),
SMPI_BYTE, 0, Stream->mpiComm);
STREAM_MUTEX_UNLOCK(Stream);
ProcessReleaseList(Stream, &ReleaseData);
STREAM_MUTEX_LOCK(Stream);
free(ReleaseData.ReleaseList);
ReleaseData.ReleaseList = NULL;
}
}
}
/*
* if we're CommMin, getting here implies that Rank 0 has released all
* timesteps, other ranks can follow suit after barrier
*/
STREAM_MUTEX_UNLOCK(Stream);
SMPI_Barrier(Stream->mpiComm);
STREAM_MUTEX_LOCK(Stream);
ReleaseAndDiscardRemainingTimesteps(Stream);
}
STREAM_MUTEX_UNLOCK(Stream);
gettimeofday(&CloseTime, NULL);
Expand Down