Skip to content

btl/ugni: fix up some warnings #5371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 3, 2018
Merged

btl/ugni: fix up some warnings #5371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion opal/mca/btl/ugni/btl_ugni.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ static inline uint32_t mca_btl_ugni_ep_get_device_index (mca_btl_ugni_module_t *
static volatile uint32_t device_index = (uint32_t) 0;

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

/**
Expand Down
1 change: 0 additions & 1 deletion opal/mca/btl/ugni/btl_ugni_device.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ mca_btl_ugni_get_rdma_desc_device (mca_btl_ugni_device_t *device, struct mca_btl
{
mca_btl_ugni_post_descriptor_t *desc = args->desc;
mca_btl_ugni_rdma_desc_t *rdma_desc;
int count;

args->device = device;
args->count = 0;
Expand Down
2 changes: 0 additions & 2 deletions opal/mca/btl/ugni/btl_ugni_frag.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,6 @@ mca_btl_ugni_alloc_rdma_desc (mca_btl_ugni_device_t *device, mca_btl_ugni_post_d

static inline void mca_btl_ugni_return_rdma_desc (mca_btl_ugni_rdma_desc_t *desc)
{
mca_btl_ugni_module_t *ugni_module = mca_btl_ugni_ep_btl (desc->btl_ugni_desc.endpoint);

(void) GNI_EpUnbind (desc->gni_handle);
opal_free_list_return_st (&desc->device->rdma_descs, &desc->super);
}
Expand Down
2 changes: 1 addition & 1 deletion opal/mca/btl/ugni/btl_ugni_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ int mca_btl_ugni_device_handle_event_error (mca_btl_ugni_rdma_desc_t *rdma_desc,
char char_buffer[1024];
GNI_CqErrorStr (event_data, char_buffer, sizeof (char_buffer));

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

return OPAL_ERROR;
}
Expand Down
4 changes: 2 additions & 2 deletions opal/mca/btl/ugni/btl_ugni_rdma.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ static inline int mca_btl_ugni_post (mca_btl_base_endpoint_t *endpoint, int get,
{
const gni_post_type_t fma_ops[2] = {GNI_POST_FMA_PUT, GNI_POST_FMA_GET};
const gni_post_type_t rdma_ops[2] = {GNI_POST_RDMA_PUT, GNI_POST_RDMA_GET};
const long int fma_limit = get ? mca_btl_ugni_component.ugni_fma_get_limit :
mca_btl_ugni_component.ugni_fma_put_limit;
const size_t fma_limit = (size_t) (get ? mca_btl_ugni_component.ugni_fma_get_limit :
mca_btl_ugni_component.ugni_fma_put_limit);

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