A little more clean-up. TotalView now works with --enable-debug build.

Tested with:
pls = rsh
totalview.6.6.0-2
Linux cadillac82.ccstar.lanl.gov 2.4.24 #1 SMP Thu Jul 1 15:28:04 MDT
2004 i686 i686 i386 GNU/Linux

This commit was SVN r7108.

orte/tools/orterun/Makefile.am

@@ -26,6 +26,7 @@ libs = \
 bin_PROGRAMS = orterun
 
 orterun_SOURCES = \
+        main.c \
         orterun.c \
         totalview.c \
         totalview.h 

orte/tools/orterun/main.c

@@ -0,0 +1,30 @@
+/***************************************************************************
+ *                                                                         *
+ *          Open MPI: Open Source High Performance Computing               *
+ *                                                                         *
+ *                   http://www.open-mpi.org/                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "orterun.h"
+
+int main(int argc, char *argv[])
+{
+    return orterun(argc, argv);
+}
+
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ * 
+ * Additional copyrights may follow
+ * 
+ * $HEADER$
+ */

orte/tools/orterun/orterun.c

@@ -56,6 +56,7 @@
 #include "runtime/runtime.h"
 #include "runtime/orte_wait.h"
 
+#include "orterun.h"
 #include "totalview.h"
 
 /*
@@ -221,7 +222,7 @@ static int parse_appfile(char *filename, char ***env);
 static void job_state_callback(orte_jobid_t jobid, orte_proc_state_t state);
 
 
-int main(int argc, char *argv[])
+int orterun(int argc, char *argv[])
 {
     orte_app_context_t **apps;
     int rc, i, num_apps, array_size, j;

orte/tools/orterun/orterun.h

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2004-2005 The Trustees of Indiana University.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
+ *                         All rights reserved.
+ * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+ *                         University of Stuttgart.  All rights reserved.
+ * Copyright (c) 2004-2005 The Regents of the University of California.
+ *                         All rights reserved.
+ * $COPYRIGHT$
+ * 
+ * Additional copyrights may follow
+ * 
+ * $HEADER$
+ */
+
+#ifndef ORTERUN_ORTERUN_H
+#define ORTERUN_ORTERUN_H
+
+#include "orte_config.h"
+
+int orterun(int argc, char *argv[]);
+
+#endif /* ORTERUN_ORTERUN_H */

orte/tools/orterun/totalview.c

@@ -39,13 +39,20 @@
 #include <stdlib.h>
 #include <strings.h>
 
-#include "opal/util/opal_environ.h"
-
 /*
  * The environment
  */
-extern char** environ;
+extern char **environ;
 
+#include "opal/util/opal_environ.h"
+#include "opal/util/output.h"
+#include "opal/class/opal_list.h"
+#include "mca/base/base.h"
+#include "mca/errmgr/errmgr.h"
+#include "mca/rmgr/rmgr_types.h"
+#include "mca/rmaps/base/rmaps_base_map.h"
+#include "runtime/runtime.h"
+#include "totalview.h"
 
 /* +++ begin MPICH/TotalView interface definitions */
 
@@ -71,14 +78,6 @@ void *MPIR_Breakpoint(void);
 
 /* --- end MPICH/TotalView interface definitions */
 
-#include "opal/util/output.h"
-#include "opal/class/opal_list.h"
-#include "mca/base/base.h"
-#include "mca/errmgr/errmgr.h"
-#include "mca/rmgr/rmgr_types.h"
-#include "mca/rmaps/base/rmaps_base_map.h"
-#include "runtime/runtime.h"
-
 /*
  * NOTE: The job description in the registry will likely evolve to use
  * the "jobgrp_t", but this works for now.
@@ -115,7 +114,7 @@ static void dump(void)
 /**
  * Initialization of data structures for running under a debugger
  * using the MPICH/TotalView parallel debugger interface.  Before the
- * spawn we need to check if we have being run under a TotalView-like
+ * spawn we need to check if we are being run under a TotalView-like
  * debugger; if so then inform applications via an MCA parameter.
  */
 void orte_totalview_init_before_spawn(void)
@@ -158,7 +157,7 @@ void orte_totalview_init_after_spawn(orte_jobid_t jobid)
 {
     opal_list_t list_of_resource_maps;
     opal_list_item_t *item;
-    int i;
+    size_t i;
     int rc;
 
     if (MPIR_proctable) {
@@ -238,8 +237,6 @@ void orte_totalview_init_after_spawn(orte_jobid_t jobid)
     }
 
     (void) MPIR_Breakpoint();
-
-    return ORTE_SUCCESS;
 }