Merge pull request #2876 from yosefe/topic/pml-yalla-fix-dt-leak-v2.x

hppritcha · web-flow · commit dc4ec12adce0 · 2017-01-31T15:33:38.000-05:00
yalla: fix memory leak with blocking non-contig send.
diff --git a/ompi/mca/pml/yalla/pml_yalla_request.h b/ompi/mca/pml/yalla/pml_yalla_request.h
@@ -121,7 +121,7 @@ void mca_pml_yalla_init_reqs(void);
 
 #define PML_YALLA_FREE_BLOCKING_MXM_REQ(_req) \
     { \
-        if ((_req)->completed_cb != NULL) { \
+        if ((_req)->data_type == MXM_REQ_DATA_STREAM) { \
             mca_pml_yalla_convertor_free((mca_pml_yalla_convertor_t*)((_req)->context)); \
         } \
     }

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ void mca_pml_yalla_init_reqs(void);`
`121`	`121`
`122`	`122`	`#define PML_YALLA_FREE_BLOCKING_MXM_REQ(_req) \`
`123`	`123`	`{ \`
`124`		`- if ((_req)->completed_cb != NULL) { \`
	`124`	`+ if ((_req)->data_type == MXM_REQ_DATA_STREAM) { \`
`125`	`125`	`mca_pml_yalla_convertor_free((mca_pml_yalla_convertor_t*)((_req)->context)); \`
`126`	`126`	`} \`
`127`	`127`	`}`