Merge pull request #1104 from hjelmn/v2.x_threads

v2.x thread updates for one-sided

Author: hppritcha

ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c

@@ -1622,8 +1622,6 @@ static int ompi_osc_pt2pt_callback (ompi_request_t *request)
     size_t incoming_length = request->req_status._ucount;
     int source = request->req_status.MPI_SOURCE;
 
-    OPAL_THREAD_UNLOCK(&ompi_request_lock);
-
     assert(incoming_length >= sizeof(ompi_osc_pt2pt_header_base_t));
 
     OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
@@ -1666,8 +1664,6 @@ static int ompi_osc_pt2pt_callback (ompi_request_t *request)
     osc_pt2pt_gc_add_request (module, request);
     ompi_osc_pt2pt_frag_start_receive (module);
 
-    OPAL_THREAD_LOCK(&ompi_request_lock);
-
     OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
                          "finished posting receive request"));
 

ompi/mca/pml/ob1/pml_ob1_recvreq.h

@@ -123,8 +123,8 @@ do {                                                                \
  */
 #define MCA_PML_OB1_RECV_REQUEST_MPI_COMPLETE( recvreq )                              \
     do {                                                                              \
-       PERUSE_TRACE_COMM_EVENT( PERUSE_COMM_REQ_COMPLETE,                             \
-                                &(recvreq->req_recv.req_base), PERUSE_RECV );         \
+        PERUSE_TRACE_COMM_EVENT( PERUSE_COMM_REQ_COMPLETE,                            \
+                                 &(recvreq->req_recv.req_base), PERUSE_RECV );        \
         ompi_request_complete( &(recvreq->req_recv.req_base.req_ompi), true );        \
     } while (0)
 

ompi/mca/pml/ob1/pml_ob1_sendreq.h

@@ -209,10 +209,10 @@ do {
    (sendreq)->req_send.req_base.req_ompi.req_status.MPI_ERROR = OMPI_SUCCESS;        \
    (sendreq)->req_send.req_base.req_ompi.req_status._ucount =                        \
         (sendreq)->req_send.req_bytes_packed;                                        \
-   ompi_request_complete( &((sendreq)->req_send.req_base.req_ompi), (with_signal) ); \
-                                                                                     \
    PERUSE_TRACE_COMM_EVENT( PERUSE_COMM_REQ_COMPLETE,                                \
                             &(sendreq->req_send.req_base), PERUSE_SEND);             \
+                                                                                     \
+   ompi_request_complete( &((sendreq)->req_send.req_base.req_ompi), (with_signal) ); \
 } while(0)
 
 static inline void mca_pml_ob1_send_request_fini (mca_pml_ob1_send_request_t *sendreq)

ompi/request/request.c

@@ -36,7 +36,7 @@ opal_pointer_array_t             ompi_request_f_to_c_table = {{0}};
 size_t                           ompi_request_waiting = 0;
 size_t                           ompi_request_completed = 0;
 size_t                           ompi_request_failed = 0;
-opal_mutex_t                     ompi_request_lock = {{0}};
+opal_recursive_mutex_t           ompi_request_lock = {{0}};
 opal_condition_t                 ompi_request_cond = {{0}};
 ompi_predefined_request_t        ompi_request_null = {{{{{0}}}}};
 ompi_predefined_request_t        *ompi_request_null_addr = &ompi_request_null;
@@ -109,7 +109,7 @@ OBJ_CLASS_INSTANCE(
 
 int ompi_request_init(void)
 {
-    OBJ_CONSTRUCT(&ompi_request_lock, opal_mutex_t);
+    OBJ_CONSTRUCT(&ompi_request_lock, opal_recursive_mutex_t);
     OBJ_CONSTRUCT(&ompi_request_cond, opal_condition_t);
 
     OBJ_CONSTRUCT(&ompi_request_null, ompi_request_t);

ompi/request/request.h

@@ -306,18 +306,18 @@ typedef struct ompi_request_fns_t {
 /**
  * Globals used for tracking requests and request completion.
  */
-OMPI_DECLSPEC extern opal_pointer_array_t  ompi_request_f_to_c_table;
-OMPI_DECLSPEC extern size_t                ompi_request_waiting;
-OMPI_DECLSPEC extern size_t                ompi_request_completed;
-OMPI_DECLSPEC extern size_t                ompi_request_failed;
-OMPI_DECLSPEC extern int32_t               ompi_request_poll;
-OMPI_DECLSPEC extern opal_mutex_t          ompi_request_lock;
-OMPI_DECLSPEC extern opal_condition_t      ompi_request_cond;
+OMPI_DECLSPEC extern opal_pointer_array_t   ompi_request_f_to_c_table;
+OMPI_DECLSPEC extern size_t                 ompi_request_waiting;
+OMPI_DECLSPEC extern size_t                 ompi_request_completed;
+OMPI_DECLSPEC extern size_t                 ompi_request_failed;
+OMPI_DECLSPEC extern int32_t                ompi_request_poll;
+OMPI_DECLSPEC extern opal_recursive_mutex_t ompi_request_lock;
+OMPI_DECLSPEC extern opal_condition_t       ompi_request_cond;
 OMPI_DECLSPEC extern ompi_predefined_request_t        ompi_request_null;
 OMPI_DECLSPEC extern ompi_predefined_request_t        *ompi_request_null_addr;
-OMPI_DECLSPEC extern ompi_request_t        ompi_request_empty;
-OMPI_DECLSPEC extern ompi_status_public_t  ompi_status_empty;
-OMPI_DECLSPEC extern ompi_request_fns_t    ompi_request_functions;
+OMPI_DECLSPEC extern ompi_request_t         ompi_request_empty;
+OMPI_DECLSPEC extern ompi_status_public_t   ompi_status_empty;
+OMPI_DECLSPEC extern ompi_request_fns_t     ompi_request_functions;
 
 /**
  * Initialize the MPI_Request subsystem; invoked during MPI_INIT.