Changeset 4212

Timestamp:

03/27/09 13:02:56 (12 months ago)

Author:

balaji

Message:

Fixing yet another bug with the environment variable passing that got
introduced in r4190.

Reviewed by Jayesh.

Location:

mpich2/trunk/src/pm/hydra/launcher

Files:

• mpiexec/utils.c (modified) (3 diffs)
• utils/lchu.c (modified) (2 diffs)

mpich2/trunk/src/pm/hydra/launcher/mpiexec/utils.c

@@ -32 +32 @@
 HYD_Status HYD_LCHI_get_parameters(char **t_argv)
 {
-    int i;
+    int i, local_env_set;
     char **argv = t_argv, *tmp;
     char *env_name, *env_value, *str[4] = { NULL }, *progname = *argv;
@@ -311 +311 @@
         handle.prop = !strcmp(tmp, "all") ? HYD_ENV_PROP_ALL : HYD_ENV_PROP_NONE;
 
-    /* If nothing is set for the global environment, set it to the default */
-    if (handle.prop == HYD_ENV_PROP_UNSET)
-        handle.prop = HYD_ENV_PROP_ALL;
-
     /* Make sure local executable is set */
+    local_env_set = 0;
     for (exec_info = handle.exec_info_list; exec_info; exec_info = exec_info->next) {
         if (exec_info->exec[0] == NULL)
@@ -322 +319 @@
         if (exec_info->exec_proc_count == 0)
             exec_info->exec_proc_count = 1;
+
+        if (exec_info->prop != HYD_ENV_PROP_UNSET)
+            local_env_set = 1;
     }
+
+    /* If no global or local environment is set, use the default */
+    if ((handle.prop == HYD_ENV_PROP_UNSET) && (local_env_set == 0))
+        handle.prop = HYD_ENV_PROP_ALL;
 
     if (handle.proxy_port == -1)

mpich2/trunk/src/pm/hydra/launcher/utils/lchu.c

@@ -128 +128 @@
                 HYDU_ERR_POP(status, "unable to add env to list\n");
             }
+        }
+    }
+    else if (handle.prop == HYD_ENV_PROP_UNSET) {
+        for (env = handle.user_env; env; env = env->next) {
+            status = HYDU_append_env_to_list(*env, &handle.prop_env);
+            HYDU_ERR_POP(status, "unable to add env to list\n");
         }
     }
@@ -153 +159 @@
                     HYDU_ERR_POP(status, "unable to add env to list\n");
                 }
+            }
+        }
+        else if (exec_info->prop == HYD_ENV_PROP_UNSET) {
+            for (env = exec_info->user_env; env; env = env->next) {
+                status = HYDU_append_env_to_list(*env, &exec_info->prop_env);
+                HYDU_ERR_POP(status, "unable to add env to list\n");
             }
         }