Merge pull request #2005 from hjelmn/ugni_fix

hjelmn · web-flow · commit 6de64ddbc111 · 2016-08-24T11:05:27.000-06:00
btl/ugni: actually make the endpoint lock recursive
diff --git a/opal/mca/btl/ugni/btl_ugni_endpoint.c b/opal/mca/btl/ugni/btl_ugni_endpoint.c
@@ -17,7 +17,7 @@ static void mca_btl_ugni_ep_construct (mca_btl_base_endpoint_t *ep)
 {
     memset ((char *) ep + sizeof(ep->super), 0, sizeof (*ep) - sizeof (ep->super));
     OBJ_CONSTRUCT(&ep->frag_wait_list, opal_list_t);
-    OBJ_CONSTRUCT(&ep->lock, opal_mutex_t);
+    OBJ_CONSTRUCT(&ep->lock, opal_recursive_mutex_t);
 }
 
 static void mca_btl_ugni_ep_destruct (mca_btl_base_endpoint_t *ep)

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ static void mca_btl_ugni_ep_construct (mca_btl_base_endpoint_t *ep)`
`17`	`17`	`{`
`18`	`18`	`memset ((char ) ep + sizeof(ep->super), 0, sizeof (ep) - sizeof (ep->super));`
`19`	`19`	`OBJ_CONSTRUCT(&ep->frag_wait_list, opal_list_t);`
`20`		`- OBJ_CONSTRUCT(&ep->lock, opal_mutex_t);`
	`20`	`+ OBJ_CONSTRUCT(&ep->lock, opal_recursive_mutex_t);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`static void mca_btl_ugni_ep_destruct (mca_btl_base_endpoint_t *ep)`