Skip to content

Poc/oob usock #1519

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

Merged
merged 2 commits into from
Apr 4, 2016
Merged

Poc/oob usock #1519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1707341
oob/usock: mca_oob_usock_peer_close() sets peer->sd = -1 after close()
ggouaillardet Apr 4, 2016
d757fbb
oob/usock: drop message to be sent in process_send()
ggouaillardet Apr 4, 2016
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
4 changes: 4 additions & 0 deletions orte/mca/oob/usock/oob_usock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,10 @@ static void process_send(int fd, short args, void *cbdata)
goto cleanup;
}

if (MCA_OOB_USOCK_CLOSED == peer->state) {
/* the peer has gone, it will never come back */
goto cleanup;
}
/* add the message to the queue for sending after the
* connection is formed
*/
Expand Down
5 changes: 3 additions & 2 deletions orte/mca/oob/usock/oob_usock_connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Oak Ridge National Labs. All rights reserved.
* Copyright (c) 2013-2015 Intel, Inc. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* Copyright (c) 2014-2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
Expand Down Expand Up @@ -85,7 +85,7 @@ static int usock_peer_create_socket(mca_oob_usock_peer_t* peer)
{
int flags;

if (peer->sd > 0) {
if (peer->sd >=0) {
return ORTE_SUCCESS;
}

Expand Down Expand Up @@ -771,6 +771,7 @@ void mca_oob_usock_peer_close(mca_oob_usock_peer_t *peer)

/* release the socket */
close(peer->sd);
peer->sd = -1;

/* inform the component-level that we have lost a connection so
* it can decide what to do about it.
Expand Down