1
1

Silence warnings in optimized build

Signed-off-by: Ralph Castain <rhc@open-mpi.org>
Этот коммит содержится в:
Ralph Castain 2017-12-20 12:00:28 -08:00
родитель ad96fa19d4
Коммит d5471d7898
4 изменённых файлов: 46 добавлений и 22 удалений

1
.gitignore поставляемый
Просмотреть файл

@ -634,6 +634,7 @@ test/datatype/ddt_raw
test/datatype/opal_datatype_test test/datatype/opal_datatype_test
test/datatype/position_noncontig test/datatype/position_noncontig
test/datatype/unpack_ooo test/datatype/unpack_ooo
test/datatype/unpack_hetero
test/dss/dss_buffer test/dss/dss_buffer
test/dss/dss_copy test/dss/dss_copy

Просмотреть файл

@ -7,7 +7,7 @@
* Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012-2017 Los Alamos National Security, LLC. All rights * Copyright (c) 2012-2017 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2013-2014 Intel, Inc. All rights reserved * Copyright (c) 2013-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2014 The University of Tennessee and The University * Copyright (c) 2014 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights * of Tennessee Research Foundation. All rights
* reserved. * reserved.
@ -1133,7 +1133,9 @@ out:
static void *call_disconnect_callback(int fd, int flags, void *v) static void *call_disconnect_callback(int fd, int flags, void *v)
{ {
rdmacm_contents_t *contents = (rdmacm_contents_t *) v; rdmacm_contents_t *contents = (rdmacm_contents_t *) v;
#if OPAL_ENABLE_DEBUG
void *tmp = NULL; void *tmp = NULL;
#endif
id_context_t *context; id_context_t *context;
opal_list_item_t *item; opal_list_item_t *item;
@ -1145,7 +1147,9 @@ static void *call_disconnect_callback(int fd, int flags, void *v)
(void*) context->id)); (void*) context->id));
if (!context->already_disconnected) { if (!context->already_disconnected) {
#if OPAL_ENABLE_DEBUG
tmp = context->id; tmp = context->id;
#endif
rdma_disconnect(context->id); rdma_disconnect(context->id);
context->already_disconnected = true; context->already_disconnected = true;
} }
@ -1260,9 +1264,12 @@ static int rdmacm_connect_endpoint(id_context_t *context,
{ {
rdmacm_contents_t *contents = context->contents; rdmacm_contents_t *contents = context->contents;
rdmacm_endpoint_local_cpc_data_t *data; rdmacm_endpoint_local_cpc_data_t *data;
mca_btl_openib_endpoint_t *endpoint; mca_btl_openib_endpoint_t *endpoint;
#if OPAL_ENABLE_DEBUG
#if !BTL_OPENIB_RDMACM_IB_ADDR #if !BTL_OPENIB_RDMACM_IB_ADDR
modex_message_t *message; modex_message_t *message;
#endif
#endif #endif
if (contents->server) { if (contents->server) {
@ -1302,6 +1309,7 @@ static int rdmacm_connect_endpoint(id_context_t *context,
return OPAL_SUCCESS; return OPAL_SUCCESS;
} }
#if OPAL_ENABLE_DEBUG
#if !BTL_OPENIB_RDMACM_IB_ADDR #if !BTL_OPENIB_RDMACM_IB_ADDR
message = (modex_message_t *) endpoint->endpoint_remote_cpc_data->cbm_modex_message; message = (modex_message_t *) endpoint->endpoint_remote_cpc_data->cbm_modex_message;
BTL_VERBOSE(("%s connected!!! local %x remote %x state = %d", BTL_VERBOSE(("%s connected!!! local %x remote %x state = %d",
@ -1309,6 +1317,7 @@ static int rdmacm_connect_endpoint(id_context_t *context,
contents->ipaddr, contents->ipaddr,
message->ipaddr, message->ipaddr,
endpoint->endpoint_state)); endpoint->endpoint_state));
#endif
#endif #endif
/* Ensure that all the writes back to the endpoint and associated /* Ensure that all the writes back to the endpoint and associated
@ -1489,17 +1498,21 @@ static int finish_connect(id_context_t *context)
struct rdma_conn_param conn_param; struct rdma_conn_param conn_param;
private_data_t msg; private_data_t msg;
int rc; int rc;
#if OPAL_ENABLE_DEBUG
#if !BTL_OPENIB_RDMACM_IB_ADDR #if !BTL_OPENIB_RDMACM_IB_ADDR
struct sockaddr *peeraddr; struct sockaddr *peeraddr;
uint32_t remoteipaddr; uint32_t remoteipaddr;
uint16_t remoteport; uint16_t remoteport;
#endif
#endif #endif
modex_message_t *message; modex_message_t *message;
#if OPAL_ENABLE_DEBUG
#if !BTL_OPENIB_RDMACM_IB_ADDR #if !BTL_OPENIB_RDMACM_IB_ADDR
remoteport = rdma_get_dst_port(context->id);
peeraddr = rdma_get_peer_addr(context->id); peeraddr = rdma_get_peer_addr(context->id);
remoteport = rdma_get_dst_port(context->id);
remoteipaddr = ((struct sockaddr_in *)peeraddr)->sin_addr.s_addr; remoteipaddr = ((struct sockaddr_in *)peeraddr)->sin_addr.s_addr;
#endif
#endif #endif
message = (modex_message_t *) message = (modex_message_t *)
@ -1661,8 +1674,12 @@ static int event_handler(struct rdma_cm_event *event)
id_context_t *context = (id_context_t*) event->id->context; id_context_t *context = (id_context_t*) event->id->context;
#if !BTL_OPENIB_RDMACM_IB_ADDR #if !BTL_OPENIB_RDMACM_IB_ADDR
rdmacm_contents_t *contents; rdmacm_contents_t *contents;
struct sockaddr *peeraddr, *localaddr; struct sockaddr *localaddr;
uint32_t peeripaddr, localipaddr; uint32_t localipaddr;
#if OPAL_ENABLE_DEBUG
struct sockaddr *peeraddr;
uint32_t peeripaddr;
#endif
#endif #endif
int rc = -1; int rc = -1;
opal_btl_openib_ini_values_t ini; opal_btl_openib_ini_values_t ini;
@ -1676,9 +1693,11 @@ static int event_handler(struct rdma_cm_event *event)
contents = context->contents; contents = context->contents;
localaddr = rdma_get_local_addr(event->id); localaddr = rdma_get_local_addr(event->id);
peeraddr = rdma_get_peer_addr(event->id);
localipaddr = ((struct sockaddr_in *)localaddr)->sin_addr.s_addr; localipaddr = ((struct sockaddr_in *)localaddr)->sin_addr.s_addr;
#if OPAL_ENABLE_DEBUG
peeraddr = rdma_get_peer_addr(event->id);
peeripaddr = ((struct sockaddr_in *)peeraddr)->sin_addr.s_addr; peeripaddr = ((struct sockaddr_in *)peeraddr)->sin_addr.s_addr;
#endif
BTL_VERBOSE(("%s event_handler -- %s, status = %d to %x", BTL_VERBOSE(("%s event_handler -- %s, status = %d to %x",
contents->server?"server":"client", contents->server?"server":"client",

Просмотреть файл

@ -7,7 +7,7 @@
* reserved. * reserved.
* Copyright (c) 2014-2015 Research Organization for Information Science * Copyright (c) 2014-2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2014 Intel, Inc. All rights reserved. * Copyright (c) 2014-2017 Intel, Inc. All rights reserved.
* Copyright (c) 2014 Bull SAS. All rights reserved. * Copyright (c) 2014 Bull SAS. All rights reserved.
* Copyright (c) 2016 Mellanox Technologies. All rights reserved. * Copyright (c) 2016 Mellanox Technologies. All rights reserved.
* *
@ -1980,7 +1980,9 @@ static int udcm_process_messages (struct ibv_cq *event_cq, udcm_module_t *m)
udcm_msg_t *message = NULL; udcm_msg_t *message = NULL;
udcm_message_recv_t *item; udcm_message_recv_t *item;
struct ibv_wc wc[20]; struct ibv_wc wc[20];
#if OPAL_ENABLE_DEBUG
struct ibv_grh *grh; struct ibv_grh *grh;
#endif
udcm_endpoint_t *udep; udcm_endpoint_t *udep;
uint64_t dir; uint64_t dir;
@ -2000,7 +2002,9 @@ static int udcm_process_messages (struct ibv_cq *event_cq, udcm_module_t *m)
msg_num = (int)(wc[i].wr_id & (~UDCM_WR_DIR_MASK)); msg_num = (int)(wc[i].wr_id & (~UDCM_WR_DIR_MASK));
#if OPAL_ENABLE_DEBUG
grh = (wc[i].wc_flags & IBV_WC_GRH) ? (struct ibv_grh *) udcm_module_get_recv_buffer (m, msg_num, false) : NULL; grh = (wc[i].wc_flags & IBV_WC_GRH) ? (struct ibv_grh *) udcm_module_get_recv_buffer (m, msg_num, false) : NULL;
#endif
BTL_VERBOSE(("WC: wr_id: 0x%016" PRIu64 ", status: %d, opcode: 0x%x, byte_len: %x, imm_data: 0x%08x, " BTL_VERBOSE(("WC: wr_id: 0x%016" PRIu64 ", status: %d, opcode: 0x%x, byte_len: %x, imm_data: 0x%08x, "
"qp_num: 0x%08x, src_qp: 0x%08x, wc_flags: 0x%x, slid: 0x%04x grh_present: %s", "qp_num: 0x%08x, src_qp: 0x%08x, wc_flags: 0x%x, slid: 0x%04x grh_present: %s",

Просмотреть файл

@ -1406,7 +1406,7 @@ int pmix3x_disconnect(opal_list_t *procs)
{ {
size_t nprocs; size_t nprocs;
opal_namelist_t *ptr; opal_namelist_t *ptr;
pmix_status_t ret; pmix_status_t ret=PMIX_SUCCESS;
char *nsptr; char *nsptr;
opal_output_verbose(1, opal_pmix_base_framework.framework_output, opal_output_verbose(1, opal_pmix_base_framework.framework_output,
@ -1443,7 +1443,7 @@ int pmix3x_disconnectnb(opal_list_t *procs,
void *cbdata) void *cbdata)
{ {
opal_namelist_t *ptr; opal_namelist_t *ptr;
pmix_status_t ret; pmix_status_t ret=PMIX_SUCCESS;
char *nsptr; char *nsptr;
opal_output_verbose(1, opal_pmix_base_framework.framework_output, opal_output_verbose(1, opal_pmix_base_framework.framework_output,