ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Clean up bunches of compiler warnings

Просмотр исходного кода 
This commit was SVN r21242.
Этот коммит содержится в:
Jeff Squyres 2009-05-14 15:39:53 +00:00
родитель fc65875542
Коммит efd229b56b
8 изменённых файлов: 97 добавлений и 83 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
ompi/mca/btl/openib/btl_openib.c
Просмотреть файл

@ -10,7 +10,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2006-2009 Mellanox Technologies. All rights reserved. * Copyright (c) 2006-2009 Mellanox Technologies. All rights reserved.
* Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights * Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
@ -837,10 +837,11 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_src(
assert(MCA_BTL_NO_ORDER == order); assert(MCA_BTL_NO_ORDER == order);
BTL_VERBOSE(("frag->sg_entry.lkey = %lu .addr = %llu " BTL_VERBOSE(("frag->sg_entry.lkey = %" PRIu32 " .addr = %" PRIx64
"frag->segment.seg_key.key32[0] = %lu", " frag->segment.seg_key.key32[0] = %" PRIu32,
frag->sg_entry.lkey, frag->sg_entry.addr, frag->sg_entry.lkey,
frag->sg_entry.lkey)); frag->sg_entry.addr,
frag->sg_entry.lkey));
return &to_base_frag(frag)->base; return &to_base_frag(frag)->base;
} }
@ -937,10 +938,11 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_dst(
to_base_frag(frag)->base.order = order; to_base_frag(frag)->base.order = order;
to_base_frag(frag)->base.des_flags = flags; to_base_frag(frag)->base.des_flags = flags;
BTL_VERBOSE(("frag->sg_entry.lkey = %lu .addr = %llu " BTL_VERBOSE(("frag->sg_entry.lkey = %" PRIu32 " .addr = %" PRIx64 " "
"frag->segment.seg_key.key32[0] = %lu", "frag->segment.seg_key.key32[0] = %" PRIu32,
frag->sg_entry.lkey, frag->sg_entry.addr, frag->sg_entry.lkey,
openib_reg->mr->rkey)); frag->sg_entry.addr,
openib_reg->mr->rkey));
return &to_base_frag(frag)->base; return &to_base_frag(frag)->base;
} }

6
ompi/mca/btl/openib/btl_openib_async.c
Просмотреть файл

