From c77f6c605e1fac45a926ae117cc3a27825e89c04 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Fri, 3 Nov 2006 18:55:05 +0000
Subject: [PATCH] Update timing reports:

1. Remove timing of xcast from mpi_init

2. Add timing report from oob_xcast on how long it took to send the message

This commit was SVN r12428.
---
 ompi/runtime/ompi_mpi_init.c       | 12 ------------
 orte/mca/oob/base/oob_base_xcast.c | 21 +++++++++++++++++++--
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/ompi/runtime/ompi_mpi_init.c b/ompi/runtime/ompi_mpi_init.c
index 570c9e91c2..6654297f12 100644
--- a/ompi/runtime/ompi_mpi_init.c
+++ b/ompi/runtime/ompi_mpi_init.c
@@ -533,7 +533,6 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
                     (long)ORTE_PROC_MY_NAME->vpid,
                     (long int)((ompistop.tv_sec - ompistart.tv_sec)*1000000 +
                                (ompistop.tv_usec - ompistart.tv_usec)));
-        gettimeofday(&ompistart, NULL);
     }
     
     /* FIRST BARRIER - WAIT FOR MSG FROM RMGR_PROC_STAGE_GATE_MGR TO ARRIVE */
@@ -546,11 +545,6 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
 
     /* check for timing request - get start time */
     if (timing) {
-        gettimeofday(&ompistop, NULL);
-        opal_output(0, "ompi_mpi_init[%ld]: time from execute compound command to receive xcast from STG1 %ld usec",
-                        (long)ORTE_PROC_MY_NAME->vpid,
-                        (long int)((ompistop.tv_sec - ompistart.tv_sec)*1000000 +
-                                   (ompistop.tv_usec - ompistart.tv_usec)));
         gettimeofday(&ompistart, NULL);
     }
 
@@ -653,7 +647,6 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
                         (long)ORTE_PROC_MY_NAME->vpid,
                         (long int)((ompistop.tv_sec - ompistart.tv_sec)*1000000 +
                                    (ompistop.tv_usec - ompistart.tv_usec)));
-        gettimeofday(&ompistart, NULL);
     }
     
     /* Second barrier -- wait for message from
@@ -668,11 +661,6 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
 
     /* check for timing request - get start time */
     if (timing) {
-        gettimeofday(&ompistop, NULL);
-        opal_output(0, "ompi_mpi_init[%ld]: time to receive xcast from STG2 %ld usec",
-                        (long)ORTE_PROC_MY_NAME->vpid,
-                        (long int)((ompistop.tv_sec - ompistart.tv_sec)*1000000 +
-                                   (ompistop.tv_usec - ompistart.tv_usec)));
         gettimeofday(&ompistart, NULL);
     }
     
diff --git a/orte/mca/oob/base/oob_base_xcast.c b/orte/mca/oob/base/oob_base_xcast.c
index 73ee4ebb34..a8475b4988 100644
--- a/orte/mca/oob/base/oob_base_xcast.c
+++ b/orte/mca/oob/base/oob_base_xcast.c
@@ -17,11 +17,16 @@
  */
 
 #include "orte_config.h"
-#include <string.h>
-
 #include "orte/orte_constants.h"
+
+#include <string.h>
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif  /* HAVE_SYS_TIME_H */
+
 #include "opal/threads/condition.h"
 #include "opal/util/output.h"
+
 #include "orte/util/proc_info.h"
 #include "orte/dss/dss.h"
 #include "orte/mca/oob/oob.h"
@@ -94,14 +99,17 @@ int mca_oob_xcast(
     int tag = ORTE_RML_TAG_XCAST;
     int status;
     orte_proc_state_t state;
+    struct timeval sendstart, sendstop;
 
     /* check to see if I am the root process name */
     if(NULL != root && ORTE_EQUAL == orte_dss.compare(root, orte_process_info.my_name, ORTE_NAME)) {
         mca_oob_xcast_t *xcast = OBJ_NEW(mca_oob_xcast_t);
         xcast->counter = num_peers;
+        
         /* check for timing request - if so, we want to printout the size of the message being sent */
         if (orte_oob_base_timing) {
             opal_output(0, "oob_xcast: message size is %lu bytes", (unsigned long)buffer->bytes_used);
+            gettimeofday(&sendstart, NULL);
         }
         
         for(i=0; i<num_peers; i++) {
@@ -124,6 +132,15 @@ int mca_oob_xcast(
         while(xcast->counter > 0) {
             opal_condition_wait(&xcast->cond, &xcast->mutex);
         }
+
+        /* check for timing request - if so, report comm time */
+        if (orte_oob_base_timing) {
+            gettimeofday(&sendstop, NULL);
+            opal_output(0, "oob_xcast: time to send was %ld usec",
+                        (long int)((sendstop.tv_sec - sendstart.tv_sec)*1000000 +
+                                   (sendstop.tv_usec - sendstart.tv_usec)));
+        }
+        
         OPAL_THREAD_UNLOCK(&xcast->mutex);
         OBJ_RELEASE(xcast);