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

Protect against orte_proc_applied_binding being NULL.

Просмотр исходного кода 
It is now possible for orte_proc_applied_binding to be NULL (e.g., if
you mpirun --bind-to none), so we need to ensure we don't pass it down
to opal_hwloc_base_cset2*str().

Also, take the opprotunity to de-duplicate some strings that are used
in multiple places.

Refs trac:4073

This commit was SVN r30204.

The following Trac tickets were found above:
  Ticket 4073 --> https://svn.open-mpi.org/trac/ompi/ticket/4073
Этот коммит содержится в:
Jeff Squyres 2014-01-09 23:38:34 +00:00
родитель fb9e427320
Коммит b0b17c62aa
1 изменённых файлов: 22 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

34
ompi/mpiext/affinity/c/mpiext_affinity_str.c
Просмотреть файл

@ -35,6 +35,8 @@
#include "ompi/mpiext/affinity/c/mpiext_affinity_c.h"
static const char FUNC_NAME[] = "OMPI_Affinity";
static const char ompi_nobind_str[] = "Open MPI did not bind this process";
static const char not_bound_str[] = "Not bound (i.e., bound to all processors)";
static int get_rsrc_ompi_bound(char str[OMPI_AFFINITY_STRING_MAX]);
static int get_rsrc_current_binding(char str[OMPI_AFFINITY_STRING_MAX]);
@ -97,16 +99,18 @@ static int get_rsrc_ompi_bound(char str[OMPI_AFFINITY_STRING_MAX])
/* If OMPI did not bind, indicate that */
if (!ompi_rte_proc_is_bound) {
const char tmp[] = "This process is not bound";
strncpy(str, tmp, OMPI_AFFINITY_STRING_MAX - 1);
strncpy(str, ompi_nobind_str, OMPI_AFFINITY_STRING_MAX - 1);
return OMPI_SUCCESS;
}
if (NULL == orte_proc_applied_binding) {
ret = OPAL_ERR_NOT_BOUND;
} else {
ret = opal_hwloc_base_cset2str(str, OMPI_AFFINITY_STRING_MAX,
orte_proc_applied_binding);
}
if (OPAL_ERR_NOT_BOUND == ret) {
const char tmp[] = "Not bound (or bound to all available processors)";
strncpy(str, tmp, OMPI_AFFINITY_STRING_MAX - 1);
strncpy(str, not_bound_str, OMPI_AFFINITY_STRING_MAX - 1);
ret = OMPI_SUCCESS;
}
return ret;
@ -146,8 +150,7 @@ static int get_rsrc_current_binding(char str[OMPI_AFFINITY_STRING_MAX])
/* If we are not bound, indicate that */
if (!bound) {
const char tmp[] = "Not bound (or bound to all available processors)";
strncat(str, tmp, OMPI_AFFINITY_STRING_MAX - 1);
strncat(str, not_bound_str, OMPI_AFFINITY_STRING_MAX - 1);
ret = OMPI_SUCCESS;
}
@ -156,8 +159,7 @@ static int get_rsrc_current_binding(char str[OMPI_AFFINITY_STRING_MAX])
ret = opal_hwloc_base_cset2str(str, OMPI_AFFINITY_STRING_MAX,
boundset);
if (OPAL_ERR_NOT_BOUND == ret) {
const char tmp[] = "Not bound (or bound to all available processors)";
strncpy(str, tmp, OMPI_AFFINITY_STRING_MAX - 1);
strncpy(str, not_bound_str, OMPI_AFFINITY_STRING_MAX - 1);
ret = OMPI_SUCCESS;
}
}
@ -287,17 +289,19 @@ static int get_layout_ompi_bound(char str[OMPI_AFFINITY_STRING_MAX])
/* If OMPI did not bind, indicate that */
if (!ompi_rte_proc_is_bound) {
const char tmp[] = "This process is not bound";
strncpy(str, tmp, OMPI_AFFINITY_STRING_MAX - 1);
strncpy(str, ompi_nobind_str, OMPI_AFFINITY_STRING_MAX - 1);
return OMPI_SUCCESS;
}
/* Find out what OMPI bound us to and prettyprint it */
if (NULL == orte_proc_applied_binding) {
ret = OPAL_ERR_NOT_BOUND;
} else {
ret = opal_hwloc_base_cset2mapstr(str, OMPI_AFFINITY_STRING_MAX,
orte_proc_applied_binding);
}
if (OPAL_ERR_NOT_BOUND == ret) {
const char tmp[] = "Not bound (or bound to all available processors)";
strncpy(str, tmp, OMPI_AFFINITY_STRING_MAX - 1);
strncpy(str, not_bound_str, OMPI_AFFINITY_STRING_MAX - 1);
ret = OMPI_SUCCESS;
}
@ -337,8 +341,7 @@ static int get_layout_current_binding(char str[OMPI_AFFINITY_STRING_MAX])
/* If we are not bound, indicate that */
if (!bound) {
const char tmp[] = "Not bound (or bound to all available processors)";
strncat(str, tmp, OMPI_AFFINITY_STRING_MAX - 1);
strncat(str, not_bound_str, OMPI_AFFINITY_STRING_MAX - 1);
ret = OMPI_SUCCESS;
}
@ -347,8 +350,7 @@ static int get_layout_current_binding(char str[OMPI_AFFINITY_STRING_MAX])
ret = opal_hwloc_base_cset2mapstr(str, OMPI_AFFINITY_STRING_MAX,
boundset);
if (OPAL_ERR_NOT_BOUND == ret) {
const char tmp[] = "Not bound (or bound to all available processors)";
strncpy(str, tmp, OMPI_AFFINITY_STRING_MAX - 1);
strncpy(str, not_bound_str, OMPI_AFFINITY_STRING_MAX - 1);
ret = OMPI_SUCCESS;
}
}