@ -1,6 +1,6 @@
/* /*
* Copyright (c) 2008 Mellanox Technologies. All rights reserved. * Copyright (c) 2008 Mellanox Technologies. All rights reserved.
* Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007-2009 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2006-2007 Voltaire All rights reserved. * Copyright (c) 2006-2007 Voltaire All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -497,8 +497,8 @@ void mca_btl_openib_load_apm(struct ibv_qp *qp, mca_btl_openib_endpoint_t *ep)
} }
if (ibv_modify_qp(qp, &attr, mask)) if (ibv_modify_qp(qp, &attr, mask))
BTL_ERROR(("Failed to ibv_query_qp, qp num: %p, errno says: %s (%d)" BTL_ERROR(("Failed to ibv_query_qp, qp num: %d, errno says: %s (%d)",
,qp->qp_num ,strerror(errno), errno)); qp->qp_num, strerror(errno), errno));
} }
#if HAVE_XRC #if HAVE_XRC

37
ompi/mca/btl/openib/btl_openib_component.c
Просмотреть файл

@ -400,21 +400,23 @@ static void btl_openib_control(mca_btl_base_module_t* btl,
case MCA_BTL_OPENIB_CONTROL_RDMA: case MCA_BTL_OPENIB_CONTROL_RDMA:
rdma_hdr = (mca_btl_openib_eager_rdma_header_t*)ctl_hdr; rdma_hdr = (mca_btl_openib_eager_rdma_header_t*)ctl_hdr;
BTL_VERBOSE(("prior to NTOH received rkey %lu, rdma_start.lval %llu, pval %p, ival %u", BTL_VERBOSE(("prior to NTOH received rkey %" PRIu32
rdma_hdr->rkey, ", rdma_start.lval %" PRIx64 ", pval %p, ival %" PRIu32,
(unsigned long) rdma_hdr->rdma_start.lval, rdma_hdr->rkey,
rdma_hdr->rdma_start.pval, rdma_hdr->rdma_start.lval,
rdma_hdr->rdma_start.ival rdma_hdr->rdma_start.pval,
rdma_hdr->rdma_start.ival
)); ));
if(ep->nbo) { if(ep->nbo) {
BTL_OPENIB_EAGER_RDMA_CONTROL_HEADER_NTOH(*rdma_hdr); BTL_OPENIB_EAGER_RDMA_CONTROL_HEADER_NTOH(*rdma_hdr);
} }
BTL_VERBOSE(("received rkey %lu, rdma_start.lval %llu, pval %p," BTL_VERBOSE(("received rkey %" PRIu32
" ival %u", rdma_hdr->rkey, ", rdma_start.lval %" PRIx64 ", pval %p,"
(unsigned long) rdma_hdr->rdma_start.lval, " ival %" PRIu32, rdma_hdr->rkey,
rdma_hdr->rdma_start.pval, rdma_hdr->rdma_start.ival)); rdma_hdr->rdma_start.lval,
rdma_hdr->rdma_start.pval, rdma_hdr->rdma_start.ival));
if (ep->eager_rdma_remote.base.pval) { if (ep->eager_rdma_remote.base.pval) {
BTL_ERROR(("Got RDMA connect twice!")); BTL_ERROR(("Got RDMA connect twice!"));
@ -2849,8 +2851,8 @@ static void handle_wc(mca_btl_openib_device_t* device, const uint32_t cq,
mca_btl_openib_frag_progress_pending_put_get(endpoint, qp); mca_btl_openib_frag_progress_pending_put_get(endpoint, qp);
break; break;
case IBV_WC_RECV: case IBV_WC_RECV:
OPAL_OUTPUT((-1, "Got WC: RDMA_RECV, qp %d, src qp %d, WR ID %p", OPAL_OUTPUT((-1, "Got WC: RDMA_RECV, qp %d, src qp %d, WR ID %" PRIx64,
wc->qp_num, wc->src_qp, (void*) wc->wr_id)); wc->qp_num, wc->src_qp, wc->wr_id));
#if !defined(WORDS_BIGENDIAN) && OPAL_ENABLE_HETEROGENEOUS_SUPPORT #if !defined(WORDS_BIGENDIAN) && OPAL_ENABLE_HETEROGENEOUS_SUPPORT
wc->imm_data = ntohl(wc->imm_data); wc->imm_data = ntohl(wc->imm_data);
@ -2910,15 +2912,18 @@ error:
if(IBV_WC_WR_FLUSH_ERR != wc->status || !flush_err_printed[cq]++) { if(IBV_WC_WR_FLUSH_ERR != wc->status || !flush_err_printed[cq]++) {
BTL_PEER_ERROR(remote_proc, ("error polling %s with status %s " BTL_PEER_ERROR(remote_proc, ("error polling %s with status %s "
"status number %d for wr_id %llu opcode %d vendor error %d qp_idx %d", "status number %d for wr_id %" PRIx64 " opcode %d vendor error %d qp_idx %d",
cq_name[cq], btl_openib_component_status_to_string(wc->status), cq_name[cq], btl_openib_component_status_to_string(wc->status),
wc->status, wc->wr_id, wc->opcode, wc->vendor_err, qp)); wc->status, wc->wr_id,
wc->opcode, wc->vendor_err, qp));
orte_notifier.peer(ORTE_NOTIFIER_INFRA, ORTE_ERR_COMM_FAILURE, orte_notifier.peer(ORTE_NOTIFIER_INFRA, ORTE_ERR_COMM_FAILURE,
remote_proc ? &remote_proc->proc_name : NULL, remote_proc ? &remote_proc->proc_name : NULL,
"\n\tIB polling %s with status %s " "\n\tIB polling %s with status %s "
"status number %d for wr_id %llu opcode %d vendor error %d qp_idx %d", "status number %d for wr_id %" PRIx64 " opcode %d vendor error %d qp_idx %d",
cq_name[cq], btl_openib_component_status_to_string(wc->status), cq_name[cq],
wc->status, wc->wr_id, wc->opcode, wc->vendor_err, qp); btl_openib_component_status_to_string(wc->status),
wc->status, wc->wr_id,
wc->opcode, wc->vendor_err, qp);
} }
if (IBV_WC_RNR_RETRY_EXC_ERR == wc->status || if (IBV_WC_RNR_RETRY_EXC_ERR == wc->status ||

31
ompi/mca/btl/openib/btl_openib_endpoint.c
Просмотреть файл

@ -857,31 +857,32 @@ static int mca_btl_openib_endpoint_send_eager_rdma(
rdma_hdr->control.type = MCA_BTL_OPENIB_CONTROL_RDMA; rdma_hdr->control.type = MCA_BTL_OPENIB_CONTROL_RDMA;
rdma_hdr->rkey = endpoint->eager_rdma_local.reg->mr->rkey; rdma_hdr->rkey = endpoint->eager_rdma_local.reg->mr->rkey;
rdma_hdr->rdma_start.lval = ompi_ptr_ptol(endpoint->eager_rdma_local.base.pval); rdma_hdr->rdma_start.lval = ompi_ptr_ptol(endpoint->eager_rdma_local.base.pval);
BTL_VERBOSE(("sending rkey %lu, rdma_start.lval %llu, pval %p, ival %u type %d and sizeof(rdma_hdr) %d\n", BTL_VERBOSE(("sending rkey %" PRIu32 ", rdma_start.lval %" PRIx64
rdma_hdr->rkey, ", pval %p, ival %" PRIu32 " type %d and sizeof(rdma_hdr) %d\n",
rdma_hdr->rdma_start.lval, rdma_hdr->rkey,
rdma_hdr->rdma_start.pval, rdma_hdr->rdma_start.lval,
rdma_hdr->rdma_start.ival, rdma_hdr->rdma_start.pval,
rdma_hdr->control.type, rdma_hdr->rdma_start.ival,
sizeof(mca_btl_openib_eager_rdma_header_t) rdma_hdr->control.type,
)); (int) sizeof(mca_btl_openib_eager_rdma_header_t)
));
if(endpoint->nbo) { if(endpoint->nbo) {
BTL_OPENIB_EAGER_RDMA_CONTROL_HEADER_HTON((*rdma_hdr)); BTL_OPENIB_EAGER_RDMA_CONTROL_HEADER_HTON((*rdma_hdr));
BTL_VERBOSE(("after HTON: sending rkey %lu, rdma_start.lval %llu, pval %p, ival %u\n", BTL_VERBOSE(("after HTON: sending rkey %" PRIu32 ", rdma_start.lval %" PRIx64 ", pval %p, ival %" PRIu32 "\n",
rdma_hdr->rkey, rdma_hdr->rkey,
rdma_hdr->rdma_start.lval, rdma_hdr->rdma_start.lval,
rdma_hdr->rdma_start.pval, rdma_hdr->rdma_start.pval,
rdma_hdr->rdma_start.ival rdma_hdr->rdma_start.ival
)); ));
} }
rc = mca_btl_openib_endpoint_send(endpoint, frag); rc = mca_btl_openib_endpoint_send(endpoint, frag);
if (OMPI_SUCCESS == rc ||OMPI_ERR_RESOURCE_BUSY == rc) if (OMPI_SUCCESS == rc ||OMPI_ERR_RESOURCE_BUSY == rc)
return OMPI_SUCCESS; return OMPI_SUCCESS;
MCA_BTL_IB_FRAG_RETURN(frag); MCA_BTL_IB_FRAG_RETURN(frag);
BTL_ERROR(("Error sending RDMA buffer", strerror(errno))); BTL_ERROR(("Error sending RDMA buffer: %s", strerror(errno)));
return rc; return rc;
} }

9
ompi/mca/btl/openib/btl_openib_xrc.c
Просмотреть файл

@ -1,5 +1,6 @@
/* /*
* Copyright (c) 2007-2008 Mellanox Technologies. All rights reserved. * Copyright (c) 2007-2008 Mellanox Technologies. All rights reserved.
* Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -43,8 +44,8 @@ int mca_btl_openib_open_xrc_domain(struct mca_btl_openib_device_t *device)
"%s"OPAL_PATH_SEP"openib_xrc_domain_%s", "%s"OPAL_PATH_SEP"openib_xrc_domain_%s",
orte_process_info.job_session_dir, dev_name); orte_process_info.job_session_dir, dev_name);
if (0 > len) { if (0 > len) {
BTL_ERROR(("Failed to allocate memomry for XRC file name\n", BTL_ERROR(("Failed to allocate memomry for XRC file name: %s\n",
strerror(errno))); strerror(errno)));
return OMPI_ERROR; return OMPI_ERROR;
} }
@ -75,13 +76,13 @@ int mca_btl_openib_close_xrc_domain(struct mca_btl_openib_device_t *device)
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
if (ibv_close_xrc_domain(device->xrc_domain)) { if (ibv_close_xrc_domain(device->xrc_domain)) {
BTL_ERROR(("Failed to close XRC domain, errno says %s\n", BTL_ERROR(("Failed to close XRC domain, errno %d says %s\n",
device->xrc_fd, strerror(errno))); device->xrc_fd, strerror(errno)));
return OMPI_ERROR; return OMPI_ERROR;
} }
/* do we need to check exit status */ /* do we need to check exit status */
if (close(device->xrc_fd)) { if (close(device->xrc_fd)) {
BTL_ERROR(("Failed to close XRC file descriptor %s, errno says %s\n", BTL_ERROR(("Failed to close XRC file descriptor, errno %d says %s\n",
device->xrc_fd, strerror(errno))); device->xrc_fd, strerror(errno)));
return OMPI_ERROR; return OMPI_ERROR;
} }

