Correct the location of the counter when tracking process launch for reporting progress

cmr=v1.7.4:reviewer=hjelmn

This commit was SVN r30415.

orte/mca/plm/base/plm_base_launch_support.c

@@ -518,7 +518,7 @@ void orte_plm_base_launch_apps(int fd, short args, void *cbdata)
     }
 
     /* track that we automatically are considered to have reported - used
-     * only to report out launch progress
+     * only to report launch progress
      */
     caddy->jdata->num_daemons_reported++;
 

orte/mca/plm/base/plm_base_receive.c

@@ -310,15 +310,14 @@ void orte_plm_base_recv(int status, orte_process_name_t* sender,
                     proc->pid = pid;
                     proc->exit_code = exit_code;
                     ORTE_ACTIVATE_PROC_STATE(&name, state);
-                    if (running) {
-                        jdata->num_daemons_reported++;
-                        if (orte_report_launch_progress) {
-                            if (0 == jdata->num_daemons_reported % 100 ||
-                                jdata->num_daemons_reported == orte_process_info.num_procs) {
-                                ORTE_ACTIVATE_JOB_STATE(jdata, ORTE_JOB_STATE_REPORT_PROGRESS);
-                            }
-                        }
-                    }
+                }
+            }
+            /* record that we heard back from a daemon during app launch */
+            if (running && NULL != jdata) {
+                jdata->num_daemons_reported++;
+                if (0 == jdata->num_daemons_reported % 100 ||
+                    jdata->num_daemons_reported == orte_process_info.num_procs) {
+                    ORTE_ACTIVATE_JOB_STATE(jdata, ORTE_JOB_STATE_REPORT_PROGRESS);
                 }
             }
             /* prepare for next job */