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

WIP: Test ZPL #1860

Closed
wants to merge 4 commits into from
Closed

WIP: Test ZPL #1860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c2354e
Test ZPL
eisenhauer Nov 6, 2019
2877005
for testing
eisenhauer Nov 11, 2019
4553642
diag
eisenhauer Nov 11, 2019
c6f5ceb
TestCommonServer problem?
eisenhauer Nov 11, 2019
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
2 changes: 1 addition & 1 deletion source/adios2/toolkit/sst/cp/cp_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void CP_validateParams(SstStream Stream, SstParams Params, int Writer)
if (Params->ControlTransport == NULL)
{
/* determine reasonable default, now "sockets" */
Params->ControlTransport = strdup("sockets");
Params->ControlTransport = strdup("zplenet");
}
else
{
Expand Down
5 changes: 2 additions & 3 deletions testing/adios2/engine/staging-common/TestCommonServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,13 @@ TEST_F(CommonServerTest, ADIOS2CommonServer)
DelayMS)); /* sleep for DelayMS milliseconds */
step++;
#ifdef ADIOS2_HAVE_MPI
MPI_Allreduce(&MyCloseNow, &GlobalCloseNow, 1, MPI_INT, MPI_LOR,
MPI_COMM_WORLD);
if (file_exists(shutdown_name))
{
MyCloseNow = GlobalCloseNow = 1;
}
MPI_Allreduce(&MyCloseNow, &GlobalCloseNow, 1, MPI_INT, MPI_LOR,
MPI_COMM_WORLD);
#else
GlobalCloseNow = MyCloseNow;
if (file_exists(shutdown_name))
{
MyCloseNow = GlobalCloseNow = 1;
Expand Down
5 changes: 5 additions & 0 deletions thirdparty/EVPath/EVPath/zpl-enet/include/enet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2428,13 +2428,15 @@ extern "C" {
(peer->outgoingPeerID < ENET_PROTOCOL_MAXIMUM_PEER_ID &&
sessionID != peer->incomingSessionID)
) {
printf("Packet discard because of peer state peerID %d.. COMMAND DISCARDED, BUT THIS SHOULD NEVER HAPPEN\n", peerID);
return 0;
}
}

if (flags & ENET_PROTOCOL_HEADER_FLAG_COMPRESSED) {
size_t originalSize;
if (host->compressor.context == NULL || host->compressor.decompress == NULL) {
printf("Packet discard because of bad compression peerID %d.. COMMAND DISCARDED, BUT THIS SHOULD NEVER HAPPEN\n", peerID);
return 0;
}

Expand All @@ -2446,6 +2448,7 @@ extern "C" {
);

if (originalSize <= 0 || originalSize > sizeof(host->packetData[1]) - headerSize) {
printf("Packet discard because of original size <=0 peerID %d.. COMMAND DISCARDED, BUT THIS SHOULD NEVER HAPPEN\n", peerID);
return 0;
}

Expand All @@ -2465,6 +2468,7 @@ extern "C" {
buffer.dataLength = host->receivedDataLength;

if (host->checksum(&buffer, 1) != desiredChecksum) {
printf("Packet discard because of checksum peerID %d.. COMMAND DISCARDED, BUT THIS SHOULD NEVER HAPPEN\n", peerID);
return 0;
}
}
Expand Down Expand Up @@ -2618,6 +2622,7 @@ extern "C" {

commandError:
if (event != NULL && event->type != ENET_EVENT_TYPE_NONE) {
printf("Packet discard because of command error peerID %d.. COMMAND DISCARDED, BUT THIS SHOULD NEVER HAPPEN\n", peerID);
return 1;
}

Expand Down