7
ompi/mca/btl/openib/connect/btl_openib_connect_oob.c
Просмотреть файл

@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved. * University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California. * Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* Copyright (c) 2006-2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2006-2009 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2006 Los Alamos National Security, LLC. All rights * Copyright (c) 2006 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2008 Mellanox Technologies. All rights reserved. * Copyright (c) 2008 Mellanox Technologies. All rights reserved.
@ -24,6 +24,7 @@
#include "ompi_config.h" #include "ompi_config.h"
#include "opal/dss/dss.h" #include "opal/dss/dss.h"
#include "opal_stdint.h"
#include "orte/util/show_help.h" #include "orte/util/show_help.h"
#include "opal/util/error.h" #include "opal/util/error.h"
#include "opal/util/output.h" #include "opal/util/output.h"
@ -591,7 +592,7 @@ static int send_connect_data(mca_btl_base_endpoint_t* endpoint,
ORTE_ERROR_LOG(rc); ORTE_ERROR_LOG(rc);
return rc; return rc;
} }
BTL_VERBOSE(("Sent QP Info, LID = %d, SUBNET = %016x\n", BTL_VERBOSE(("Sent QP Info, LID = %d, SUBNET = %" PRIx64 "\n",
endpoint->endpoint_btl->lid, endpoint->endpoint_btl->lid,
endpoint->subnet_id)); endpoint->subnet_id));
@ -715,7 +716,7 @@ static void rml_recv_cb(int status, orte_process_name_t* process_name,
} }
} }
BTL_VERBOSE(("Received QP Info, LID = %d, SUBNET = %016x\n", BTL_VERBOSE(("Received QP Info, LID = %d, SUBNET = %" PRIx64 "\n",
rem_info.rem_lid, rem_info.rem_lid,
rem_info.rem_subnet_id)); rem_info.rem_subnet_id));

