Merge pull request #1319 from hjelmn/osc_rdma_fix

hjelmn · hjelmn · commit 70787d1574c0 · 2016-01-22T11:53:06.000-07:00
osc/rdma: use correct endpoint for local state
diff --git a/ompi/mca/osc/rdma/osc_rdma_component.c b/ompi/mca/osc/rdma/osc_rdma_component.c
@@ -627,7 +627,7 @@ static int allocate_state_shared (ompi_osc_rdma_module_t *module, void **base, s
                     peer->state_handle = (mca_btl_base_registration_handle_t *) state_region->btl_handle_data;
                 }
                 peer->state = (osc_rdma_counter_t) ((uintptr_t) state_region->base + state_base + module->state_size * i);
-                peer->state_endpoint = ompi_osc_rdma_peer_btl_endpoint (module, peer_rank);
+                peer->state_endpoint = ompi_osc_rdma_peer_btl_endpoint (module, temp[0].rank);
             }
 
             /* finish setting up the local peer structure */

Original file line number	Diff line number	Diff line change
`@@ -627,7 +627,7 @@ static int allocate_state_shared (ompi_osc_rdma_module_t module, void *base, s`
`627`	`627`	`peer->state_handle = (mca_btl_base_registration_handle_t *) state_region->btl_handle_data;`
`628`	`628`	`}`
`629`	`629`	`peer->state = (osc_rdma_counter_t) ((uintptr_t) state_region->base + state_base + module->state_size * i);`
`630`		`- peer->state_endpoint = ompi_osc_rdma_peer_btl_endpoint (module, peer_rank);`
	`630`	`+ peer->state_endpoint = ompi_osc_rdma_peer_btl_endpoint (module, temp[0].rank);`
`631`	`631`	`}`
`632`	`632`
`633`	`633`	`/* finish setting up the local peer structure */`