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

Merge pull request #3651 from rhc54/topic/stuff

Просмотр исходного кода 
Do not hang if we cannot relay messages. Eliminate extra error log message
Этот коммит содержится в:
Ralph Castain 2017-06-05 09:36:29 -07:00 коммит произвёл GitHub
родитель dea9ef2020 594c0e2876
Коммит 8a377beb25
3 изменённых файлов: 12 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
opal/mca/pmix/base/pmix_base_fns.c
Просмотреть файл

@ -152,7 +152,6 @@ int opal_pmix_base_exchange(opal_value_t *indat,
rc = opal_pmix.publish(&ilist);
OPAL_LIST_DESTRUCT(&ilist);
if (OPAL_SUCCESS != rc) {
OPAL_ERROR_LOG(rc);
return rc;
}
} else {
@ -161,7 +160,6 @@ int opal_pmix_base_exchange(opal_value_t *indat,
caddy.pdat = NULL;
rc = opal_pmix.publish_nb(&ilist, opcbfunc, &caddy);
if (OPAL_SUCCESS != rc) {
OPAL_ERROR_LOG(rc);
OPAL_LIST_DESTRUCT(&ilist);
return rc;
}
@ -213,7 +211,6 @@ int opal_pmix_base_exchange(opal_value_t *indat,
OPAL_LIST_DESTRUCT(&mlist);
OPAL_LIST_DESTRUCT(&ilist);
if (OPAL_SUCCESS != rc) {
OPAL_ERROR_LOG(rc);
return rc;
}
} else {
@ -224,7 +221,6 @@ int opal_pmix_base_exchange(opal_value_t *indat,
opal_argv_append_nosize(&keys, pdat->value.key);
rc = opal_pmix.lookup_nb(keys, &mlist, lookup_cbfunc, &caddy);
if (OPAL_SUCCESS != rc) {
OPAL_ERROR_LOG(rc);
OPAL_LIST_DESTRUCT(&mlist);
opal_argv_free(keys);
return rc;

12
opal/runtime/opal_info_support.c
Просмотреть файл

@ -672,7 +672,7 @@ static void opal_info_show_mca_group_params(const mca_base_var_group_t *group, m
}
if (opal_info_pretty && curr_group != group) {
asprintf(&message, "MCA%s %s%s", requested ? "" : " (disabled)",
asprintf(&message, "MCA%s %s%s", requested ? "" : " (-)",
group->group_framework,
component_msg ? component_msg : "");
opal_info_out(message, message, "---------------------------------------------------");
@ -687,7 +687,7 @@ static void opal_info_show_mca_group_params(const mca_base_var_group_t *group, m
for (j = 0 ; strings[j] ; ++j) {
if (0 == j && opal_info_pretty) {
asprintf (&message, "MCA%s %s%s", requested ? "" : " (disabled)",
asprintf (&message, "MCA%s %s%s", requested ? "" : " (-)",
group->group_framework,
component_msg ? component_msg : "");
opal_info_out(message, message, strings[j]);
@ -718,7 +718,7 @@ static void opal_info_show_mca_group_params(const mca_base_var_group_t *group, m
}
if (opal_info_pretty && curr_group != group) {
asprintf(&message, "MCA%s %s%s", requested ? "" : " (disabled)",
asprintf(&message, "MCA%s %s%s", requested ? "" : " (-)",
group->group_framework,
component_msg ? component_msg : "");
opal_info_out(message, message, "---------------------------------------------------");
@ -733,7 +733,7 @@ static void opal_info_show_mca_group_params(const mca_base_var_group_t *group, m
for (j = 0 ; strings[j] ; ++j) {
if (0 == j && opal_info_pretty) {
asprintf (&message, "MCA%s %s%s", requested ? "" : " (disabled)",
asprintf (&message, "MCA%s %s%s", requested ? "" : " (-)",
group->group_framework,
component_msg ? component_msg : "");
opal_info_out(message, message, strings[j]);
@ -848,8 +848,8 @@ static char *escape_quotes(const char *value)
* Private variables - set some reasonable screen size defaults
*/
static int centerpoint = 36;
static int screen_width = 82;
static int centerpoint = 24;
static int screen_width = 78;
/*
* Prints the passed message in a pretty or parsable format.

8
orte/mca/grpcomm/direct/grpcomm_direct.c
Просмотреть файл

@ -526,15 +526,18 @@ static void xcast_recv(int status, orte_process_name_t* sender,
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&nm->name));
OBJ_RELEASE(rly);
OBJ_RELEASE(item);
ORTE_FORCED_TERMINATE(ORTE_ERR_UNREACH);
continue;
}
if ((ORTE_PROC_STATE_RUNNING < rec->state &&
ORTE_PROC_STATE_CALLED_ABORT != rec->state) ||
!ORTE_FLAG_TEST(rec, ORTE_PROC_FLAG_ALIVE)) {
opal_output(0, "%s grpcomm:direct:send_relay proc %s not running - cannot relay",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&nm->name));
opal_output(0, "%s grpcomm:direct:send_relay proc %s not running - cannot relay: %s ",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&nm->name),
ORTE_FLAG_TEST(rec, ORTE_PROC_FLAG_ALIVE) ? orte_proc_state_to_str(rec->state) : "NOT ALIVE");
OBJ_RELEASE(rly);
OBJ_RELEASE(item);
ORTE_FORCED_TERMINATE(ORTE_ERR_UNREACH);
continue;
}
if (ORTE_SUCCESS != (ret = orte_rml.send_buffer_nb(orte_coll_conduit,
@ -543,6 +546,7 @@ static void xcast_recv(int status, orte_process_name_t* sender,
ORTE_ERROR_LOG(ret);
OBJ_RELEASE(rly);
OBJ_RELEASE(item);
ORTE_FORCED_TERMINATE(ORTE_ERR_UNREACH);
continue;
}
OBJ_RELEASE(item);