Merge pull request #2352 from karasevb/v2.0.x_fix_spml_yoda

hppritcha · web-flow · commit d483029dfc78 · 2016-11-03T07:52:00.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
@@ -118,7 +118,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);
 }
@@ -133,7 +133,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
`@@ -118,7 +118,7 @@ static inline void calc_nfrags_put (mca_bml_base_btl_t* bml_btl,`
`118`	`118`	`*frag_size = bml_btl->btl->btl_max_send_size - SPML_YODA_SEND_CONTEXT_SIZE;`
`119`	`119`	`}`
`120`	`120`	`else {`
`121`		`- *frag_size = bml_btl->btl->btl_put_limit;`
	`121`	`+ *frag_size = bml_btl->btl->btl_max_send_size;`
`122`	`122`	`}`
`123`	`123`	`nfrags = 1 + (size - 1) / (frag_size);`
`124`	`124`	`}`
`@@ -133,7 +133,7 @@ static inline void calc_nfrags_get (mca_bml_base_btl_t* bml_btl,`
`133`	`133`	`*frag_size = bml_btl->btl->btl_max_send_size - SPML_YODA_SEND_CONTEXT_SIZE;`
`134`	`134`	`}`
`135`	`135`	`else {`
`136`		`- *frag_size = bml_btl->btl->btl_get_limit;`
	`136`	`+ *frag_size = bml_btl->btl->btl_max_send_size;`
`137`	`137`	`}`
`138`	`138`	`nfrags = 1 + (size - 1) / (frag_size);`
`139`	`139`	`}`