diff --git a/ompi/mca/coll/han/coll_han_module.c b/ompi/mca/coll/han/coll_han_module.c index 99b02e1869ccec4f3a7a9dcb25fe9244d14a0a83..bcb1de75cfdf42275b961f2278fc0cab57e53920 100644 --- a/ompi/mca/coll/han/coll_han_module.c +++ b/ompi/mca/coll/han/coll_han_module.c @@ -3,6 +3,7 @@ * of Tennessee Research Foundation. All rights * reserved. * Copyright (c) 2020 Bull S.A.S. All rights reserved. + * Copyright (c) 2021 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -222,8 +223,6 @@ mca_coll_han_comm_query(struct ompi_communicator_t * comm, int *priority) han_module->topologic_level = GLOBAL_COMMUNICATOR; if (NULL != comm->super.s_info) { - char info_val[OPAL_MAX_INFO_VAL+1]; - /* Get the info value disaqualifying coll components */ opal_cstring_t *info_str; opal_info_get(comm->super.s_info, "ompi_comm_coll_han_topo_level", diff --git a/ompi/mca/part/persist/part_persist.h b/ompi/mca/part/persist/part_persist.h index bc41c81173de12242f80bdc5985201771f4f49fc..febc138537617ade27507a7eee3a9d9e013c5d54 100644 --- a/ompi/mca/part/persist/part_persist.h +++ b/ompi/mca/part/persist/part_persist.h @@ -12,6 +12,7 @@ * Copyright (c) 2019-2021 Sandia National Laboratories. All rights reserved. * Copyright (c) 2021 University of Alabama at Birmingham. All rights reserved. * Copyright (c) 2021 Tennessee Technological University. All rights reserved. + * Copyright (c) 2021 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -313,8 +314,10 @@ mca_part_persist_progress(void) OPAL_THREAD_UNLOCK(&ompi_part_persist.lock); block_entry = opal_atomic_add_fetch_32(&(ompi_part_persist.block_entry), -1); if(to_delete) { - int err = mca_part_persist_free_req(to_delete); - if(OMPI_SUCCESS != err) return OMPI_ERROR; + err = mca_part_persist_free_req(to_delete); + if (OMPI_SUCCESS != err) { + return OMPI_ERROR; + } } return OMPI_SUCCESS; diff --git a/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_wait.c b/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_wait.c index af7feebb5757e62874f57843369f32dde0c5150c..6da65f0cc7b4a2d45a1a7595fdafe99b8208bc8c 100644 --- a/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_wait.c +++ b/ompi/mca/vprotocol/pessimist/vprotocol_pessimist_wait.c @@ -1,6 +1,7 @@ /* * Copyright (c) 2004-2007 The Trustees of the University of Tennessee. * All rights reserved. + * Copyright (c) 2021 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -19,7 +20,7 @@ static int vprotocol_pessimist_request_no_free(ompi_request_t **req) { } #define PREPARE_REQUESTS_WITH_NO_FREE(count, requests) do { \ - for(int i = 0; i < count; i++) \ + for (typeof(count) i = 0; i < count; i++) \ { \ if(requests[i] == MPI_REQUEST_NULL) continue; \ requests[i]->req_free = vprotocol_pessimist_request_no_free; \ diff --git a/opal/mca/btl/base/btl_base_am_rdma.c b/opal/mca/btl/base/btl_base_am_rdma.c index 81a0d74b2667b8c43049260724eb1847c2901304..4feeff87c243d25677163bda0d8a37ac9e061400 100644 --- a/opal/mca/btl/base/btl_base_am_rdma.c +++ b/opal/mca/btl/base/btl_base_am_rdma.c @@ -3,6 +3,7 @@ * Copyright (c) 2011-2018 Los Alamos National Security, LLC. All rights * reserved. * Copyright (c) 2020-2021 Google, LLC. All rights reserved. + * Copyright (c) 2021 Cisco Systems, Inc. All rights reserved * $COPYRIGHT$ * * Additional copyrights may follow @@ -480,7 +481,7 @@ mca_btl_base_rdma_start(mca_btl_base_module_t *btl, struct mca_btl_base_endpoint BTL_VERBOSE(("Initiating RDMA operation. context=%p, size=%" PRIsize_t ", packet_size=%" PRIsize_t, - context, size, packet_size)); + (void*) context, size, packet_size)); descriptor = btl->btl_alloc(btl, endpoint, order, packet_size, MCA_BTL_DES_SEND_ALWAYS_CALLBACK | MCA_BTL_DES_FLAGS_SIGNAL); @@ -609,7 +610,7 @@ static int mca_btl_base_am_rdma_respond(mca_btl_base_module_t *btl, } } - BTL_VERBOSE(("sending descriptor %p", send_descriptor)); + BTL_VERBOSE(("sending descriptor %p", (void*) send_descriptor)); send_descriptor->des_cbfunc = NULL; @@ -638,7 +639,7 @@ mca_btl_base_am_rmda_rdma_complete(mca_btl_base_module_t *btl, if (OPAL_UNLIKELY(OPAL_SUCCESS != ret)) { BTL_VERBOSE( ("could not send a response. queueing the response for later. endpoint=%p, ret=%d", - endpoint, ret)); + (void*) endpoint, ret)); mca_btl_base_rdma_queue_operation(btl, NULL, NULL, 0, NULL, operation); } @@ -873,7 +874,7 @@ static void mca_btl_base_am_rdma_response(mca_btl_base_module_t *btl, mca_btl_base_rdma_context_t *context = (mca_btl_base_rdma_context_t *) (uintptr_t) resp_hdr->context; - BTL_VERBOSE(("received response for RDMA operation. context=%p, size=%" PRIu64, context, + BTL_VERBOSE(("received response for RDMA operation. context=%p, size=%" PRIu64, (void*) context, resp_hdr->response_size)); if (MCA_BTL_BASE_AM_PUT != context->type) { @@ -890,7 +891,7 @@ static void mca_btl_base_am_rdma_response(mca_btl_base_module_t *btl, } if (context->total_size - == opal_atomic_add_fetch_64(&context->acknowledged, resp_hdr->response_size)) { + == (uint64_t) opal_atomic_add_fetch_64(&context->acknowledged, resp_hdr->response_size)) { context->cbfunc(btl, desc->endpoint, context->local_address, context->local_handle, context->cbcontext, context->cbdata, OPAL_SUCCESS); OBJ_RELEASE(context); @@ -1001,7 +1002,7 @@ static void mca_btl_base_am_process_atomic(mca_btl_base_module_t *btl, } } -void mca_btl_sm_sc_emu_init(void) +static void mca_btl_sm_sc_emu_init(void) { mca_btl_base_active_message_trigger[MCA_BTL_BASE_TAG_RDMA].cbfunc = mca_btl_base_am_process_rdma; @@ -1093,7 +1094,7 @@ int mca_btl_base_am_rdma_init(mca_btl_base_module_t *btl) btl->btl_put_limit = max_operation_size - sizeof(mca_btl_base_rdma_hdr_t); btl->btl_put_alignment = operation_alignment; btl->btl_put = mca_btl_base_am_rdma_put; - BTL_VERBOSE(("Enabling AM-based RDMA put for BTL %p. max put = %zu", btl, btl->btl_put_limit)); + BTL_VERBOSE(("Enabling AM-based RDMA put for BTL %p. max put = %zu", (void*) btl, btl->btl_put_limit)); } if (!(btl->btl_flags & MCA_BTL_FLAGS_GET)) { @@ -1101,11 +1102,11 @@ int mca_btl_base_am_rdma_init(mca_btl_base_module_t *btl) btl->btl_get_limit = max_operation_size - sizeof(mca_btl_base_rdma_response_hdr_t); btl->btl_get_alignment = operation_alignment; btl->btl_get = mca_btl_base_am_rdma_get; - BTL_VERBOSE(("Enabling AM-based RDMA get for BTL %p. max get = %zu", btl, btl->btl_get_limit)); + BTL_VERBOSE(("Enabling AM-based RDMA get for BTL %p. max get = %zu", (void*) btl, btl->btl_get_limit)); } if (!(btl->btl_flags & MCA_BTL_FLAGS_ATOMIC_FOPS)) { - BTL_VERBOSE(("Enabling AM-based FOPs get for BTL %p", btl)); + BTL_VERBOSE(("Enabling AM-based FOPs get for BTL %p", (void*) btl)); btl->btl_flags |= MCA_BTL_FLAGS_ATOMIC_AM_FOP; btl->btl_atomic_fop = mca_btl_base_am_fop;