Skip to content

Commit 56b36ee

Browse files
PDevezePDeveze
committed
osc/portals4: Format of "target_disp" is OPAL_PTRDIFF_TYPE and %lu is the appropriate format to display it.
1 parent a76566c commit 56b36ee

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎ompi/mca/osc/portals4/osc_portals4.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ int ompi_osc_portals4_get_accumulate(const void *origin_addr,
177177
int result_count,
178178
struct ompi_datatype_t *result_datatype,
179179
int target_rank,
180-
MPI_Aint target_disp,
180+
OPAL_PTRDIFF_TYPE target_disp,
181181
int target_count,
182182
struct ompi_datatype_t *target_datatype,
183183
struct ompi_op_t *op,
@@ -221,7 +221,7 @@ int ompi_osc_portals4_rget_accumulate(const void *origin_addr,
221221
int result_count,
222222
struct ompi_datatype_t *result_datatype,
223223
int target_rank,
224-
MPI_Aint target_disp,
224+
OPAL_PTRDIFF_TYPE target_disp,
225225
int target_count,
226226
struct ompi_datatype_t *target_datatype,
227227
struct ompi_op_t *op,

‎ompi/mca/osc/portals4/osc_portals4_comm.c‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ ompi_osc_portals4_rput(const void *origin_addr,
199199
size_t offset;
200200

201201
OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
202-
"rput: 0x%lx, %d, %s, %d, %d, %d, %s, 0x%lx",
202+
"rput: 0x%lx, %d, %s, %d, %lu, %d, %s, 0x%lx",
203203
(unsigned long) origin_addr, origin_count,
204-
origin_dt->name, target, (int) target_disp,
204+
origin_dt->name, target, (unsigned long) target_disp,
205205
target_count, target_dt->name,
206206
(unsigned long) win));
207207

@@ -266,9 +266,9 @@ ompi_osc_portals4_rget(void *origin_addr,
266266
size_t offset;
267267

268268
OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
269-
"rget: 0x%lx, %d, %s, %d, %d, %d, %s, 0x%lx",
269+
"rget: 0x%lx, %d, %s, %d, %lu, %d, %s, 0x%lx",
270270
(unsigned long) origin_addr, origin_count,
271-
origin_dt->name, target, (int) target_disp,
271+
origin_dt->name, target, (unsigned long) target_disp,
272272
target_count, target_dt->name,
273273
(unsigned long) win));
274274

@@ -334,9 +334,9 @@ ompi_osc_portals4_raccumulate(const void *origin_addr,
334334
ptl_datatype_t ptl_dt;
335335

336336
OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
337-
"raccumulate: 0x%lx, %d, %s, %d, %d, %d, %s, %s 0x%lx",
337+
"raccumulate: 0x%lx, %d, %s, %d, %lu, %d, %s, %s 0x%lx",
338338
(unsigned long) origin_addr, origin_count,
339-
origin_dt->name, target, (int) target_disp,
339+
origin_dt->name, target, (unsigned long) target_disp,
340340
target_count, target_dt->name,
341341
op->o_name,
342342
(unsigned long) win));
@@ -422,7 +422,7 @@ ompi_osc_portals4_rget_accumulate(const void *origin_addr,
422422
int result_count,
423423
struct ompi_datatype_t *result_dt,
424424
int target,
425-
MPI_Aint target_disp,
425+
OPAL_PTRDIFF_TYPE target_disp,
426426
int target_count,
427427
struct ompi_datatype_t *target_dt,
428428
struct ompi_op_t *op,
@@ -440,11 +440,11 @@ ompi_osc_portals4_rget_accumulate(const void *origin_addr,
440440
ptl_datatype_t ptl_dt;
441441

442442
OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
443-
"rget_accumulate: 0x%lx, %d, %s, 0x%lx, %d, %s, %d, %d, %d, %s, %s, 0x%lx",
443+
"rget_accumulate: 0x%lx, %d, %s, 0x%lx, %d, %s, %d, %lu, %d, %s, %s, 0x%lx",
444444
(unsigned long) origin_addr, origin_count,
445445
origin_dt->name, (unsigned long) result_addr,
446446
result_count, result_dt->name,
447-
target, (int) target_disp,
447+
target, (unsigned long) target_disp,
448448
target_count, target_dt->name,
449449
op->o_name,
450450
(unsigned long) win));
@@ -602,9 +602,9 @@ ompi_osc_portals4_put(const void *origin_addr,
602602
size_t offset;
603603

604604
OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
605-
"put: 0x%lx, %d, %s, %d, %d, %d, %s, 0x%lx",
605+
"put: 0x%lx, %d, %s, %d, %lu, %d, %s, 0x%lx",
606606
(unsigned long) origin_addr, origin_count,
607-
origin_dt->name, target, (int) target_disp,
607+
origin_dt->name, target, (unsigned long) target_disp,
608608
target_count, target_dt->name,
609609
(unsigned long) win));
610610

