Update some debugger attachment code per LLNL request

This commit was SVN r23965.

orte/mca/debugger/mpirx/mpirx.c

@@ -242,6 +242,7 @@ static void attach_debugger(int fd, short event, void *arg)
                         "%s Attaching debugger %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
                         (NULL == orte_debugger_base.test_daemon) ? MPIR_executable_path : orte_debugger_base.test_daemon);
 
+#if 0
     /* read the file descriptor to clear that event, if necessary */
     if (orte_debugger_mpirx_check_rate <= 0) {
         rc = 0;
@@ -251,13 +252,17 @@ static void attach_debugger(int fd, short event, void *arg)
             goto RELEASE;
         }
     }
+#endif
     if (fifo_active) {
+        opal_event.del(&attach);
         fifo_active = false;
+#if 0
         read(attach_fd, &rc, sizeof(rc));
         if (1 != rc) {
             /* ignore the cmd */
             goto RELEASE;
         }
+#endif
     }
 
     /* a debugger has attached! All the MPIR_Proctable
@@ -323,6 +328,7 @@ static void attach_debugger(int fd, short event, void *arg)
     }
         
  RELEASE:
+#if 0
     /* reset the read or timer event */
     if (0 < orte_debugger_mpirx_check_rate) {
         check = (opal_event_t*)arg;
@@ -333,6 +339,7 @@ static void attach_debugger(int fd, short event, void *arg)
         fifo_active = true;
         opal_event.add(&attach, 0);
     }
+#endif
 
     /* notify the debugger that all is ready */
     MPIR_Breakpoint();

orte/tools/orterun/orterun.c

@@ -558,9 +558,7 @@ int orterun(int argc, char *argv[])
     if (0 == MPIR_forward_comm) {
         rc = ORTE_SUCCESS;
     }
-    if (NULL == MPIR_attach_fifo) {
+    memset(MPIR_attach_fifo, 0, MPIR_MAX_PATH_LENGTH);
-        rc = ORTE_SUCCESS;
-    }
     foo = MPIR_Breakpoint;
 
     /* Check for some "global" command line params */