- For MPI_Probe/MPI_Iprobe, we should not have a

PERUSE_COMM_REQ_ACTIVATE event.
   Therefore move the PERUSE_TRACE_COMM_EVENT for this event from
   MCA_PML_BASE_SEND_REQUEST_INIT / MCA_PML_BASE_RECV_REQUEST_INIT
   to the proper places into pml_ob1_isend.c / pml_ob1_irecv.c right
   after the MCA_PML_OB1_SEND_REQUEST_INIT /
   MCA_PML_OB1_RECV_REQUEST_INIT.

This commit was SVN r15945.

ompi/mca/pml/base/pml_base_recvreq.h

@@ -81,10 +81,6 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION(mca_pml_base_recv_request_t);
     /* What about req_type ? */                                          \
     (request)->req_base.req_pml_complete = OPAL_INT_TO_BOOL(persistent); \
     (request)->req_base.req_free_called = false;                         \
-                                                                         \
-    PERUSE_TRACE_COMM_EVENT (PERUSE_COMM_REQ_ACTIVATE,                   \
-                             &((request)->req_base),                     \
-                             PERUSE_RECV);                               \
 }
 /**
  *

ompi/mca/pml/base/pml_base_sendreq.h

@@ -107,9 +107,6 @@ OMPI_DECLSPEC OBJ_CLASS_DECLARATION( mca_pml_base_send_request_t );
          ompi_convertor_get_packed_size( &(request)->req_base.req_convertor, \
                                          &((request)->req_bytes_packed) );\
       }                                                                   \
-      PERUSE_TRACE_COMM_EVENT (PERUSE_COMM_REQ_ACTIVATE,                  \
-                               &(request)->req_base,                      \
-                               PERUSE_SEND);                              \
    }
 
 /**

ompi/mca/pml/ob1/pml_ob1_irecv.c

@@ -41,6 +41,10 @@ int mca_pml_ob1_irecv_init(void *addr,
                                    addr,
                                    count, datatype, src, tag, comm, true);
 
+    PERUSE_TRACE_COMM_EVENT (PERUSE_COMM_REQ_ACTIVATE,
+                             &((recvreq)->req_recv.req_base),
+                             PERUSE_RECV);                              
+
     *request = (ompi_request_t *) recvreq;
     return OMPI_SUCCESS;
 }
@@ -64,6 +68,10 @@ int mca_pml_ob1_irecv(void *addr,
                                    addr,
                                    count, datatype, src, tag, comm, false);
 
+    PERUSE_TRACE_COMM_EVENT (PERUSE_COMM_REQ_ACTIVATE,
+                             &((recvreq)->req_recv.req_base),
+                             PERUSE_RECV);
+
     MCA_PML_OB1_RECV_REQUEST_START(recvreq);
     *request = (ompi_request_t *) recvreq;
     return OMPI_SUCCESS;
@@ -88,6 +96,10 @@ int mca_pml_ob1_recv(void *addr,
                                    addr,
                                    count, datatype, src, tag, comm, false);
 
+    PERUSE_TRACE_COMM_EVENT (PERUSE_COMM_REQ_ACTIVATE,
+                             &((recvreq)->req_recv.req_base),
+                             PERUSE_RECV);
+
     MCA_PML_OB1_RECV_REQUEST_START(recvreq);
     if (recvreq->req_recv.req_base.req_ompi.req_complete == false) {
 #if OMPI_ENABLE_PROGRESS_THREADS

ompi/mca/pml/ob1/pml_ob1_isend.c

@@ -48,6 +48,10 @@ int mca_pml_ob1_isend_init(void *buf,
                                   dst, tag,
                                   comm, sendmode, true);
 
+    PERUSE_TRACE_COMM_EVENT (PERUSE_COMM_REQ_ACTIVATE,
+                             &(sendreq)->req_send.req_base,
+                             PERUSE_SEND);
+
     *request = (ompi_request_t *) sendreq;
     return OMPI_SUCCESS;
 }
@@ -75,6 +79,10 @@ int mca_pml_ob1_isend(void *buf,
                                   dst, tag,
                                   comm, sendmode, false);
 
+    PERUSE_TRACE_COMM_EVENT (PERUSE_COMM_REQ_ACTIVATE,
+                             &(sendreq)->req_send.req_base,
+                             PERUSE_SEND);
+
     MCA_PML_OB1_SEND_REQUEST_START(sendreq, rc);
     *request = (ompi_request_t *) sendreq;
     return rc;
@@ -102,6 +110,10 @@ int mca_pml_ob1_send(void *buf,
                                   dst, tag,
                                   comm, sendmode, false);
 
+    PERUSE_TRACE_COMM_EVENT (PERUSE_COMM_REQ_ACTIVATE,
+                             &(sendreq)->req_send.req_base,
+                             PERUSE_SEND);
+    
     MCA_PML_OB1_SEND_REQUEST_START(sendreq, rc);
     if (rc != OMPI_SUCCESS) {
         MCA_PML_OB1_SEND_REQUEST_RETURN( sendreq );