Merge pull request open-mpi#943 from jsquyres/pr/v2.x/usnic-num-blocks-calc-fix

hppritcha · hppritcha · commit 52e424c7a437 · 2016-02-03T09:56:42.000-07:00
v2.0.0: usnic: fix calculation for number of blocks
diff --git a/opal/mca/btl/usnic/btl_usnic_module.c b/opal/mca/btl/usnic/btl_usnic_module.c
@@ -412,7 +412,7 @@ static int add_procs_create_endpoints(struct opal_btl_usnic_module_t* module,
     size_t block_len = eq_size;
     size_t num_av_inserts = nprocs * USNIC_NUM_CHANNELS;
     size_t num_blocks = num_av_inserts / block_len;
-    if (eq_size % num_av_inserts != 0) {
+    if (num_av_inserts % block_len != 0) {
         ++num_blocks;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -412,7 +412,7 @@ static int add_procs_create_endpoints(struct opal_btl_usnic_module_t* module,`
`412`	`412`	`size_t block_len = eq_size;`
`413`	`413`	`size_t num_av_inserts = nprocs * USNIC_NUM_CHANNELS;`
`414`	`414`	`size_t num_blocks = num_av_inserts / block_len;`
`415`		`- if (eq_size % num_av_inserts != 0) {`
	`415`	`+ if (num_av_inserts % block_len != 0) {`
`416`	`416`	`++num_blocks;`
`417`	`417`	`}`
`418`	`418`