Make trunk compile on Red Storm again

This commit was SVN r23622.

contrib/platform/redstorm

@@ -6,7 +6,7 @@ enable_pretty_print_stacktrace=no
 enable_dlopen=no
 with_portals_config=redstorm
 with_memory_manager=none
-enable_mca_no_build=btl-sm,coll-hierarch,coll-sm,common-sm,mpool-sm,pml-dr,pml-v
+enable_mca_no_build=paffinity,maffinity,debugger,notifier,btl-sm,coll-hierarch,coll-sm,common-sm,mpool-sm,pml-dr,pml-v
 enable_contrib_no_build=libnbc,vt
 with_rte_support=no
 enable_heterogeneous=no

ompi/mpiext/mpiext.c

@@ -1,5 +1,7 @@
 #include "ompi_config.h"
 
+#include <stdlib.h>
+
 #include "ompi/constants.h"
 #include "ompi/mpiext/mpiext.h"
 #include "ompi/mpiext/static-components.h"

ompi/runtime/ompi_mpi_init.c

@@ -447,6 +447,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
                     error = "opal_paffinity_base_slot_list_set() returned an error";
                     goto error;
                 }
+#if !ORTE_DISABLE_FULL_SUPPORT
                 /* print out a warning if result is no-op, if not suppressed */
                 OPAL_PAFFINITY_PROCESS_IS_BOUND(mask, &proc_bound);
                 if (!proc_bound && orte_odls_base.warn_if_not_bound) {
@@ -457,6 +458,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
                                    orte_process_info.nodename,
                                    "bind-to-slot-list", opal_paffinity_base_slot_list, argv[0]);
                 }
+#endif
                 paffinity_enabled = true;
             } else if (opal_paffinity_alone) {
                 /* no slot_list, but they asked for paffinity */
@@ -479,6 +481,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
                     error = "Setting processor affinity failed";
                     goto error;
                 }
+#if !ORTE_DISABLE_FULL_SUPPORT
                 /* print out a warning if result is no-op, if not suppressed */
                 OPAL_PAFFINITY_PROCESS_IS_BOUND(mask, &proc_bound);
                 if (!proc_bound && orte_odls_base.warn_if_not_bound) {
@@ -489,6 +492,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
                                    orte_process_info.nodename,
                                    "[opal|mpi]_paffinity_alone set non-zero", "n/a", argv[0]);
                 }
+#endif
                 paffinity_enabled = true;
             }
         }

orte/mca/debugger/base/base.h

@@ -27,10 +27,8 @@ BEGIN_C_DECLS
  * function definitions
  */
 ORTE_DECLSPEC int orte_debugger_base_open(void);
-
-#if !ORTE_DISABLE_FULL_SUPPORT
-
 ORTE_DECLSPEC int orte_debugger_base_close(void);
+
 ORTE_DECLSPEC int orte_debugger_base_select(void);
 ORTE_DECLSPEC void orte_debugger_base_run_debugger(char *basename, opal_cmd_line_t *cmd_line,
                                                    int argc, char *argv[], int num_procs);
@@ -67,7 +65,5 @@ ORTE_DECLSPEC void *MPIR_Breakpoint(void);
 
 /* --- end MPICH/TotalView std debugger interface definitions */
 
-#endif /* !ORTE_DISABLE_FULL_SUPPORT */
-
 END_C_DECLS
 #endif

orte/mca/debugger/base/debugger_base_close.c

@@ -18,6 +18,7 @@
 
 int orte_debugger_base_close(void)
 {
+#if !ORTE_DISABLE_FULL_SUPPORT
     if (NULL != orte_debugger.finalize) {
         orte_debugger.finalize();
     }
@@ -25,6 +26,7 @@ int orte_debugger_base_close(void)
     /* Close all remaining available components */
     mca_base_components_close(orte_debugger_base_output, 
                               &orte_debugger_base_components_available, NULL);
+#endif
     
     /* All done */
     return ORTE_SUCCESS;

orte/mca/debugger/base/debugger_base_fns.c

@@ -43,6 +43,8 @@
 
 #define DUMP_INT(X) fprintf(stderr, "  %s = %d\n", # X, X);
 
+#if !ORTE_DISABLE_FULL_SUPPORT
+
 void orte_debugger_base_dump(void)
 {
     int i;
@@ -172,6 +174,8 @@ void orte_debugger_base_init_after_spawn(orte_job_t *jdata)
     }
 }
 
