From f9a9b936a1abca26993b6c88c92590b8e67ed990 Mon Sep 17 00:00:00 2001 From: Alina Sklarevich Date: Wed, 11 Mar 2015 10:58:54 +0200 Subject: [PATCH] PML_YALLA: fix compilation warnings. --- ompi/mca/pml/yalla/pml_yalla.c | 54 ++++++++++++------------- ompi/mca/pml/yalla/pml_yalla_datatype.c | 4 +- ompi/mca/pml/yalla/pml_yalla_datatype.h | 5 ++- ompi/mca/pml/yalla/pml_yalla_request.c | 28 ++++++------- ompi/mca/pml/yalla/pml_yalla_request.h | 6 +-- 5 files changed, 49 insertions(+), 48 deletions(-) diff --git a/ompi/mca/pml/yalla/pml_yalla.c b/ompi/mca/pml/yalla/pml_yalla.c index 0ec825eafa..22de67b48e 100644 --- a/ompi/mca/pml/yalla/pml_yalla.c +++ b/ompi/mca/pml/yalla/pml_yalla.c @@ -41,8 +41,8 @@ mca_pml_yalla_module_t ompi_pml_yalla = { mca_pml_yalla_mrecv, mca_pml_yalla_dump, NULL, /* FT */ - 1ul << (sizeof(mxm_ctxid_t)*8) - 1, - 1ul << (sizeof(mxm_tag_t)*8 - 1) - 1, + 1ul << ((sizeof(mxm_ctxid_t)*8) - 1), + 1ul << ((sizeof(mxm_tag_t)*8 - 1) - 1), }, NULL, NULL, @@ -178,8 +178,8 @@ int mca_pml_yalla_init(void) opal_progress_register(mca_pml_yalla_progress); - PML_YALLA_VERBOSE(2, "created mxm context %p ep %p", ompi_pml_yalla.mxm_context, - ompi_pml_yalla.mxm_ep); + PML_YALLA_VERBOSE(2, "created mxm context %p ep %p", (void *)ompi_pml_yalla.mxm_context, + (void *)ompi_pml_yalla.mxm_ep); return OMPI_SUCCESS; } @@ -227,13 +227,13 @@ int mca_pml_yalla_add_procs(struct ompi_proc_t **procs, size_t nprocs) } if (procs[i]->proc_endpoints[OMPI_PROC_ENDPOINT_TAG_PML]) { - PML_YALLA_VERBOSE(3, "already connected to proc. %ld", - procs[i]->super.proc_name); + PML_YALLA_VERBOSE(3, "already connected to proc. %s", + OPAL_NAME_PRINT(procs[i]->super.proc_name)); continue; } - PML_YALLA_VERBOSE(2, "connecting to proc. %ld", - procs[i]->super.proc_name); + PML_YALLA_VERBOSE(2, "connecting to proc. %s", + OPAL_NAME_PRINT(procs[i]->super.proc_name)); error = mxm_ep_connect(ompi_pml_yalla.mxm_ep, address, &conn); free(address); @@ -259,7 +259,7 @@ int mca_pml_yalla_del_procs(struct ompi_proc_t **procs, size_t nprocs) for (i = 0; i < nprocs; ++i) { mxm_ep_disconnect(procs[i]->proc_endpoints[OMPI_PROC_ENDPOINT_TAG_PML]); - PML_YALLA_VERBOSE(2, "disconnected from rank %ld", procs[i]->super.proc_name); + PML_YALLA_VERBOSE(2, "disconnected from rank %s", OPAL_NAME_PRINT(procs[i]->super.proc_name)); procs[i]->proc_endpoints[OMPI_PROC_ENDPOINT_TAG_PML] = NULL; } opal_pmix.fence(NULL, 0); @@ -321,7 +321,7 @@ int mca_pml_yalla_irecv_init(void *buf, size_t count, ompi_datatype_t *datatype, rreq->super.ompi.req_persistent = true; rreq->super.flags = 0; *request = &rreq->super.ompi; - PML_YALLA_VERBOSE(9, "init recv request %p src %d tag %d comm %s", *request, + PML_YALLA_VERBOSE(9, "init recv request %p src %d tag %d comm %s", (void*)(*request), src, tag, comm->c_name); return OMPI_SUCCESS; } @@ -338,8 +338,8 @@ int mca_pml_yalla_irecv(void *buf, size_t count, ompi_datatype_t *datatype, rreq->super.ompi.req_persistent = false; rreq->super.flags = 0; - PML_YALLA_VERBOSE(8, "receive request *%p=%p from %d tag %d dtype %s count %Zu", - request, rreq, src, tag, datatype->name, count); + PML_YALLA_VERBOSE(8, "receive request *%p=%p from %d tag %d dtype %s count %zu", + (void *)request, (void *)rreq, src, tag, datatype->name, count); error = mxm_req_recv(&rreq->mxm); if (MXM_OK != error) { @@ -360,7 +360,7 @@ int mca_pml_yalla_recv(void *buf, size_t count, ompi_datatype_t *datatype, int s PML_YALLA_INIT_MXM_RECV_REQ(&rreq, buf, count, datatype, src, tag, comm, recv); PML_YALLA_INIT_BLOCKING_MXM_RECV_REQ(&rreq); - PML_YALLA_VERBOSE(8, "receive from %d tag %d dtype %s count %Zu", src, tag, + PML_YALLA_VERBOSE(8, "receive from %d tag %d dtype %s count %zu", src, tag, datatype->name, count); error = mxm_req_recv(&rreq); @@ -369,7 +369,7 @@ int mca_pml_yalla_recv(void *buf, size_t count, ompi_datatype_t *datatype, int s } PML_YALLA_WAIT_MXM_REQ(&rreq.base); - PML_YALLA_VERBOSE(8, "receive completed with status %s source %d rtag %d(%d/0x%x) len %Zu", + PML_YALLA_VERBOSE(8, "receive completed with status %s source %d rtag %d(%d/0x%x) len %zu", mxm_error_string(rreq.base.error), rreq.completion.sender_imm, rreq.completion.sender_tag, rreq.tag, rreq.tag_mask, @@ -396,14 +396,14 @@ int mca_pml_yalla_isend_init(void *buf, size_t count, ompi_datatype_t *datatype, } *request = &sreq->super.ompi; - PML_YALLA_VERBOSE(9, "init send request %p dst %d tag %d comm %s", *request, + PML_YALLA_VERBOSE(9, "init send request %p dst %d tag %d comm %s", (void *)*request, dst, tag, comm->c_name); return OMPI_SUCCESS; } static int mca_pml_yalla_bsend(mxm_send_req_t *mxm_sreq) { - mca_pml_yalla_bsend_request_t *bsreq = PML_YALLA_FREELIST_GET(&ompi_pml_yalla.bsend_reqs); + mca_pml_yalla_bsend_request_t *bsreq = (mca_pml_yalla_bsend_request_t *)PML_YALLA_FREELIST_GET(&ompi_pml_yalla.bsend_reqs); mxm_error_t error; size_t length; @@ -461,8 +461,8 @@ int mca_pml_yalla_isend(void *buf, size_t count, ompi_datatype_t *datatype, sreq->super.ompi.req_persistent = false; sreq->super.flags = 0; - PML_YALLA_VERBOSE(8, "send request *%p=%p to %d mode %d tag %d dtype %s count %Zu", - request, sreq, dst, mode, tag, datatype->name, count); + PML_YALLA_VERBOSE(8, "send request *%p=%p to %d mode %d tag %d dtype %s count %zu", + (void *)request, (void *)sreq, dst, mode, tag, datatype->name, count); if (mode == MCA_PML_BASE_SEND_BUFFERED) { rc = mca_pml_yalla_bsend(&sreq->mxm); @@ -493,7 +493,7 @@ int mca_pml_yalla_send(void *buf, size_t count, ompi_datatype_t *datatype, int d PML_YALLA_INIT_MXM_SEND_REQ(&sreq, buf, count, datatype, dst, tag, mode, comm, send); PML_YALLA_INIT_BLOCKING_MXM_SEND_REQ(&sreq); - PML_YALLA_VERBOSE(8, "send to %d tag %d dtype %s count %Zu", dst, tag, + PML_YALLA_VERBOSE(8, "send to %d tag %d dtype %s count %zu", dst, tag, datatype->name, count); if (mode == MCA_PML_BASE_SEND_BUFFERED) { @@ -627,8 +627,8 @@ int mca_pml_yalla_imrecv(void *buf, size_t count, ompi_datatype_t *datatype, rreq->super.ompi.req_persistent = false; rreq->super.flags = 0; - PML_YALLA_VERBOSE(8, "receive request *%p=%p message *%p=%p dtype %s count %Zu", - request, rreq, message, *message, datatype->name, count); + PML_YALLA_VERBOSE(8, "receive request *%p=%p message *%p=%p dtype %s count %zu", + (void *)request, (void *)rreq, (void *)message, (void *)(*message), datatype->name, count); error = mxm_message_recv(&rreq->mxm, (*message)->req_ptr); if (MXM_OK != error) { @@ -651,8 +651,8 @@ int mca_pml_yalla_mrecv(void *buf, size_t count, ompi_datatype_t *datatype, PML_YALLA_INIT_MXM_RECV_REQ(&rreq, buf, count, datatype, -1, 0, (*message)->comm, recv); PML_YALLA_INIT_BLOCKING_MXM_RECV_REQ(&rreq); - PML_YALLA_VERBOSE(8, "receive message *%p=%p dtype %s count %Zu", message, - *message, datatype->name, count); + PML_YALLA_VERBOSE(8, "receive message *%p=%p dtype %s count %zu", (void *)message, + (void *)*message, datatype->name, count); error = mxm_message_recv(&rreq, (*message)->req_ptr); if (MXM_OK != error) { @@ -662,7 +662,7 @@ int mca_pml_yalla_mrecv(void *buf, size_t count, ompi_datatype_t *datatype, PML_YALLA_MESSAGE_RELEASE(message); PML_YALLA_WAIT_MXM_REQ(&rreq.base); - PML_YALLA_VERBOSE(8, "receive completed with status %s source %d rtag %d(%d/0x%x) len %Zu", + PML_YALLA_VERBOSE(8, "receive completed with status %s source %d rtag %d(%d/0x%x) len %zu", mxm_error_string(rreq.base.error), rreq.completion.sender_imm, rreq.completion.sender_tag, rreq.tag, rreq.tag_mask, @@ -694,7 +694,7 @@ int mca_pml_yalla_start(size_t count, ompi_request_t** requests) if (req->flags & MCA_PML_YALLA_REQUEST_FLAG_SEND) { sreq = (mca_pml_yalla_send_request_t *)req; if (req->flags & MCA_PML_YALLA_REQUEST_FLAG_BSEND) { - PML_YALLA_VERBOSE(8, "start bsend request %p", sreq); + PML_YALLA_VERBOSE(8, "start bsend request %p", (void *)sreq); rc = mca_pml_yalla_bsend(&sreq->mxm); OPAL_THREAD_LOCK(&ompi_request_lock); sreq->super.ompi.req_status.MPI_ERROR = rc; @@ -704,14 +704,14 @@ int mca_pml_yalla_start(size_t count, ompi_request_t** requests) return rc; } } else { - PML_YALLA_VERBOSE(8, "start send request %p", sreq); + PML_YALLA_VERBOSE(8, "start send request %p", (void *)sreq); error = mxm_req_send(&sreq->mxm); if (MXM_OK != error) { return OMPI_ERROR; } } } else { - PML_YALLA_VERBOSE(8, "start recv request %p", req); + PML_YALLA_VERBOSE(8, "start recv request %p", (void *)req); error = mxm_req_recv(&((mca_pml_yalla_recv_request_t *)req)->mxm); if (MXM_OK != error) { return OMPI_ERROR; diff --git a/ompi/mca/pml/yalla/pml_yalla_datatype.c b/ompi/mca/pml/yalla/pml_yalla_datatype.c index aaf871e6d1..b87340c007 100644 --- a/ompi/mca/pml/yalla/pml_yalla_datatype.c +++ b/ompi/mca/pml/yalla/pml_yalla_datatype.c @@ -17,7 +17,7 @@ static mca_pml_yalla_convertor_t *mca_pml_yalla_get_send_convertor(void *buf, size_t count, ompi_datatype_t *datatype) { - mca_pml_yalla_convertor_t *convertor = PML_YALLA_FREELIST_GET(&ompi_pml_yalla.convs); + mca_pml_yalla_convertor_t *convertor = (mca_pml_yalla_convertor_t *)PML_YALLA_FREELIST_GET(&ompi_pml_yalla.convs); convertor->datatype = datatype; OBJ_RETAIN(datatype); @@ -30,7 +30,7 @@ static mca_pml_yalla_convertor_t *mca_pml_yalla_get_send_convertor(void *buf, si static mca_pml_yalla_convertor_t *mca_pml_yalla_get_recv_convertor(void *buf, size_t count, ompi_datatype_t *datatype) { - mca_pml_yalla_convertor_t *convertor = PML_YALLA_FREELIST_GET(&ompi_pml_yalla.convs); + mca_pml_yalla_convertor_t *convertor = (mca_pml_yalla_convertor_t *)PML_YALLA_FREELIST_GET(&ompi_pml_yalla.convs); convertor->datatype = datatype; OBJ_RETAIN(datatype); diff --git a/ompi/mca/pml/yalla/pml_yalla_datatype.h b/ompi/mca/pml/yalla/pml_yalla_datatype.h index 2493897323..2ba4e755a8 100644 --- a/ompi/mca/pml/yalla/pml_yalla_datatype.h +++ b/ompi/mca/pml/yalla/pml_yalla_datatype.h @@ -25,13 +25,14 @@ OBJ_CLASS_DECLARATION(mca_pml_yalla_convertor_t); #define PML_YALLA_INIT_MXM_REQ_DATA(_req_base, _buf, _count, _dtype, _stream_type, ...) \ { \ - ptrdiff_t size, lb; \ + size_t size; \ + ptrdiff_t lb; \ \ if (opal_datatype_is_contiguous_memory_layout(&(_dtype)->super, _count)) { \ ompi_datatype_type_size(_dtype, &size); \ ompi_datatype_type_lb(_dtype, &lb); \ (_req_base)->data_type = MXM_REQ_DATA_BUFFER; \ - (_req_base)->data.buffer.ptr = _buf + lb; \ + (_req_base)->data.buffer.ptr = (char *)_buf + lb; \ (_req_base)->data.buffer.length = size * (_count); \ } else { \ mca_pml_yalla_set_noncontig_data_ ## _stream_type(_req_base, \ diff --git a/ompi/mca/pml/yalla/pml_yalla_request.c b/ompi/mca/pml/yalla/pml_yalla_request.c index 314ae8beb8..eff05a57db 100644 --- a/ompi/mca/pml/yalla/pml_yalla_request.c +++ b/ompi/mca/pml/yalla/pml_yalla_request.c @@ -35,7 +35,7 @@ static inline int mca_pml_yalla_check_request_state(mca_pml_yalla_base_request_t *req) { if (req->mxm_base->state != MXM_REQ_COMPLETED) { - PML_YALLA_VERBOSE(8, "request %p free called before completed", req); + PML_YALLA_VERBOSE(8, "request %p free called before completed", (void *)req); req->flags |= MCA_PML_YALLA_REQUEST_FLAG_FREE_CALLED; return 0; } @@ -47,7 +47,7 @@ static int mca_pml_yalla_send_request_free(ompi_request_t **request) { mca_pml_yalla_base_request_t *req = (mca_pml_yalla_base_request_t*)(*request); - PML_YALLA_VERBOSE(9, "free send request *%p=%p", request, *request); + PML_YALLA_VERBOSE(9, "free send request *%p=%p", (void *)request, (void *)*request); OPAL_THREAD_LOCK(&ompi_request_lock); if (mca_pml_yalla_check_request_state(req)) { @@ -69,18 +69,18 @@ static int mca_pml_yalla_send_request_cancel(ompi_request_t *request, int flag) * This might be a buffered send request which has completed anyway, so * we cannot cancel it anymore. Just hope for the best. */ - PML_YALLA_VERBOSE(7, "not canceling a completed send request %p", request); + PML_YALLA_VERBOSE(7, "not canceling a completed send request %p", (void *)request); return OMPI_SUCCESS; } error = mxm_req_cancel_send(&sreq->mxm); if ((error != MXM_OK) && (error != MXM_ERR_NO_PROGRESS)) { - PML_YALLA_ERROR("failed to cancel send request %p: %s", request, + PML_YALLA_ERROR("failed to cancel send request %p: %s", (void *)request, mxm_error_string(error)); return OMPI_ERROR; } - PML_YALLA_VERBOSE(9, "canceled send request %p", request); + PML_YALLA_VERBOSE(9, "canceled send request %p", (void *)request); return OMPI_SUCCESS; } @@ -88,7 +88,7 @@ static int mca_pml_yalla_recv_request_free(ompi_request_t **request) { mca_pml_yalla_base_request_t *req = (mca_pml_yalla_base_request_t*)(*request); - PML_YALLA_VERBOSE(9, "free receive request *%p=%p", request, *request); + PML_YALLA_VERBOSE(9, "free receive request *%p=%p", (void *)request, (void *)*request); OPAL_THREAD_LOCK(&ompi_request_lock); if (mca_pml_yalla_check_request_state(req)) { @@ -107,12 +107,12 @@ static int mca_pml_yalla_recv_request_cancel(ompi_request_t *request, int flag) error = mxm_req_cancel_recv(&rreq->mxm); if ((error != MXM_OK) && (error != MXM_ERR_NO_PROGRESS)) { - PML_YALLA_ERROR("failed to cancel receive request %p: %s", request, + PML_YALLA_ERROR("failed to cancel receive request %p: %s", (void *)request, mxm_error_string(error)); return OMPI_ERROR; } - PML_YALLA_VERBOSE(9, "canceled receive request %p", request); + PML_YALLA_VERBOSE(9, "canceled receive request %p", (void *)request); return OMPI_SUCCESS; } @@ -175,13 +175,13 @@ static void mca_pml_yalla_send_completion_cb(void *context) break; } - PML_YALLA_VERBOSE(8, "send request %p completed with status %s", sreq, + PML_YALLA_VERBOSE(8, "send request %p completed with status %s", (void *)sreq, mxm_error_string(sreq->mxm.base.error)); OPAL_THREAD_LOCK(&ompi_request_lock); ompi_request_complete(&sreq->super.ompi, true); if (sreq->super.flags & MCA_PML_YALLA_REQUEST_FLAG_FREE_CALLED) { - PML_YALLA_VERBOSE(7, "release request %p because free was already called", sreq); + PML_YALLA_VERBOSE(7, "release request %p because free was already called", (void *)sreq); mca_pml_yalla_request_release(&sreq->super, &ompi_pml_yalla.send_reqs); } OPAL_THREAD_UNLOCK(&ompi_request_lock); @@ -191,7 +191,7 @@ static void mca_pml_yalla_bsend_completion_cb(void *context) { mca_pml_yalla_bsend_request_t *bsreq = context; - PML_YALLA_VERBOSE(8, "bsend request %p completed with status %s", bsreq, + PML_YALLA_VERBOSE(8, "bsend request %p completed with status %s", (void *)bsreq, mxm_error_string(bsreq->mxm.base.error)); mca_pml_base_bsend_request_free(bsreq->mxm.base.data.buffer.ptr); @@ -205,8 +205,8 @@ static void mca_pml_yalla_recv_completion_cb(void *context) PML_YALLA_SET_RECV_STATUS(&rreq->mxm, rreq->mxm.completion.actual_len, &rreq->super.ompi.req_status); - PML_YALLA_VERBOSE(8, "receive request %p completed with status %s source %d rtag %d(%d/0x%x) len %Zu", - rreq, mxm_error_string(rreq->mxm.base.error), + PML_YALLA_VERBOSE(8, "receive request %p completed with status %s source %d rtag %d(%d/0x%x) len %zu", + (void *)rreq, mxm_error_string(rreq->mxm.base.error), rreq->mxm.completion.sender_imm, rreq->mxm.completion.sender_tag, rreq->mxm.tag, rreq->mxm.tag_mask, rreq->mxm.completion.actual_len); @@ -214,7 +214,7 @@ static void mca_pml_yalla_recv_completion_cb(void *context) OPAL_THREAD_LOCK(&ompi_request_lock); ompi_request_complete(&rreq->super.ompi, true); if (rreq->super.flags & MCA_PML_YALLA_REQUEST_FLAG_FREE_CALLED) { - PML_YALLA_VERBOSE(7, "release request %p because free was already called", rreq); + PML_YALLA_VERBOSE(7, "release request %p because free was already called", (void *)rreq); mca_pml_yalla_request_release(&rreq->super, &ompi_pml_yalla.recv_reqs); } OPAL_THREAD_UNLOCK(&ompi_request_lock); diff --git a/ompi/mca/pml/yalla/pml_yalla_request.h b/ompi/mca/pml/yalla/pml_yalla_request.h index bfe7aab5e2..915bfe51cc 100644 --- a/ompi/mca/pml/yalla/pml_yalla_request.h +++ b/ompi/mca/pml/yalla/pml_yalla_request.h @@ -73,7 +73,7 @@ void mca_pml_yalla_init_reqs(void); #define PML_YALLA_INIT_MXM_REQ_BASE(_req_base, _comm) \ { \ (_req_base)->state = MXM_REQ_NEW; \ - (_req_base)->mq = (void*)(_comm)->c_pml_comm; \ + (_req_base)->mq = (mxm_mq_h)(_comm)->c_pml_comm; \ } #define PML_YALLA_PEER_CONN(_comm, _rank) \ @@ -128,7 +128,7 @@ void mca_pml_yalla_init_reqs(void); #define MCA_PML_YALLA_RREQ_INIT(_buf, _count, _datatype, _src, _tag, _comm, _state) \ ({ \ - mca_pml_yalla_recv_request_t *rreq = PML_YALLA_FREELIST_GET(&ompi_pml_yalla.recv_reqs); \ + mca_pml_yalla_recv_request_t *rreq = (mca_pml_yalla_recv_request_t *)PML_YALLA_FREELIST_GET(&ompi_pml_yalla.recv_reqs); \ \ PML_YALLA_INIT_OMPI_REQ(&rreq->super.ompi, _comm, _state); \ PML_YALLA_INIT_MXM_RECV_REQ(&rreq->mxm, _buf, _count, _datatype, _src, _tag, \ @@ -138,7 +138,7 @@ void mca_pml_yalla_init_reqs(void); #define MCA_PML_YALLA_SREQ_INIT(_buf, _count, _datatype, _dst, _tag, _mode, _comm, _state) \ ({ \ - mca_pml_yalla_send_request_t *sreq = PML_YALLA_FREELIST_GET(&ompi_pml_yalla.send_reqs); \ + mca_pml_yalla_send_request_t *sreq = (mca_pml_yalla_send_request_t *)PML_YALLA_FREELIST_GET(&ompi_pml_yalla.send_reqs); \ \ PML_YALLA_INIT_OMPI_REQ(&sreq->super.ompi, _comm, _state); \ PML_YALLA_INIT_MXM_SEND_REQ(&sreq->mxm, _buf, _count, _datatype, _dst, _tag, \