[mpich2-commits] r8016 - mpich2/trunk/src/pm/hydra/ui/mpich

[balaji at mcs.anl.gov]

Author: balaji
Date: 2011-02-22 16:23:57 -0600 (Tue, 22 Feb 2011)
New Revision: 8016

Modified:
   mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c
Log:
Bug-fixes:

1. mpiexec should return the return code it got from the application
processes, without converting it to the signal number.

2. print-all-exitcodes should print the actual return code of the
processes, not the signal number.

No reviewer.

Modified: mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c
===================================================================
--- mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c	2011-02-22 20:43:55 UTC (rev 8015)
+++ mpich2/trunk/src/pm/hydra/ui/mpich/mpiexec.c	2011-02-22 22:23:57 UTC (rev 8016)
@@ -399,12 +399,7 @@
 
         for (i = 0; i < proxy->proxy_process_count; i++) {
             if (HYD_ui_mpich_info.print_all_exitcodes) {
-                if (WIFEXITED(proxy->exit_status[i])) {
-                    HYDU_dump_noprefix(stdout, "%d", WEXITSTATUS(proxy->exit_status[i]));
-                }
-                else {
-                    HYDU_dump_noprefix(stdout, "%d", proxy->exit_status[i]);
-                }
+                HYDU_dump_noprefix(stdout, "%d", proxy->exit_status[i]);
                 if (i < proxy->proxy_process_count - 1)
                     HYDU_dump_noprefix(stdout, ",");
             }
@@ -450,10 +445,6 @@
             printf("APPLICATION TERMINATED WITH THE EXIT STRING: %s (signal %d)\n",
                    strsignal(WTERMSIG(exit_status)), WTERMSIG(exit_status));
         }
-        else if (WIFEXITED(exit_status))
-            return (WEXITSTATUS(exit_status));
-        else if (WIFSTOPPED(exit_status))
-            return (WSTOPSIG(exit_status));
         return exit_status;
     }