Merge pull request #2353 from karasevb/v2.x_fix_spml_yoda

hppritcha · web-flow · commit 5215b60a4b82 · 2016-11-03T07:52:33.000-06:00
oshmem/spml/yoda: fixed the btl operations
diff --git a/oshmem/mca/spml/yoda/spml_yoda.c b/oshmem/mca/spml/yoda/spml_yoda.c
@@ -119,7 +119,7 @@ static inline void calc_nfrags_put (mca_bml_base_btl_t* bml_btl,
         *frag_size = bml_btl->btl->btl_max_send_size - SPML_YODA_SEND_CONTEXT_SIZE;
     }
     else {
-        *frag_size = bml_btl->btl->btl_put_limit;
+        *frag_size = bml_btl->btl->btl_max_send_size;
     }
     *nfrags = 1 + (size - 1) / (*frag_size);
 }
@@ -134,7 +134,7 @@ static inline void calc_nfrags_get (mca_bml_base_btl_t* bml_btl,
         *frag_size = bml_btl->btl->btl_max_send_size - SPML_YODA_SEND_CONTEXT_SIZE;
     }
     else {
-        *frag_size = bml_btl->btl->btl_get_limit;
+        *frag_size = bml_btl->btl->btl_max_send_size;
     }
     *nfrags = 1 + (size - 1) / (*frag_size);
 }

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ static inline void calc_nfrags_put (mca_bml_base_btl_t* bml_btl,`
`119`	`119`	`*frag_size = bml_btl->btl->btl_max_send_size - SPML_YODA_SEND_CONTEXT_SIZE;`
`120`	`120`	`}`
`121`	`121`	`else {`
`122`		`- *frag_size = bml_btl->btl->btl_put_limit;`
	`122`	`+ *frag_size = bml_btl->btl->btl_max_send_size;`
`123`	`123`	`}`
`124`	`124`	`nfrags = 1 + (size - 1) / (frag_size);`
`125`	`125`	`}`
`@@ -134,7 +134,7 @@ static inline void calc_nfrags_get (mca_bml_base_btl_t* bml_btl,`
`134`	`134`	`*frag_size = bml_btl->btl->btl_max_send_size - SPML_YODA_SEND_CONTEXT_SIZE;`
`135`	`135`	`}`
`136`	`136`	`else {`
`137`		`- *frag_size = bml_btl->btl->btl_get_limit;`
	`137`	`+ *frag_size = bml_btl->btl->btl_max_send_size;`
`138`	`138`	`}`
`139`	`139`	`nfrags = 1 + (size - 1) / (frag_size);`
`140`	`140`	`}`