Get things to build and run when --disable-orte is specified

This commit was SVN r26263.

ompi/runtime/ompi_mpi_abort.c

@@ -59,6 +59,7 @@ ompi_mpi_abort(struct ompi_communicator_t* comm,
     orte_process_name_t *abort_procs;
     orte_std_cntr_t nabort_procs;
 
+    opal_output(0, "MPI_ABORT");
     /* Protection for recursive invocation */
     if (have_been_invoked) {
         return OMPI_SUCCESS;

orte/mca/grpcomm/portals4_shmem/grpcomm_portals4_shmem_module.c

@@ -76,10 +76,6 @@ orte_grpcomm_base_module_t orte_grpcomm_portals4_shmem_module = {
     purge_proc_attrs
 };
 
-static int nprocs;
-static struct runtime_proc_t *map;
-static int is_logical;
-
 /**
  * Init the module
  */

orte/mca/state/base/state_base_fns.c

@@ -21,6 +21,8 @@
 #include "orte/mca/state/base/base.h"
 #include "orte/mca/state/base/state_private.h"
 
+#if !ORTE_DISABLE_FULL_SUPPORT
+
 void orte_state_base_activate_job_state(orte_job_t *jdata,
                                         orte_job_state_t state)
 {
@@ -192,7 +194,7 @@ void orte_state_base_print_job_state_machine(void)
                     (NULL == st->cbfunc) ? "NULL" : "DEFINED");
     }
 }
-
+#endif
 
 /****    PROC STATE MACHINE    ****/
 void orte_state_base_activate_proc_state(orte_process_name_t *proc,

orte/runtime/orte_globals.c

@@ -49,6 +49,13 @@
 /* need the data type support functions here */
 #include "orte/runtime/data_type_support/orte_dt_support.h"
 
+/* State Machine */
+opal_list_t orte_job_states;
+opal_list_t orte_proc_states;
+
+/* a clean output channel without prefix */
+int orte_clean_output = -1;
+
 #if !ORTE_DISABLE_FULL_SUPPORT
 
 /* globals used by RTE */
@@ -118,9 +125,6 @@ opal_pointer_array_t *orte_node_pool;
 opal_pointer_array_t *orte_node_topologies;
 opal_pointer_array_t *orte_local_children;
 
-/* a clean output channel without prefix */
-int orte_clean_output = -1;
-
 /* Nidmap and job maps */
 opal_pointer_array_t orte_nidmap;
 opal_pointer_array_t orte_jobmap;
@@ -170,10 +174,6 @@ bool orte_report_child_jobs_separately;
 struct timeval orte_child_time_to_exit;
 bool orte_abort_non_zero_exit;
 
-/* State Machine */
-opal_list_t orte_job_states;
-opal_list_t orte_proc_states;
-
 /* length of stat history to keep */
 int orte_stat_history_size;
 

orte/runtime/orte_globals.h

@@ -91,6 +91,25 @@ typedef void (*orte_err_cb_fn_t)(orte_process_name_t *proc, orte_proc_state_t st
 
 ORTE_DECLSPEC extern int orte_exit_status;
 
+/* ORTE event priorities - we define these
+ * at levels that permit higher layers such as
+ * OMPI to handle their events at higher priority,
+ * with the exception of errors. Errors generally
+ * require exception handling (e.g., ctrl-c termination)
+ * that overrides the need to process MPI messages
+ */
+#define ORTE_ERROR_PRI  OPAL_EV_ERROR_PRI
+#define ORTE_MSG_PRI    OPAL_EV_MSG_LO_PRI
+#define ORTE_SYS_PRI    OPAL_EV_SYS_LO_PRI
+#define ORTE_INFO_PRI   OPAL_EV_INFO_LO_PRI
+
+/* State Machine lists */
+ORTE_DECLSPEC extern opal_list_t orte_job_states;
+ORTE_DECLSPEC extern opal_list_t orte_proc_states;
+
+/* a clean output channel without prefix */
+ORTE_DECLSPEC extern int orte_clean_output;
+
 #if ORTE_DISABLE_FULL_SUPPORT
 
 /* These types are used in interface functions that should never be
@@ -113,19 +132,6 @@ typedef struct orte_app_context_t orte_app_context_t;
 ORTE_DECLSPEC extern opal_thread_t orte_progress_thread;
 #endif
 
-/* ORTE event priorities - we define these
- * at levels that permit higher layers such as
- * OMPI to handle their events at higher priority,
- * with the exception of errors. Errors generally
- * require exception handling (e.g., ctrl-c termination)
- * that overrides the need to process MPI messages
- */
-#define ORTE_ERROR_PRI  OPAL_EV_ERROR_PRI
-#define ORTE_MSG_PRI    OPAL_EV_MSG_LO_PRI
-#define ORTE_SYS_PRI    OPAL_EV_SYS_LO_PRI
-#define ORTE_INFO_PRI   OPAL_EV_INFO_LO_PRI
-
-
 #define ORTE_GLOBAL_ARRAY_BLOCK_SIZE    64
 #define ORTE_GLOBAL_ARRAY_MAX_SIZE      INT_MAX
 
@@ -626,9 +632,6 @@ ORTE_DECLSPEC extern opal_pointer_array_t *orte_node_pool;
 ORTE_DECLSPEC extern opal_pointer_array_t *orte_node_topologies;
 ORTE_DECLSPEC extern opal_pointer_array_t *orte_local_children;
 
-/* a clean output channel without prefix */
-ORTE_DECLSPEC extern int orte_clean_output;
-
 /* Nidmap and job maps */
 ORTE_DECLSPEC extern opal_pointer_array_t orte_nidmap;
 ORTE_DECLSPEC extern opal_pointer_array_t orte_jobmap;
@@ -679,10 +682,6 @@ ORTE_DECLSPEC extern bool orte_report_child_jobs_separately;
 ORTE_DECLSPEC extern struct timeval orte_child_time_to_exit;
 ORTE_DECLSPEC extern bool orte_abort_non_zero_exit;
 
-/* State Machine lists */
-ORTE_DECLSPEC extern opal_list_t orte_job_states;
-ORTE_DECLSPEC extern opal_list_t orte_proc_states;
-
 /* length of stat history to keep */
 ORTE_DECLSPEC extern int orte_stat_history_size;
 

orte/runtime/orte_quit.c

@@ -72,7 +72,6 @@ static int num_failed_start = 0;
 static bool errors_reported = false;
 
 static void dump_aborted_procs(void);
-#endif
 
 void orte_quit(int fd, short args, void *cbdata)
 {
@@ -140,9 +139,6 @@ void orte_quit(int fd, short args, void *cbdata)
     orte_event_base_active = false;
 }
 
-
-
-#if !ORTE_DISABLE_FULL_SUPPORT
 /*
  * On abnormal termination - dump the
  * exit status of the aborted procs.

orte/util/show_help.c

@@ -96,7 +96,7 @@ int orte_show_help(const char *filename, const char *topic,
         return ORTE_SUCCESS;
     }
     
-    opal_output(0, output);
+    opal_output(0, "%s", output);
     return ORTE_SUCCESS;
 }