1
1

Minor coding style and intentation fixes.

This commit was SVN r24764.
Этот коммит содержится в:
Josh Hursey 2011-06-09 14:16:06 +00:00
родитель 610421a0da
Коммит 20339a7900

Просмотреть файл

@ -140,14 +140,16 @@ bool mca_oob_tcp_msg_send_handler(mca_oob_tcp_msg_t* msg, struct mca_oob_tcp_pee
while(1) { while(1) {
rc = writev(peer->peer_sd, msg->msg_rwptr, msg->msg_rwnum); rc = writev(peer->peer_sd, msg->msg_rwptr, msg->msg_rwnum);
if(rc < 0) { if(rc < 0) {
if(opal_socket_errno == EINTR) if(opal_socket_errno == EINTR) {
continue; continue;
}
/* In windows, many of the socket functions return an EWOULDBLOCK instead of \ /* In windows, many of the socket functions return an EWOULDBLOCK instead of \
things like EAGAIN, EINPROGRESS, etc. It has been verified that this will \ things like EAGAIN, EINPROGRESS, etc. It has been verified that this will \
not conflict with other error codes that are returned by these functions \ not conflict with other error codes that are returned by these functions \
under UNIX/Linux environments */ under UNIX/Linux environments */
else if (opal_socket_errno == EAGAIN || opal_socket_errno == EWOULDBLOCK) else if (opal_socket_errno == EAGAIN || opal_socket_errno == EWOULDBLOCK) {
return false; return false;
}
else { else {
opal_output(0, "%s->%s mca_oob_tcp_msg_send_handler: writev failed: %s (%d) [sd = %d]", opal_output(0, "%s->%s mca_oob_tcp_msg_send_handler: writev failed: %s (%d) [sd = %d]",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
@ -248,14 +250,16 @@ static bool mca_oob_tcp_msg_recv(mca_oob_tcp_msg_t* msg, mca_oob_tcp_peer_t* pee
while(msg->msg_rwnum) { while(msg->msg_rwnum) {
rc = readv(peer->peer_sd, msg->msg_rwptr, msg->msg_rwnum); rc = readv(peer->peer_sd, msg->msg_rwptr, msg->msg_rwnum);
if(rc < 0) { if(rc < 0) {
if(opal_socket_errno == EINTR) if(opal_socket_errno == EINTR) {
continue; continue;
}
/* In windows, many of the socket functions return an EWOULDBLOCK instead of \ /* In windows, many of the socket functions return an EWOULDBLOCK instead of \
things like EAGAIN, EINPROGRESS, etc. It has been verified that this will \ things like EAGAIN, EINPROGRESS, etc. It has been verified that this will \
not conflict with other error codes that are returned by these functions \ not conflict with other error codes that are returned by these functions \
under UNIX/Linux environments */ under UNIX/Linux environments */
else if (opal_socket_errno == EAGAIN || opal_socket_errno == EWOULDBLOCK) else if (opal_socket_errno == EAGAIN || opal_socket_errno == EWOULDBLOCK) {
return false; return false;
}
opal_output(0, "%s-%s mca_oob_tcp_msg_recv: readv failed: %s (%d)", opal_output(0, "%s-%s mca_oob_tcp_msg_recv: readv failed: %s (%d)",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(&(peer->peer_name)), ORTE_NAME_PRINT(&(peer->peer_name)),