osc/rdma: fix datatype extent usage in ompi_osc_rdma_rget_accumulate_internal()

ggouaillardet · ggouaillardet · commit 9be90948e1d2 · 2017-05-24T15:00:18.000+09:00
Refs #3569 Signed-off-by: Gilles Gouaillardet <gilles@rist.or.jp>
diff --git a/ompi/mca/osc/rdma/osc_rdma_accumulate.c b/ompi/mca/osc/rdma/osc_rdma_accumulate.c
@@ -1027,13 +1027,15 @@ int ompi_osc_rdma_rget_accumulate_internal (ompi_osc_rdma_sync_t *sync, const vo
         return OMPI_SUCCESS;
     }
 
-    (void) ompi_datatype_get_extent (origin_datatype, &lb, &extent);
+    (void) ompi_datatype_get_extent (target_datatype, &lb, &extent);
 
     ret = osc_rdma_get_remote_segment (module, peer, target_disp, extent * target_count, &target_address, &target_handle);
     if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {
         return ret;
     }
 
+    (void) ompi_datatype_get_extent (origin_datatype, &lb, &extent);
+
     if (module->acc_single_intrinsic && extent <= 8) {
         if (module->acc_use_amo && ompi_datatype_is_predefined (origin_datatype)) {
             if (NULL == result_addr) {

Original file line number	Diff line number	Diff line change
`@@ -1027,13 +1027,15 @@ int ompi_osc_rdma_rget_accumulate_internal (ompi_osc_rdma_sync_t *sync, const vo`
`1027`	`1027`	`return OMPI_SUCCESS;`
`1028`	`1028`	`}`
`1029`	`1029`
`1030`		`- (void) ompi_datatype_get_extent (origin_datatype, &lb, &extent);`
	`1030`	`+ (void) ompi_datatype_get_extent (target_datatype, &lb, &extent);`
`1031`	`1031`
`1032`	`1032`	`ret = osc_rdma_get_remote_segment (module, peer, target_disp, extent * target_count, &target_address, &target_handle);`
`1033`	`1033`	`if (OPAL_UNLIKELY(OMPI_SUCCESS != ret)) {`
`1034`	`1034`	`return ret;`
`1035`	`1035`	`}`
`1036`	`1036`
	`1037`	`+ (void) ompi_datatype_get_extent (origin_datatype, &lb, &extent);`
	`1038`	`+`
`1037`	`1039`	`if (module->acc_single_intrinsic && extent <= 8) {`
`1038`	`1040`	`if (module->acc_use_amo && ompi_datatype_is_predefined (origin_datatype)) {`
`1039`	`1041`	`if (NULL == result_addr) {`