Merge pull request #2874 from yosefe/topic/pml-yalla-fix-dt-leak

mike-dubman · web-flow · commit 048d47df4857 · 2017-01-29T19:36:37.000+02: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
@@ -122,7 +122,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
`@@ -122,7 +122,7 @@ void mca_pml_yalla_init_reqs(void);`
`122`	`122`
`123`	`123`	`#define PML_YALLA_FREE_BLOCKING_MXM_REQ(_req) \`
`124`	`124`	`{ \`
`125`		`- if ((_req)->completed_cb != NULL) { \`
	`125`	`+ if ((_req)->data_type == MXM_REQ_DATA_STREAM) { \`
`126`	`126`	`mca_pml_yalla_convertor_free((mca_pml_yalla_convertor_t*)((_req)->context)); \`
`127`	`127`	`} \`
`128`	`128`	`}`