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

Merge pull request #1649 from rhc54/topic/env

Просмотр исходного кода 
Fix the env_list support - the MCA param was being set way too early,…
Этот коммит содержится в:
rhc54 2016-05-06 16:51:36 -07:00
родитель 6311f86939 7e5ef6a240
Коммит 2839484737
3 изменённых файлов: 8 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
opal/mca/base/mca_base_var.c
Просмотреть файл

@ -13,7 +13,7 @@
* Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2014 Intel, Inc. All rights reserved. * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
* Copyright (c) 2015 Research Organization for Information Science * Copyright (c) 2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
@ -366,7 +366,7 @@ static void process_env_list(char *env_list, char ***argv, char sep)
opal_argv_free(tokens); opal_argv_free(tokens);
} }
int mca_base_var_process_env_list(char ***argv) int mca_base_var_process_env_list(char *list, char ***argv)
{ {
char sep; char sep;
sep = ';'; sep = ';';
@ -379,7 +379,9 @@ int mca_base_var_process_env_list(char ***argv)
return OPAL_SUCCESS; return OPAL_SUCCESS;
} }
} }
if (NULL != mca_base_env_list) { if (NULL != list) {
process_env_list(list, argv, sep);
} else if (NULL != mca_base_env_list) {
process_env_list(mca_base_env_list, argv, sep); process_env_list(mca_base_env_list, argv, sep);
} }

3
opal/mca/base/mca_base_var.h
Просмотреть файл

@ -13,6 +13,7 @@
* Copyright (c) 2008-2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2008-2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2012-2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2016 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -729,7 +730,7 @@ OPAL_DECLSPEC int mca_base_var_dump(int vari, char ***out, mca_base_var_dump_typ
* Parse a provided list of envars and add their local value, or * Parse a provided list of envars and add their local value, or
* their assigned value, to the provided argv * their assigned value, to the provided argv
*/ */
OPAL_DECLSPEC int mca_base_var_process_env_list(char ***argv); OPAL_DECLSPEC int mca_base_var_process_env_list(char *list, char ***argv);
OPAL_DECLSPEC int mca_base_var_process_env_list_from_file(char ***argv); OPAL_DECLSPEC int mca_base_var_process_env_list_from_file(char ***argv);
END_C_DECLS END_C_DECLS

2
orte/mca/schizo/ompi/schizo_ompi.c
Просмотреть файл

@ -688,7 +688,7 @@ static int parse_env(char *path,
if (!set_from_file) { if (!set_from_file) {
/* set necessary env variables for external usage */ /* set necessary env variables for external usage */
vars = NULL; vars = NULL;
if (OPAL_SUCCESS == mca_base_var_process_env_list(&vars) && if (OPAL_SUCCESS == mca_base_var_process_env_list(env_set_flag, &vars) &&
NULL != vars) { NULL != vars) {
for (i=0; NULL != vars[i]; i++) { for (i=0; NULL != vars[i]; i++) {
value = strchr(vars[i], '='); value = strchr(vars[i], '=');