2
ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c
Просмотреть файл

@ -1265,7 +1265,7 @@ static int create_dummy_qp(rdmacm_contents_t *contents,
} }
id->verbs = temp; id->verbs = temp;
} }
BTL_VERBOSE(("dummy qp created %p", qpnum)); BTL_VERBOSE(("dummy qp created %d", qpnum));
return OMPI_SUCCESS; return OMPI_SUCCESS;

68
ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c
Просмотреть файл

@ -1,6 +1,6 @@
/* /*
* Copyright (c) 2007-2009 Mellanox Technologies. All rights reserved. * Copyright (c) 2007-2009 Mellanox Technologies. All rights reserved.
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
* *
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -11,6 +11,7 @@
#include "ompi_config.h" #include "ompi_config.h"
#include "opal_stdint.h"
#include "opal/dss/dss.h" #include "opal/dss/dss.h"
#include "opal/util/error.h" #include "opal/util/error.h"
#include "opal/util/output.h" #include "opal/util/output.h"
@ -104,7 +105,7 @@ static int xoob_receive_connect_data(mca_btl_openib_rem_info_t *info, uint16_t *
ORTE_ERROR_LOG(rc); ORTE_ERROR_LOG(rc);
return OMPI_ERROR; return OMPI_ERROR;
} }
BTL_VERBOSE(("Recv unpack Message type = %d", *message_type)); BTL_VERBOSE(("Recv unpack Message type = %d\n", *message_type));
BTL_VERBOSE(("unpacking %d of %d\n", cnt, OPAL_UINT64)); BTL_VERBOSE(("unpacking %d of %d\n", cnt, OPAL_UINT64));
rc = opal_dss.unpack(buffer, &info->rem_subnet_id, &cnt, OPAL_UINT64); rc = opal_dss.unpack(buffer, &info->rem_subnet_id, &cnt, OPAL_UINT64);
@ -112,7 +113,7 @@ static int xoob_receive_connect_data(mca_btl_openib_rem_info_t *info, uint16_t *
ORTE_ERROR_LOG(rc); ORTE_ERROR_LOG(rc);
return OMPI_ERROR; return OMPI_ERROR;
} }
BTL_VERBOSE(("Recv unpack sid = %d", info->rem_subnet_id)); BTL_VERBOSE(("Recv unpack sid = %" PRIx64 "\n", info->rem_subnet_id));
BTL_VERBOSE(("unpacking %d of %d\n", cnt, OPAL_UINT16)); BTL_VERBOSE(("unpacking %d of %d\n", cnt, OPAL_UINT16));
rc = opal_dss.unpack(buffer, &info->rem_lid, &cnt, OPAL_UINT16); rc = opal_dss.unpack(buffer, &info->rem_lid, &cnt, OPAL_UINT16);
@ -230,7 +231,7 @@ static int xoob_send_connect_data(mca_btl_base_endpoint_t* endpoint,
return rc; return rc;
} }
BTL_VERBOSE(("Send pack sid = %d", endpoint->subnet_id)); BTL_VERBOSE(("Send pack sid = %" PRIx64 "\n", endpoint->subnet_id));
BTL_VERBOSE(("packing %d of %d\n", 1, OPAL_UINT64)); BTL_VERBOSE(("packing %d of %d\n", 1, OPAL_UINT64));
rc = opal_dss.pack(buffer, &endpoint->subnet_id, 1, OPAL_UINT64); rc = opal_dss.pack(buffer, &endpoint->subnet_id, 1, OPAL_UINT64);
if (ORTE_SUCCESS != rc) { if (ORTE_SUCCESS != rc) {
@ -356,7 +357,7 @@ static int xoob_send_connect_data(mca_btl_base_endpoint_t* endpoint,
return rc; return rc;
} }
BTL_VERBOSE(("Send QP Info, LID = %d, SUBNET = %016x\n, Message type = %d", BTL_VERBOSE(("Send QP Info, LID = %d, SUBNET = %" PRIx64 ", Message type = %d",
endpoint->endpoint_btl->lid, endpoint->endpoint_btl->lid,
endpoint->subnet_id, endpoint->subnet_id,
message_type)); message_type));
@ -653,7 +654,7 @@ static mca_btl_openib_endpoint_t* xoob_find_endpoint(orte_process_name_t* proces
bool found = false; bool found = false;
BTL_VERBOSE(("Searching for ep and proc with follow parameters:" BTL_VERBOSE(("Searching for ep and proc with follow parameters:"
"jobid %d, vpid %d, sid %d, lid %d", "jobid %d, vpid %d, sid %" PRIx64 ", lid %d",
process_name->jobid, process_name->vpid, subnet_id, lid)); process_name->jobid, process_name->vpid, subnet_id, lid));
/* find ibproc */ /* find ibproc */
for (ib_proc = (mca_btl_openib_proc_t*) for (ib_proc = (mca_btl_openib_proc_t*)
@ -709,10 +710,10 @@ static void xoob_restart_connect(mca_btl_base_endpoint_t *endpoint)
case MCA_BTL_IB_ADDR_CONNECTED: case MCA_BTL_IB_ADDR_CONNECTED:
/* so we have the send qp, we just need the recive site. /* so we have the send qp, we just need the recive site.
* Send request for SRQ numbers */ * Send request for SRQ numbers */
BTL_VERBOSE(("Restart The IB addr: sid %d lid %d" BTL_VERBOSE(("Restart The IB addr: sid %" PRIx64 " lid %d"
"in MCA_BTL_IB_ADDR_CONNECTED status," "in MCA_BTL_IB_ADDR_CONNECTED status,"
" Changing to MCA_BTL_IB_ADDR_CLOSED and starting from scratch\n", " Changing to MCA_BTL_IB_ADDR_CLOSED and starting from scratch\n",
endpoint->ib_addr->subnet_id,endpoint->ib_addr->lid)); endpoint->ib_addr->subnet_id,endpoint->ib_addr->lid));
/* Switching back to closed and starting from scratch */ /* Switching back to closed and starting from scratch */
endpoint->ib_addr->status = MCA_BTL_IB_ADDR_CLOSED; endpoint->ib_addr->status = MCA_BTL_IB_ADDR_CLOSED;
/* destroy the qp */ /* destroy the qp */
@ -723,10 +724,10 @@ static void xoob_restart_connect(mca_btl_base_endpoint_t *endpoint)
BTL_ERROR(("Failed to destroy QP")); BTL_ERROR(("Failed to destroy QP"));
case MCA_BTL_IB_ADDR_CLOSED: case MCA_BTL_IB_ADDR_CLOSED:
case MCA_BTL_IB_ADDR_CONNECTING: case MCA_BTL_IB_ADDR_CONNECTING:
BTL_VERBOSE(("Restart The IB addr: sid %d lid %d" BTL_VERBOSE(("Restart The IB addr: sid %" PRIx64 " lid %d"
"in MCA_BTL_IB_ADDR_CONNECTING or MCA_BTL_IB_ADDR_CLOSED status," "in MCA_BTL_IB_ADDR_CONNECTING or MCA_BTL_IB_ADDR_CLOSED status,"
" starting from scratch\n", " starting from scratch\n",
endpoint->ib_addr->subnet_id,endpoint->ib_addr->lid)); endpoint->ib_addr->subnet_id,endpoint->ib_addr->lid));
OPAL_THREAD_UNLOCK(&endpoint->ib_addr->addr_lock); OPAL_THREAD_UNLOCK(&endpoint->ib_addr->addr_lock);
/* xoob_module_start_connect() should automaticly handle all other cases */ /* xoob_module_start_connect() should automaticly handle all other cases */
if (OMPI_SUCCESS != xoob_module_start_connect(NULL, endpoint)) if (OMPI_SUCCESS != xoob_module_start_connect(NULL, endpoint))
@ -795,7 +796,7 @@ static void xoob_rml_recv_cb(int status, orte_process_name_t* process_name,
/* Processing message */ /* Processing message */
switch (message_type) { switch (message_type) {
case ENDPOINT_XOOB_CONNECT_REQUEST: case ENDPOINT_XOOB_CONNECT_REQUEST:
BTL_VERBOSE(("Received ENDPOINT_XOOB_CONNECT_REQUEST: lid %d, sid %d, rlid %d\n", BTL_VERBOSE(("Received ENDPOINT_XOOB_CONNECT_REQUEST: lid %d, sid %" PRIx64 ", rlid %d\n",
rem_info.rem_lid, rem_info.rem_lid,
rem_info.rem_subnet_id, rem_info.rem_subnet_id,
requested_lid)); requested_lid));
@ -803,8 +804,9 @@ static void xoob_rml_recv_cb(int status, orte_process_name_t* process_name,
requested_lid, message_type); requested_lid, message_type);
if ( NULL == ib_endpoint) { if ( NULL == ib_endpoint) {
BTL_ERROR(("Got ENDPOINT_XOOB_CONNECT_REQUEST." BTL_ERROR(("Got ENDPOINT_XOOB_CONNECT_REQUEST."
" Failed to find endpoint with subnet %d and LID %d", " Failed to find endpoint with subnet %" PRIx64
rem_info.rem_subnet_id,requested_lid)); " and LID %d",
rem_info.rem_subnet_id,requested_lid));
mca_btl_openib_endpoint_invoke_error(NULL); mca_btl_openib_endpoint_invoke_error(NULL);
return; return;
} }
@ -827,14 +829,14 @@ static void xoob_rml_recv_cb(int status, orte_process_name_t* process_name,
break; break;
case ENDPOINT_XOOB_CONNECT_XRC_REQUEST: case ENDPOINT_XOOB_CONNECT_XRC_REQUEST:
/* pasha we don't need the remote lid here ??*/ /* pasha we don't need the remote lid here ??*/
BTL_VERBOSE(("Received ENDPOINT_XOOB_CONNECT_XRC_REQUEST: lid %d, sid %d\n", BTL_VERBOSE(("Received ENDPOINT_XOOB_CONNECT_XRC_REQUEST: lid %d, sid %" PRIx64 "\n",
rem_info.rem_lid, rem_info.rem_lid,
rem_info.rem_subnet_id)); rem_info.rem_subnet_id));
ib_endpoint = xoob_find_endpoint(process_name,rem_info.rem_subnet_id, ib_endpoint = xoob_find_endpoint(process_name,rem_info.rem_subnet_id,
requested_lid, message_type); requested_lid, message_type);
if ( NULL == ib_endpoint) { if ( NULL == ib_endpoint) {
BTL_ERROR(("Got ENDPOINT_XOOB_CONNECT_XRC_REQUEST." BTL_ERROR(("Got ENDPOINT_XOOB_CONNECT_XRC_REQUEST."
" Failed to find endpoint with subnet %d and LID %d", " Failed to find endpoint with subnet %" PRIx64 " and LID %d",
rem_info.rem_subnet_id,requested_lid)); rem_info.rem_subnet_id,requested_lid));
mca_btl_openib_endpoint_invoke_error(NULL); mca_btl_openib_endpoint_invoke_error(NULL);
return; return;
@ -867,14 +869,14 @@ static void xoob_rml_recv_cb(int status, orte_process_name_t* process_name,
/* enable pooling for this btl */ /* enable pooling for this btl */
break; break;
case ENDPOINT_XOOB_CONNECT_RESPONSE: case ENDPOINT_XOOB_CONNECT_RESPONSE:
BTL_VERBOSE(("Received ENDPOINT_XOOB_CONNECT_RESPONSE: lid %d, sid %d\n", BTL_VERBOSE(("Received ENDPOINT_XOOB_CONNECT_RESPONSE: lid %d, sid %" PRIx64 "\n",
rem_info.rem_lid, rem_info.rem_lid,
rem_info.rem_subnet_id)); rem_info.rem_subnet_id));
ib_endpoint = xoob_find_endpoint(process_name, rem_info.rem_subnet_id, ib_endpoint = xoob_find_endpoint(process_name, rem_info.rem_subnet_id,
rem_info.rem_lid, message_type); rem_info.rem_lid, message_type);
if ( NULL == ib_endpoint) { if ( NULL == ib_endpoint) {
BTL_ERROR(("Got ENDPOINT_XOOB_CONNECT_RESPONSE." BTL_ERROR(("Got ENDPOINT_XOOB_CONNECT_RESPONSE."
" Failed to find endpoint with subnet %d and LID %d", " Failed to find endpoint with subnet %" PRIx64 " and LID %d",
rem_info.rem_subnet_id,rem_info.rem_lid)); rem_info.rem_subnet_id,rem_info.rem_lid));
mca_btl_openib_endpoint_invoke_error(NULL); mca_btl_openib_endpoint_invoke_error(NULL);
return; return;
@ -885,10 +887,12 @@ static void xoob_rml_recv_cb(int status, orte_process_name_t* process_name,
/* update ib_addr with remote qp number */ /* update ib_addr with remote qp number */
ib_endpoint->ib_addr->remote_xrc_rcv_qp_num = ib_endpoint->ib_addr->remote_xrc_rcv_qp_num =
ib_endpoint->rem_info.rem_qps->rem_qp_num; ib_endpoint->rem_info.rem_qps->rem_qp_num;
BTL_VERBOSE(("rem_info: lid %d, sid %d ep %d %d", BTL_VERBOSE(("rem_info: lid %d, sid %" PRIx64
rem_info.rem_lid, " ep %d %" PRIx64 "\n",
rem_info.rem_subnet_id, rem_info.rem_lid,
ib_endpoint->rem_info.rem_lid,ib_endpoint->rem_info.rem_subnet_id)); rem_info.rem_subnet_id,
ib_endpoint->rem_info.rem_lid,
ib_endpoint->rem_info.rem_subnet_id));
if (OMPI_SUCCESS != xoob_send_qp_connect(ib_endpoint, &rem_info)) { if (OMPI_SUCCESS != xoob_send_qp_connect(ib_endpoint, &rem_info)) {
BTL_ERROR(("Failed to connect endpoint\n")); BTL_ERROR(("Failed to connect endpoint\n"));
mca_btl_openib_endpoint_invoke_error(NULL); mca_btl_openib_endpoint_invoke_error(NULL);
@ -898,14 +902,14 @@ static void xoob_rml_recv_cb(int status, orte_process_name_t* process_name,
OPAL_THREAD_UNLOCK(&ib_endpoint->endpoint_lock); OPAL_THREAD_UNLOCK(&ib_endpoint->endpoint_lock);
break; break;
case ENDPOINT_XOOB_CONNECT_XRC_RESPONSE: case ENDPOINT_XOOB_CONNECT_XRC_RESPONSE:
BTL_VERBOSE(("Received ENDPOINT_XOOB_CONNECT_XRC_RESPONSE: lid %d, sid %d\n", BTL_VERBOSE(("Received ENDPOINT_XOOB_CONNECT_XRC_RESPONSE: lid %d, sid %" PRIx64 "\n",
rem_info.rem_lid, rem_info.rem_lid,
rem_info.rem_subnet_id)); rem_info.rem_subnet_id));
ib_endpoint = xoob_find_endpoint(process_name, rem_info.rem_subnet_id, ib_endpoint = xoob_find_endpoint(process_name, rem_info.rem_subnet_id,
rem_info.rem_lid, message_type); rem_info.rem_lid, message_type);
if ( NULL == ib_endpoint) { if ( NULL == ib_endpoint) {
BTL_ERROR(("Got ENDPOINT_XOOB_CONNECT_XRC_RESPONSE." BTL_ERROR(("Got ENDPOINT_XOOB_CONNECT_XRC_RESPONSE."
" Failed to find endpoint with subnet %d and LID %d", " Failed to find endpoint with subnet %" PRIx64 " and LID %d",
rem_info.rem_subnet_id,rem_info.rem_lid)); rem_info.rem_subnet_id,rem_info.rem_lid));
mca_btl_openib_endpoint_invoke_error(NULL); mca_btl_openib_endpoint_invoke_error(NULL);
return; return;
@ -919,14 +923,14 @@ static void xoob_rml_recv_cb(int status, orte_process_name_t* process_name,
case ENDPOINT_XOOB_CONNECT_XRC_NR_RESPONSE: case ENDPOINT_XOOB_CONNECT_XRC_NR_RESPONSE:
/* The XRC recv site already was destroyed so we need /* The XRC recv site already was destroyed so we need
* start to bringup the connection from scratch */ * start to bringup the connection from scratch */
BTL_VERBOSE(("Received ENDPOINT_XOOB_CONNECT_XRC_NR_RESPONSE: lid %d, sid %d\n", BTL_VERBOSE(("Received ENDPOINT_XOOB_CONNECT_XRC_NR_RESPONSE: lid %d, sid %" PRIx64 "\n",
rem_info.rem_lid, rem_info.rem_lid,
rem_info.rem_subnet_id)); rem_info.rem_subnet_id));
ib_endpoint = xoob_find_endpoint(process_name, rem_info.rem_subnet_id, ib_endpoint = xoob_find_endpoint(process_name, rem_info.rem_subnet_id,
rem_info.rem_lid, message_type); rem_info.rem_lid, message_type);
if ( NULL == ib_endpoint) { if ( NULL == ib_endpoint) {
BTL_ERROR(("Got ENDPOINT_XOOB_CONNECT_XRC_NR_RESPONSE." BTL_ERROR(("Got ENDPOINT_XOOB_CONNECT_XRC_NR_RESPONSE."
" Failed to find endpoint with subnet %d and LID %d", " Failed to find endpoint with subnet %" PRIx64 " and LID %d",
rem_info.rem_subnet_id,rem_info.rem_lid)); rem_info.rem_subnet_id,rem_info.rem_lid));
mca_btl_openib_endpoint_invoke_error(NULL); mca_btl_openib_endpoint_invoke_error(NULL);
return; return;
@ -1028,7 +1032,7 @@ static int xoob_module_start_connect(ompi_btl_openib_connect_base_module_t *cpc,
OPAL_THREAD_LOCK(&endpoint->ib_addr->addr_lock); OPAL_THREAD_LOCK(&endpoint->ib_addr->addr_lock);
switch (endpoint->ib_addr->status) { switch (endpoint->ib_addr->status) {
case MCA_BTL_IB_ADDR_CLOSED: case MCA_BTL_IB_ADDR_CLOSED:
BTL_VERBOSE(("The IB addr: sid %d lid %d" BTL_VERBOSE(("The IB addr: sid %" PRIx64 " lid %d"
"in MCA_BTL_IB_ADDR_CLOSED status," "in MCA_BTL_IB_ADDR_CLOSED status,"
" sending ENDPOINT_XOOB_CONNECT_REQUEST\n", " sending ENDPOINT_XOOB_CONNECT_REQUEST\n",
endpoint->ib_addr->subnet_id,endpoint->ib_addr->lid)); endpoint->ib_addr->subnet_id,endpoint->ib_addr->lid));
@ -1045,7 +1049,7 @@ static int xoob_module_start_connect(ompi_btl_openib_connect_base_module_t *cpc,
} }
break; break;
case MCA_BTL_IB_ADDR_CONNECTING: case MCA_BTL_IB_ADDR_CONNECTING:
BTL_VERBOSE(("The IB addr: sid %d lid %d" BTL_VERBOSE(("The IB addr: sid %" PRIx64 " lid %d"
"in MCA_BTL_IB_ADDR_CONNECTING status," "in MCA_BTL_IB_ADDR_CONNECTING status,"
" Subscribing to this address\n", " Subscribing to this address\n",
endpoint->ib_addr->subnet_id,endpoint->ib_addr->lid)); endpoint->ib_addr->subnet_id,endpoint->ib_addr->lid));
@ -1056,7 +1060,7 @@ static int xoob_module_start_connect(ompi_btl_openib_connect_base_module_t *cpc,
case MCA_BTL_IB_ADDR_CONNECTED: case MCA_BTL_IB_ADDR_CONNECTED:
/* so we have the send qp, we just need the recive site. /* so we have the send qp, we just need the recive site.
* Send request for SRQ numbers */ * Send request for SRQ numbers */
BTL_VERBOSE(("The IB addr: sid %d lid %d" BTL_VERBOSE(("The IB addr: sid %" PRIx64 " lid %d"
"in MCA_BTL_IB_ADDR_CONNECTED status," "in MCA_BTL_IB_ADDR_CONNECTED status,"
" sending ENDPOINT_XOOB_CONNECT_XRC_REQUEST\n", " sending ENDPOINT_XOOB_CONNECT_XRC_REQUEST\n",
endpoint->ib_addr->subnet_id,endpoint->ib_addr->lid)); endpoint->ib_addr->subnet_id,endpoint->ib_addr->lid));