ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Merge pull request #2473 from rhc54/topic/oob

Просмотр исходного кода 
Silence minor warnings
Этот коммит содержится в:
rhc54 2016-11-29 11:48:36 -08:00 коммит произвёл GitHub
родитель a6d390fe7b 30ff8be9c9
Коммит 650a67b2a8
1 изменённых файлов: 6 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
orte/mca/oob/tcp/oob_tcp_connection.c
Просмотреть файл

@ -484,7 +484,7 @@ static int tcp_peer_send_connect_nack(int sd, orte_process_name_t name)
/* send it */ /* send it */
if (ORTE_SUCCESS != tcp_peer_send_blocking(sd, msg, sdsize)) { if (ORTE_SUCCESS != tcp_peer_send_blocking(sd, msg, sdsize)) {
/* it's ok if it fails - remote side may already /* it's ok if it fails - remote side may already
* identifiet the collision and closed the connection * identifiet the collision and closed the connection
*/ */
rc = ORTE_SUCCESS; rc = ORTE_SUCCESS;
@ -837,7 +837,7 @@ int mca_oob_tcp_peer_recv_connect_ack(mca_oob_tcp_peer_t* pr,
/* Check the type of acknowledgement */ /* Check the type of acknowledgement */
memcpy(&ack_flag, msg + offset, sizeof(ack_flag)); memcpy(&ack_flag, msg + offset, sizeof(ack_flag));
offset += sizeof(ack_flag); offset += sizeof(ack_flag);
ack_flag = ntohs(ack_flag); ack_flag = ntohs(ack_flag);
if( !ack_flag ){ if( !ack_flag ){
if (MCA_OOB_TCP_CONNECT_ACK == peer->state) { if (MCA_OOB_TCP_CONNECT_ACK == peer->state) {
@ -878,8 +878,8 @@ int mca_oob_tcp_peer_recv_connect_ack(mca_oob_tcp_peer_t* pr,
* let the higher ranked process retry - if I'm the lower ranked * let the higher ranked process retry - if I'm the lower ranked
* process, I'll simply defer until I receive the request * process, I'll simply defer until I receive the request
*/ */
if (is_new && if (is_new &&
( MCA_OOB_TCP_CONNECTED == peer->state || ( MCA_OOB_TCP_CONNECTED == peer->state ||
MCA_OOB_TCP_CONNECTING == peer->state || MCA_OOB_TCP_CONNECTING == peer->state ||
MCA_OOB_TCP_CONNECT_ACK == peer->state ) ) { MCA_OOB_TCP_CONNECT_ACK == peer->state ) ) {
if (retry(peer, sd, false)) { if (retry(peer, sd, false)) {
@ -888,7 +888,7 @@ int mca_oob_tcp_peer_recv_connect_ack(mca_oob_tcp_peer_t* pr,
} }
/* check that this is from a matching version */ /* check that this is from a matching version */
version = (char*)((void*)msg + offset); version = (char*)((char*)msg + offset);
offset += strlen(version) + 1; offset += strlen(version) + 1;
if (0 != strcmp(version, orte_version_string)) { if (0 != strcmp(version, orte_version_string)) {
opal_output(0, "%s tcp_peer_recv_connect_ack: " opal_output(0, "%s tcp_peer_recv_connect_ack: "
@ -908,7 +908,7 @@ int mca_oob_tcp_peer_recv_connect_ack(mca_oob_tcp_peer_t* pr,
ORTE_NAME_PRINT(&peer->name)); ORTE_NAME_PRINT(&peer->name));
/* check security token */ /* check security token */
cred = (char*)((void*)msg + offset); cred = (char*)((char*)msg + offset);
credsize = hdr.nbytes - offset; credsize = hdr.nbytes - offset;
if (OPAL_SUCCESS != (rc = opal_sec.authenticate(cred, credsize, &peer->auth_method))) { if (OPAL_SUCCESS != (rc = opal_sec.authenticate(cred, credsize, &peer->auth_method))) {
char *hostname; char *hostname;