Put the interface of our MPIR support in sync with the document accepted by the MPI

Forum (http://www.mpi-forum.org/docs/mpir-specification-10-11-2010.pdf).

This commit was SVN r25456.

ompi/debuggers/debuggers.h

@@ -31,20 +31,20 @@
 
 BEGIN_C_DECLS
 
-    /**
-     * Wait for a debugger if asked.
-     */
-    extern void ompi_wait_for_debugger(void);
+/**
+ * Wait for a debugger if asked.
+ */
+extern void ompi_wait_for_debugger(void);
 
-    /**
-     * Notify a debugger that we're about to abort
-     */
-    extern void ompi_debugger_notify_abort(char *string);
+/**
+ * Notify a debugger that we're about to abort
+ */
+extern void ompi_debugger_notify_abort(char *string);
 
-    /**
-     * Breakpoint function for parallel debuggers.
-     */
-    ORTE_DECLSPEC extern void *MPIR_Breakpoint(void);
+/**
+ * Breakpoint function for parallel debuggers.
+ */
+ORTE_DECLSPEC extern void MPIR_Breakpoint(void);
 
 END_C_DECLS
 

orte/mca/debugger/base/base.h

@@ -61,18 +61,18 @@ ORTE_DECLSPEC extern struct MPIR_PROCDESC *MPIR_proctable;
 ORTE_DECLSPEC extern int MPIR_proctable_size;
 ORTE_DECLSPEC extern volatile int MPIR_being_debugged;
 ORTE_DECLSPEC extern volatile int MPIR_debug_state;
-ORTE_DECLSPEC extern volatile int MPIR_i_am_starter;
+ORTE_DECLSPEC extern int MPIR_i_am_starter;
 ORTE_DECLSPEC extern int MPIR_partial_attach_ok;
-ORTE_DECLSPEC extern volatile char MPIR_executable_path[MPIR_MAX_PATH_LENGTH];
-ORTE_DECLSPEC extern volatile char MPIR_server_arguments[MPIR_MAX_ARG_LENGTH];
+ORTE_DECLSPEC extern char MPIR_executable_path[MPIR_MAX_PATH_LENGTH];
+ORTE_DECLSPEC extern char MPIR_server_arguments[MPIR_MAX_ARG_LENGTH];
 ORTE_DECLSPEC extern volatile int MPIR_forward_output;
 ORTE_DECLSPEC extern volatile int MPIR_forward_comm;
 ORTE_DECLSPEC extern char MPIR_attach_fifo[MPIR_MAX_PATH_LENGTH];
 ORTE_DECLSPEC extern int MPIR_force_to_main;
 
-typedef void* (*orte_debugger_breakpoint_fn_t)(void);
+typedef void (*orte_debugger_breakpoint_fn_t)(void);
 
-ORTE_DECLSPEC void* MPIR_Breakpoint(void);
+ORTE_DECLSPEC void MPIR_Breakpoint(void);
 
 /* --- end MPICH/TotalView std debugger interface definitions */
 

orte/mca/debugger/base/debugger_base_fns.c

@@ -168,7 +168,7 @@ void orte_debugger_base_init_after_spawn(orte_job_t *jdata)
          */
         ORTE_PROGRESSED_WAIT(false, jdata->num_reported, jdata->num_procs);
         
-        (void) MPIR_Breakpoint();
+        MPIR_Breakpoint();
         
         /* send a message to rank=0 to release it */
         OBJ_CONSTRUCT(&buf, opal_buffer_t); /* don't need anything in this */
@@ -186,7 +186,7 @@ void orte_debugger_base_init_after_spawn(orte_job_t *jdata)
 /*
  * Breakpoint function for parallel debuggers
  */
-void *MPIR_Breakpoint(void)
+void MPIR_Breakpoint(void)
 {
-    return NULL;
+    return;
 }

orte/mca/debugger/base/debugger_base_open.c

@@ -43,10 +43,10 @@ struct MPIR_PROCDESC *MPIR_proctable = NULL;
 int MPIR_proctable_size = 0;
 volatile int MPIR_being_debugged = 0;
 volatile int MPIR_debug_state = 0;
-volatile int MPIR_i_am_starter = 0;
+int MPIR_i_am_starter = 0;
 int MPIR_partial_attach_ok = 1;
-volatile char MPIR_executable_path[MPIR_MAX_PATH_LENGTH];
-volatile char MPIR_server_arguments[MPIR_MAX_ARG_LENGTH];
+char MPIR_executable_path[MPIR_MAX_PATH_LENGTH];
+char MPIR_server_arguments[MPIR_MAX_ARG_LENGTH];
 volatile int MPIR_forward_output = 0;
 volatile int MPIR_forward_comm = 0;
 char MPIR_attach_fifo[MPIR_MAX_PATH_LENGTH];