Skip to content

Commit bd5cd62

Browse files
committed
btl/ugni: fix up some warnings
Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
1 parent d8916a4 commit bd5cd62

File tree

5 files changed

+4
-7
lines changed

5 files changed

+4
-7
lines changed

opal/mca/btl/ugni/btl_ugni.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ static inline uint32_t mca_btl_ugni_ep_get_device_index (mca_btl_ugni_module_t *
306306
static volatile uint32_t device_index = (uint32_t) 0;
307307

308308
/* don't really care if the device index is atomically updated */
309-
return opal_atomic_fetch_add_32 (&device_index, 1) % mca_btl_ugni_component.virtual_device_count;
309+
return opal_atomic_fetch_add_32 ((volatile int32_t *) &device_index, 1) % mca_btl_ugni_component.virtual_device_count;
310310
}
311311

312312
/**

opal/mca/btl/ugni/btl_ugni_device.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,6 @@ mca_btl_ugni_get_rdma_desc_device (mca_btl_ugni_device_t *device, struct mca_btl
243243
{
244244
mca_btl_ugni_post_descriptor_t *desc = args->desc;
245245
mca_btl_ugni_rdma_desc_t *rdma_desc;
246-
int count;
247246

248247
args->device = device;
249248
args->count = 0;

opal/mca/btl/ugni/btl_ugni_frag.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,6 @@ mca_btl_ugni_alloc_rdma_desc (mca_btl_ugni_device_t *device, mca_btl_ugni_post_d
174174

175175
static inline void mca_btl_ugni_return_rdma_desc (mca_btl_ugni_rdma_desc_t *desc)
176176
{
177-
mca_btl_ugni_module_t *ugni_module = mca_btl_ugni_ep_btl (desc->btl_ugni_desc.endpoint);
178-
179177
(void) GNI_EpUnbind (desc->gni_handle);
180178
opal_free_list_return_st (&desc->device->rdma_descs, &desc->super);
181179
}

opal/mca/btl/ugni/btl_ugni_module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ int mca_btl_ugni_device_handle_event_error (mca_btl_ugni_rdma_desc_t *rdma_desc,
353353
char char_buffer[1024];
354354
GNI_CqErrorStr (event_data, char_buffer, sizeof (char_buffer));
355355

356-
BTL_ERROR(("giving up on desciptor %p, recoverable %d: %s", rdma_desc, recoverable, char_buffer));
356+
BTL_ERROR(("giving up on desciptor %p, recoverable %d: %s", (void *) rdma_desc, recoverable, char_buffer));
357357

358358
return OPAL_ERROR;
359359
}

opal/mca/btl/ugni/btl_ugni_rdma.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ static inline int mca_btl_ugni_post (mca_btl_base_endpoint_t *endpoint, int get,
134134
{
135135
const gni_post_type_t fma_ops[2] = {GNI_POST_FMA_PUT, GNI_POST_FMA_GET};
136136
const gni_post_type_t rdma_ops[2] = {GNI_POST_RDMA_PUT, GNI_POST_RDMA_GET};
137-
const long int fma_limit = get ? mca_btl_ugni_component.ugni_fma_get_limit :
138-
mca_btl_ugni_component.ugni_fma_put_limit;
137+
const size_t fma_limit = (size_t) (get ? mca_btl_ugni_component.ugni_fma_get_limit :
138+
mca_btl_ugni_component.ugni_fma_put_limit);
139139

140140
if (size <= fma_limit) {
141141
return mca_btl_ugni_post_fma (endpoint, fma_ops[get], size, local_address, remote_address,

0 commit comments

Comments
 (0)