Skip to content

orte_dt_print_node: correctly handle nodes with no alias(es) #5089

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

Closed
wants to merge 1 commit into from
Closed

orte_dt_print_node: correctly handle nodes with no alias(es) #5089

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 16 additions & 10 deletions orte/runtime/data_type_support/orte_dt_print_fns.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* Copyright (c) 2011-2013 Los Alamos National Security, LLC.
* All rights reserved.
* Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2018 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -310,12 +312,14 @@ int orte_dt_print_node(char **output, char *prefix, orte_node_t *src, opal_data_
tmp3 = NULL;
if (orte_get_attribute(&src->attributes, ORTE_NODE_ALIAS, (void**)&tmp3, OPAL_STRING)) {
alias = opal_argv_split(tmp3, ',');
for (i=0; NULL != alias[i]; i++) {
asprintf(&tmp2, "%s%s\tresolved from %s\n", tmp, pfx2, alias[i]);
free(tmp);
tmp = tmp2;
if (NULL != alias) {
for (i=0; NULL != alias[i]; i++) {
asprintf(&tmp2, "%s%s\tresolved from %s\n", tmp, pfx2, alias[i]);
free(tmp);
tmp = tmp2;
}
opal_argv_free(alias);
}
opal_argv_free(alias);
}
if (NULL != tmp3) {
free(tmp3);
Expand All @@ -331,12 +335,14 @@ int orte_dt_print_node(char **output, char *prefix, orte_node_t *src, opal_data_
tmp3 = NULL;
if (orte_get_attribute(&src->attributes, ORTE_NODE_ALIAS, (void**)&tmp3, OPAL_STRING)) {
alias = opal_argv_split(tmp3, ',');
for (i=0; NULL != alias[i]; i++) {
asprintf(&tmp2, "%s%s\tresolved from %s\n", tmp, pfx2, alias[i]);
free(tmp);
tmp = tmp2;
if (NULL != alias) {
for (i=0; NULL != alias[i]; i++) {
asprintf(&tmp2, "%s%s\tresolved from %s\n", tmp, pfx2, alias[i]);
free(tmp);
tmp = tmp2;
}
opal_argv_free(alias);
}
opal_argv_free(alias);
}
if (NULL != tmp3) {
free(tmp3);
Expand Down