+#endif
+
 /*
  * Breakpoint function for parallel debuggers
  */

orte/mca/debugger/base/debugger_base_select.c

@@ -23,6 +23,7 @@
 
 int orte_debugger_base_select(void)
 {
+#if !ORTE_DISABLE_FULL_SUPPORT
     orte_debugger_base_module_t *best_module=NULL;
     orte_debugger_base_component_t *best_component=NULL;
     int ret;
@@ -47,4 +48,7 @@ int orte_debugger_base_select(void)
 
  cleanup:
     return ret;
+#else
+    return ORTE_ERR_NOT_IMPLEMENTED;
+#endif
 }

orte/mca/grpcomm/base/base.h

@@ -65,8 +65,6 @@ typedef struct {
 
 ORTE_DECLSPEC extern orte_grpcomm_base_t orte_grpcomm_base;
 
-#if !ORTE_DISABLE_FULL_SUPPORT
-
 /* structure for tracking collective operations */
 typedef struct {
     opal_object_t super;
@@ -126,7 +124,5 @@ ORTE_DECLSPEC void orte_grpcomm_base_daemon_coll_recv(int status, orte_process_n
 ORTE_DECLSPEC void orte_grpcomm_base_daemon_collective(orte_process_name_t *sender,
                                                        opal_buffer_t *data);
 
-#endif /* ORTE_DISABLE_FULL_SUPPORT */
-
 END_C_DECLS
 #endif

orte/mca/notifier/base/notifier_base_close.c

@@ -28,6 +28,7 @@
 
 int orte_notifier_base_close(void)
 {
+#if !ORTE_DISABLE_FULL_SUPPORT
     opal_list_item_t *item;
     orte_notifier_base_selected_pair_t *pair;
 
@@ -58,6 +59,7 @@ int orte_notifier_base_close(void)
     /* Close all remaining available components */
     mca_base_components_close(orte_notifier_base_output, 
                               &orte_notifier_base_components_available, NULL);
+#endif
     
     /* All done */
     return ORTE_SUCCESS;

orte/mca/notifier/base/notifier_base_open.c

@@ -40,6 +40,8 @@
 
 #include "orte/mca/notifier/base/static-components.h"
 
+#if !ORTE_DISABLE_FULL_SUPPORT
+
 /*
  * Global variables
  */
@@ -58,6 +60,7 @@ orte_notifier_API_module_t orte_notifier = {
     orte_notifier_show_help,
     orte_notifier_log_peer,
 };
+#endif
 
 /**
  * Function for finding and opening either all MCA components, or the one
@@ -65,6 +68,8 @@ orte_notifier_API_module_t orte_notifier = {
  */
 int orte_notifier_base_open(void)
 {
+
+#if !ORTE_DISABLE_FULL_SUPPORT
     char *level;
     
     /* Debugging / verbose output.  Always have stream open, with
@@ -111,6 +116,7 @@ int orte_notifier_base_open(void)
     }
 
     /* All done */
-
+#endif
+    
     return ORTE_SUCCESS;
 }

orte/mca/notifier/base/notifier_base_select.c

@@ -32,6 +32,8 @@
 
 #include "orte/mca/notifier/base/base.h"
 
+#if !ORTE_DISABLE_FULL_SUPPORT
+
 /* Global variables */
 /*
  * orte_notifier_base_XXX_selected is set to true if at least 1 module has
@@ -393,3 +395,5 @@ static bool orte_notifier_add_module(mca_base_component_t *component,
 
     return true;
 }
+
+#endif

orte/mca/notifier/base/notifier_base_wrappers.c

@@ -29,6 +29,7 @@
 #include "orte/runtime/orte_globals.h"
 #include "orte/mca/notifier/base/base.h"
 
+#if !ORTE_DISABLE_FULL_SUPPORT
 
 void orte_notifier_log(orte_notifier_base_severity_t severity, 
                        int errcode, const char *msg, ...)
@@ -188,3 +189,5 @@ char *orte_notifier_base_peer_log(int errcode, orte_process_name_t *peer_proc,
     buf[ORTE_NOTIFIER_MAX_BUF] = '\0';
     return buf;
 }
+
+#endif

orte/mca/sensor/base/sensor_base_open.c

@@ -33,6 +33,8 @@
 
 #include "orte/mca/sensor/base/static-components.h"
 
+#if !ORTE_DISABLE_FULL_SUPPORT
+
 /* base functions */
 static void start(orte_jobid_t jobid);
 static void stop(orte_jobid_t jobid);
@@ -47,12 +49,15 @@ orte_sensor_base_API_module_t orte_sensor = {
 };
 opal_list_t mca_sensor_base_components_available;
 
+#endif
+
 /**
  * Function for finding and opening either all MCA components, or the one
  * that was specifically requested via a MCA parameter.
  */
 int orte_sensor_base_open(void)
 {
+#if !ORTE_DISABLE_FULL_SUPPORT
     /* Debugging / verbose output.  Always have stream open, with
        verbose set by the mca open system... */
     orte_sensor_base.output = opal_output_open(NULL);
@@ -69,12 +74,15 @@ int orte_sensor_base_open(void)
                                  &mca_sensor_base_components_available, true)) {
         return ORTE_ERROR;
     }
+#endif
 
     /* All done */
 
     return ORTE_SUCCESS;
 }
 
+#if !ORTE_DISABLE_FULL_SUPPORT
+
 static void start(orte_jobid_t jobid)
 {
     orte_sensor_base_module_t *i_module;
@@ -106,3 +114,5 @@ static void stop(orte_jobid_t jobid)
     }
     return;
 }
+
+#endif

orte/runtime/orte_globals.h

@@ -80,6 +80,8 @@ typedef void (*orte_err_cb_fn_t)(orte_process_name_t *proc, orte_proc_state_t st
 
 typedef uint16_t orte_mapping_policy_t;
 
+ORTE_DECLSPEC extern int orte_exit_status;
+
 #if ORTE_DISABLE_FULL_SUPPORT
 
 /* These types are used in interface functions that should never be
@@ -87,7 +89,14 @@ typedef uint16_t orte_mapping_policy_t;
    declared for various reasons.  So have a dummy type to keep things
    simple (and throw an error if someone does try to use them) */
 struct orte_job_t;
+struct orte_proc_t;
+struct orte_node_t;
+struct orte_app_context_t;
+
 typedef struct orte_job_t orte_job_t;
+typedef struct orte_proc_t orte_proc_t;
+typedef struct orte_node_t orte_node_t;
+typedef struct orte_app_context_t orte_app_context_t;
 
 #else
 
@@ -609,7 +618,6 @@ ORTE_DECLSPEC extern char *orte_debugger_test_daemon;
 ORTE_DECLSPEC extern bool orte_debugger_test_attach;
 
 /* exit flags */
-ORTE_DECLSPEC extern int orte_exit_status;
 ORTE_DECLSPEC extern bool orte_abnormal_term_ordered;
 ORTE_DECLSPEC extern bool orte_routing_is_enabled;
 ORTE_DECLSPEC extern bool orte_job_term_ordered;

orte/runtime/orte_quit.c

@@ -73,6 +73,7 @@ static void dump_aborted_procs(void);
 
 void orte_jobs_complete(void)
 {
+#if !ORTE_DISABLE_FULL_SUPPORT
     /* check one-time lock to protect against multiple calls */
     if (!opal_atomic_trylock(&orte_jobs_complete_lock)) { /* returns 1 if already locked */
         return;
@@ -132,6 +133,7 @@ void orte_jobs_complete(void)
     if (0 < orte_routed.num_routes()) {
         orte_plm.terminate_orteds();
     }
+#endif
 }
 
 void orte_quit(void)
@@ -149,11 +151,13 @@ void orte_quit(void)
     
     /* cleanup and leave */
     orte_finalize();
-    
-    if (NULL != orte_basename) {
+
+#if !ORTE_DISABLE_FULL_SUPPORT
+        if (NULL != orte_basename) {
         free(orte_basename);
     }
-
+#endif
+        
     if (orte_debug_flag) {
         fprintf(stderr, "orterun: exiting with status %d\n", orte_exit_status);
     }
@@ -161,6 +165,8 @@ void orte_quit(void)
 }
 
 
+
+#if !ORTE_DISABLE_FULL_SUPPORT
 /*
  * On abnormal termination - dump the
  * exit status of the aborted procs.
@@ -399,3 +405,4 @@ static void dump_aborted_procs(void)
         }
     }
 }
+#endif