Skip to content

Commit 87af993

Browse files
committed
ob1: fix some compiler warnings
Fix legit errors in OPAL_OUTPUT_VERBOSE statements. Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
1 parent 3dc20e2 commit 87af993

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

ompi/mca/pml/ob1/pml_ob1_isend.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* All rights reserved.
1313
* Copyright (c) 2007-2016 Los Alamos National Security, LLC. All rights
1414
* reserved.
15-
* Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
15+
* Copyright (c) 2014-2021 Cisco Systems, Inc. All rights reserved
1616
* Copyright (c) 2015 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* $COPYRIGHT$
@@ -225,7 +225,11 @@ int mca_pml_ob1_isend(const void *buf,
225225
* in error for collection in future wait */
226226
sendreq->req_send.req_base.req_ompi.req_status.MPI_ERROR = ompi_comm_is_revoked(comm)? MPI_ERR_REVOKED: MPI_ERR_PROC_FAILED;
227227
MCA_PML_OB1_SEND_REQUEST_MPI_COMPLETE(sendreq, false);
228-
OPAL_OUTPUT_VERBOSE((2, "Allocating request in error %s (peer %d, seq %d) with error code %d", sendreq, dst, sendreq->req_send.req_base.req_sequence, sendreq->req_send.req_base.req_ompi.req_status.MPI_ERROR));
228+
OPAL_OUTPUT_VERBOSE((2, ompi_ftmpi_output_handle, "Allocating request in error %p (peer %d, seq %" PRIu64 ") with error code %d",
229+
(void*) sendreq,
230+
dst,
231+
sendreq->req_send.req_base.req_sequence,
232+
sendreq->req_send.req_base.req_ompi.req_status.MPI_ERROR));
229233
*request = (ompi_request_t *) sendreq;
230234
return OMPI_SUCCESS;
231235
#endif /* OPAL_ENABLE_FT_MPI */

ompi/mca/pml/ob1/pml_ob1_recvfrag.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
* Copyright (c) 2018 Sandia National Laboratories
2121
* All rights reserved.
2222
* Copyright (c) 2020 Google, LLC. All rights reserved.
23+
* Copyright (c) 2021 Cisco Systems, Inc. All rights reserved
2324
* $COPYRIGHT$
2425
*
2526
* Additional copyrights may follow
@@ -681,7 +682,7 @@ void mca_pml_ob1_recv_frag_callback_ack (mca_btl_base_module_t *btl,
681682
#if OPAL_ENABLE_FT_MPI
682683
/* if the req_recv is NULL, the comm has been revoked at the receiver */
683684
if( OPAL_UNLIKELY(NULL == sendreq->req_recv.pval) ) {
684-
OPAL_OUTPUT_VERBOSE((2, ompi_ftmpi_output_handle, "Recvfrag: Received a NACK to the RDV/RGET match to %d for seq %d on comm %d\n", sendreq->req_send.req_base.req_peer, sendreq->req_send.req_base.req_sequence, sendreq->req_send.req_base.req_comm->c_contextid));
685+
OPAL_OUTPUT_VERBOSE((2, ompi_ftmpi_output_handle, "Recvfrag: Received a NACK to the RDV/RGET match to %d for seq %" PRIu64 " on comm %d\n", sendreq->req_send.req_base.req_peer, sendreq->req_send.req_base.req_sequence, sendreq->req_send.req_base.req_comm->c_contextid));
685686
if (NULL != sendreq->rdma_frag) {
686687
MCA_PML_OB1_RDMA_FRAG_RETURN(sendreq->rdma_frag);
687688
sendreq->rdma_frag = NULL;

0 commit comments

Comments
 (0)