@@ -659,9 +659,9 @@ ompi_osc_portals4_get(void *origin_addr,
659659
size_t offset;
660660

661661
OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
662-
"get: 0x%lx, %d, %s, %d, %d, %d, %s, 0x%lx",
662+
"get: 0x%lx, %d, %s, %d, %lu, %d, %s, 0x%lx",
663663
(unsigned long) origin_addr, origin_count,
664-
origin_dt->name, target, (int) target_disp,
664+
origin_dt->name, target, (unsigned long) target_disp,
665665
target_count, target_dt->name,
666666
(unsigned long) win));
667667

@@ -717,9 +717,9 @@ ompi_osc_portals4_accumulate(const void *origin_addr,
717717
ptl_datatype_t ptl_dt;
718718

719719
OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
720-
"accumulate: 0x%lx, %d, %s, %d, %d, %d, %s, %s, 0x%lx",
720+
"accumulate: 0x%lx, %d, %s, %d, %lu, %d, %s, %s, 0x%lx",
721721
(unsigned long) origin_addr, origin_count,
722-
origin_dt->name, target, (int) target_disp,
722+
origin_dt->name, target, (unsigned long) target_disp,
723723
target_count, target_dt->name,
724724
op->o_name,
725725
(unsigned long) win));
@@ -797,7 +797,7 @@ ompi_osc_portals4_get_accumulate(const void *origin_addr,
797797
int result_count,
798798
struct ompi_datatype_t *result_dt,
799799
int target,
800-
MPI_Aint target_disp,
800+
OPAL_PTRDIFF_TYPE target_disp,
801801
int target_count,
802802
struct ompi_datatype_t *target_dt,
803803
struct ompi_op_t *op,
@@ -813,11 +813,11 @@ ompi_osc_portals4_get_accumulate(const void *origin_addr,
813813
ptl_datatype_t ptl_dt;
814814

815815
OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
816-
"get_accumulate: 0x%lx, %d, %s, 0x%lx, %d, %s, %d, %d, %d, %s, %s, 0x%lx",
816+
"get_accumulate: 0x%lx, %d, %s, 0x%lx, %d, %s, %d, %lu, %d, %s, %s, 0x%lx",
817817
(unsigned long) origin_addr, origin_count,
818818
origin_dt->name, (unsigned long) result_addr,
819819
result_count, result_dt->name,
820-
target, (int) target_disp,
820+
target, (unsigned long) target_disp,
821821
target_count, target_dt->name,
822822
op->o_name,
823823
(unsigned long) win));
@@ -964,11 +964,11 @@ ompi_osc_portals4_compare_and_swap(const void *origin_addr,
964964
ptl_size_t result_md_offset, origin_md_offset;
965965

966966
OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
967-
"compare_and_swap: 0x%lx, 0x%lx, 0x%lx, %s, %d, %d, 0x%lx",
967+
"compare_and_swap: 0x%lx, 0x%lx, 0x%lx, %s, %d, %lu, 0x%lx",
968968
(unsigned long) origin_addr,
969969
(unsigned long) compare_addr,
970970
(unsigned long) result_addr,
971-
dt->name, target, (int) target_disp,
971+
dt->name, target, (unsigned long) target_disp,
972972
(unsigned long) win));
973973

974974
ret = ompi_osc_portals4_get_dt(dt, &ptl_dt);
@@ -1027,10 +1027,10 @@ ompi_osc_portals4_fetch_and_op(const void *origin_addr,
10271027
ptl_datatype_t ptl_dt;
10281028

10291029
OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_framework.framework_output,
1030-
"fetch_and_op: 0x%lx, 0x%lx, %s, %d, %d, %s, 0x%lx",
1030+
"fetch_and_op: 0x%lx, 0x%lx, %s, %d, %lu, %s, 0x%lx",
10311031
(unsigned long) origin_addr,
10321032
(unsigned long) result_addr,
1033-
dt->name, target, (int) target_disp,
1033+
dt->name, target, (unsigned long) target_disp,
10341034
op->o_name,
10351035
(unsigned long) win));
10361036

0 commit comments

Comments
 (0)