Fix MPIR regression with extern MPIR_proctable.

awlauria · Mar 8, 2021 · 6911750 · 6911750
1 parent bea360b
commit 6911750
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/orte/orted/orted-mpir/orted_mpir.h b/orte/orted/orted-mpir/orted_mpir.h
@@ -18,7 +18,12 @@ BEGIN_C_DECLS
 #define MPIR_MAX_PATH_LENGTH 512
 #define MPIR_MAX_ARG_LENGTH 1024
 
-extern struct MPIR_PROCDESC *MPIR_proctable;
+struct MPIR_PROCDESC {
+    char *host_name;        /* something that can be passed to inet_addr */
+    char *executable_name;  /* name of binary */
+    int pid;                /* process pid */
+};
+
 extern int MPIR_proctable_size;
 extern volatile int MPIR_being_debugged;
 extern volatile int MPIR_debug_state;

diff --git a/orte/orted/orted_submit.c b/orte/orted/orted_submit.c
@@ -123,6 +123,8 @@ static opal_pointer_array_t tool_jobs;
 static int timeout_seconds;
 static orte_timer_t *orte_memprofile_timeout;
 
+
+extern struct MPIR_PROCDESC *MPIR_proctable;
 int orte_debugger_attach_fd = -1;
 bool orte_debugger_fifo_active=false;
 opal_event_t *orte_debugger_attach=NULL;
@@ -2220,13 +2222,6 @@ static void complete_recv(int status, orte_process_name_t* sender,
 #define DUMP_INT(X) fprintf(stderr, "  %s = %d\n", # X, X);
 #define FILE_MODE (S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)
 
-struct MPIR_PROCDESC {
-    char *host_name;        /* something that can be passed to inet_addr */
-    char *executable_name;  /* name of binary */
-    int pid;                /* process pid */
-};
-
-
 /**
  * Initialization of data structures for running under a debugger
  * using the MPICH/TotalView parallel debugger interface.  Before the