Skip to content

Commit b82b267

Browse files
committed
Fix some gcc warnings in osc_rdma_accumulate.c.
Signed-off-by: Austen Lauria <awlauria@us.ibm.com>
1 parent 418081e commit b82b267

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

ompi/mca/osc/rdma/osc_rdma_accumulate.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@ static int ompi_osc_rdma_fetch_and_op_cas (ompi_osc_rdma_sync_t *sync, const voi
192192
new_value = old_value;
193193

194194
if (&ompi_mpi_op_replace.op == op) {
195-
memcpy ((void *)((intptr_t) &new_value + offset), origin_addr + dt->super.true_lb, extent);
195+
memcpy ((void *)((intptr_t) &new_value + offset), (void *)((intptr_t) origin_addr + dt->super.true_lb), extent);
196196
} else if (&ompi_mpi_op_no_op.op != op) {
197-
ompi_op_reduce (op, (void *) origin_addr + dt->super.true_lb, (void*)((intptr_t) &new_value + offset), 1, dt);
197+
ompi_op_reduce (op, (void *) ((intptr_t) origin_addr + dt->super.true_lb), (void*)((intptr_t) &new_value + offset), 1, dt);
198198
}
199199

200200
ret = ompi_osc_rdma_btl_cswap (module, peer->data_endpoint, address, target_handle,
@@ -219,7 +219,7 @@ static int ompi_osc_rdma_acc_single_atomic (ompi_osc_rdma_sync_t *sync, const vo
219219
{
220220
ompi_osc_rdma_module_t *module = sync->module;
221221
int32_t atomic_flags = module->selected_btl->btl_atomic_flags;
222-
int ret, btl_op, flags;
222+
int btl_op, flags;
223223
int64_t origin;
224224

225225
if (!(module->selected_btl->btl_flags & MCA_BTL_FLAGS_ATOMIC_OPS)) {
@@ -261,7 +261,6 @@ static inline int ompi_osc_rdma_gacc_amo (ompi_osc_rdma_module_t *module, ompi_o
261261
const bool use_amo = module->acc_use_amo;
262262
const size_t dt_size = datatype->super.size;
263263
void *to_free = NULL;
264-
uint64_t offset = 0;
265264
int ret;
266265

267266
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_TRACE, "using network atomics for accumulate operation with count %d", count);
@@ -339,7 +338,7 @@ static inline int ompi_osc_rdma_gacc_contig (ompi_osc_rdma_sync_t *sync, const v
339338
/* if the datatype is small enough (and the count is 1) then try to directly use the hardware to execute
340339
* the atomic operation. this should be safe in all cases as either 1) the user has assured us they will
341340
* never use atomics with count > 1, 2) we have the accumulate lock, or 3) we have an exclusive lock */
342-
if (target_datatype->super.size <= 8 && target_count <= module->network_amo_max_count) {
341+
if ((target_datatype->super.size <= 8) && (((unsigned long) target_count) <= module->network_amo_max_count)) {
343342
ret = ompi_osc_rdma_gacc_amo (module, sync, source, result, result_count, result_datatype, result_convertor,
344343
peer, target_address, target_handle, target_count, target_datatype, op, request);
345344
if (OPAL_LIKELY(OMPI_SUCCESS == ret)) {
@@ -867,7 +866,7 @@ int ompi_osc_rdma_rget_accumulate_internal (ompi_win_t *win, const void *origin_
867866
ompi_osc_rdma_module_t *module = GET_MODULE(win);
868867
mca_btl_base_registration_handle_t *target_handle;
869868
uint64_t target_address;
870-
ptrdiff_t lb, target_lb, target_span;
869+
ptrdiff_t target_lb, target_span;
871870
ompi_osc_rdma_request_t *rdma_request = NULL;
872871
bool lock_acquired = false;
873872
ompi_osc_rdma_sync_t *sync;

ompi/mca/osc/rdma/osc_rdma_dynamic.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ int ompi_osc_rdma_attach (struct ompi_win_t *win, void *base, size_t len)
168168
ompi_osc_rdma_handle_t *rdma_region_handle;
169169
osc_rdma_counter_t region_count;
170170
osc_rdma_counter_t region_id;
171-
intptr_t bound, aligned_base, aligned_bound;
171+
intptr_t aligned_base, aligned_bound;
172172
intptr_t page_size = opal_getpagesize ();
173173
int region_index, ret;
174174
size_t aligned_len;
@@ -197,7 +197,6 @@ int ompi_osc_rdma_attach (struct ompi_win_t *win, void *base, size_t len)
197197

198198
/* it is wasteful to register less than a page. this may allow the remote side to access more
199199
* memory but the MPI standard covers this with calling the calling behavior erroneous */
200-
bound = (intptr_t) base + len;
201200
aligned_bound = OPAL_ALIGN((intptr_t) base + len, page_size, intptr_t);
202201
aligned_base = (intptr_t) base & ~(page_size - 1);
203202
aligned_len = (size_t)(aligned_bound - aligned_base);
@@ -239,7 +238,7 @@ int ompi_osc_rdma_attach (struct ompi_win_t *win, void *base, size_t len)
239238
region->len = aligned_len;
240239

241240
OSC_RDMA_VERBOSE(MCA_BASE_VERBOSE_DEBUG, "attaching dynamic memory region {%p, %p} aligned {%p, %p}, at index %d",
242-
base, (void *) bound, (void *) aligned_base, (void *) aligned_bound, region_index);
241+
base, (void *) ((intptr_t) base + len), (void *) aligned_base, (void *) aligned_bound, region_index);
243242

244243
/* add RDMA region handle to track this region */
245244
rdma_region_handle = OBJ_NEW(ompi_osc_rdma_handle_t);

0 commit comments

Comments
 (0)