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

Silence warnings in a .opal_ignore'd component

Просмотр исходного кода 
Signed-off-by: Ralph Castain <rhc@open-mpi.org>
Этот коммит содержится в:
Ralph Castain 2016-11-28 13:18:25 -08:00
родитель 001095399d
Коммит f7699a7eeb
2 изменённых файлов: 42 добавлений и 44 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

52
orte/mca/rml/ofi/rml_ofi_component.c
Просмотреть файл

@ -313,7 +313,7 @@ orte_rml_ofi_progress(ofi_transport_ofi_prov_t* prov)
opal_output_verbose(15, orte_rml_base_framework.framework_output,
"%s cq read for OFI ofi_provid %d - wc.flags = %llx",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
prov->ofi_prov_id, wc.flags);
prov->ofi_prov_id, (long long unsigned int)wc.flags);
count++;
// check the flags to see if this is a send-completion or receive
if ( wc.flags & FI_SEND )
@ -382,7 +382,7 @@ orte_rml_ofi_progress(ofi_transport_ofi_prov_t* prov)
}else {
opal_output_verbose(1,orte_rml_base_framework.framework_output,
"CQ has unhandled completion event with FLAG wc.flags = 0x%llx",
wc.flags);
(long long unsigned int)wc.flags);
}
} else if (ret == -FI_EAVAIL) {
/**
@ -453,7 +453,7 @@ int cq_progress_handler(int sd, short flags, void *cbdata)
}
/*
/*
* Returns the number of ofi-providers available
*/
static int rml_ofi_component_init(void)
@ -473,7 +473,7 @@ static int rml_ofi_component_init(void)
return orte_rml_ofi.ofi_prov_open_num;
}
/**
* Hints to filter providers
* See man fi_getinfo for a list of all filters
@ -716,7 +716,7 @@ static int rml_ofi_component_init(void)
if (ORTE_PROC_IS_APP) {
asprintf(&pmix_key,"%s%d",orte_rml_ofi.ofi_prov[cur_ofi_prov].fabric_info->fabric_attr->prov_name,cur_ofi_prov);
opal_output_verbose(1, orte_rml_base_framework.framework_output,
"%s calling OPAL_MODEX_SEND_STRING for key - %s ",
"%s calling OPAL_MODEX_SEND_STRING for key - %s ",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), pmix_key );
OPAL_MODEX_SEND_STRING( ret, OPAL_PMIX_GLOBAL,
pmix_key,
@ -730,7 +730,7 @@ static int rml_ofi_component_init(void)
"%s:%d In FI_SOCKADDR_IN. ",__FILE__,__LINE__);
/* Address is of type sockaddr_in (IPv4) */
opal_output_verbose(1,orte_rml_base_framework.framework_output,
"%s sending Opal modex string for ofi prov_id %d, epnamelen = %d ",
"%s sending Opal modex string for ofi prov_id %d, epnamelen = %lu ",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),cur_ofi_prov,orte_rml_ofi.ofi_prov[cur_ofi_prov].epnamelen);
/*[debug] - print the sockaddr - port and s_addr */
struct sockaddr_in* ep_sockaddr = (struct sockaddr_in*)orte_rml_ofi.ofi_prov[cur_ofi_prov].ep_name;
@ -869,7 +869,7 @@ int get_ofi_prov_id( opal_list_t *attributes)
int ofi_prov_id = RML_OFI_PROV_ID_INVALID, prov_num=0;
char *provider = NULL, *transport = NULL;
char *ethernet="sockets", *fabric="psm2";
char *ethernet="sockets", *fabric="psm2";
struct fi_info *cur_fi;
/* check the list of attributes to see if we should respond
@ -910,7 +910,7 @@ int get_ofi_prov_id( opal_list_t *attributes)
return ofi_prov_id;
}
/*
/*
* Allocate a new module and initialise ofi_prov information
* for the requested provider and return the module *
*/
@ -977,7 +977,7 @@ static orte_rml_base_module_t* open_conduit(opal_list_t *attributes)
"%s - Init did not open any Ofi endpoints, returning NULL",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
return NULL;
}
}
/* someone may require this specific component, so look for "ofi" */
@ -1013,7 +1013,7 @@ static orte_rml_base_module_t* open_conduit(opal_list_t *attributes)
NULL != comp_attrib) {
opal_output_verbose(20,orte_rml_base_framework.framework_output,
"%s - Forcibly returning ofi socket provider for ethernet transport request",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),comp_attrib);
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
comps = opal_argv_split(comp_attrib, ',');
for (i=0; NULL != comps[i]; i++) {
if (0 == strcmp(comps[i], "ethernet")) {
@ -1027,7 +1027,7 @@ static orte_rml_base_module_t* open_conduit(opal_list_t *attributes)
}
opal_argv_free(comps);
}
/*[Debug]
/*[Debug] */
/* Alternatively, check the attributes to see if we qualify - we only handle
* "pt2pt" */
@ -1067,7 +1067,7 @@ static char* ofi_get_contact_info(void)
char *turi, *final=NULL, *tmp, *addrtype;
int rc=ORTE_SUCCESS, cur_ofi_prov=0;
struct sockaddr_in* ep_sockaddr;
/* start with our process name */
if (ORTE_SUCCESS != (rc = orte_util_convert_process_name_to_string(&final, ORTE_PROC_MY_NAME))) {
/* [TODO] ORTE_ERROR_LOG(rc); */
@ -1089,11 +1089,11 @@ static char* ofi_get_contact_info(void)
free(addrtype);
free(turi);
free(final);
final = tmp;
}
final = tmp;
}
}
opal_output_verbose(10,orte_rml_base_framework.framework_output,
"[%s] get_contact_info returns string - %s ", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),final);
"[%s] get_contact_info returns string - %s ", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),final);
return final;
}
@ -1118,7 +1118,7 @@ static void ofi_set_contact_info (const char *uri)
uris = strdup(uri);
process_uri(uris);
free(uris);
free(uris);
return;
}
@ -1130,8 +1130,8 @@ static void process_uri( char *uri)
int rc, i=0, tot_reqd = 1, tot_found = 0;
uint64_t ui64;
orte_rml_ofi_peer_t *pr;
void *ep_name;
struct sockaddr_in* ep_sockaddr;
/* find the first semi-colon in the string */
cptr = strchr(uri, ';');
if (NULL == cptr) {
@ -1141,7 +1141,7 @@ static void process_uri( char *uri)
*/
ORTE_ERROR_LOG(ORTE_ERR_BAD_PARAM);
return;
}
}
*cptr = '\0';
cptr++;
@ -1184,22 +1184,22 @@ static void process_uri( char *uri)
"%s rml:ofi: out of memory",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
continue;
}
/* Handle the OFI address types in the uri - OFIADDR(ofiaddr) */
}
/* Handle the OFI address types in the uri - OFIADDR(ofiaddr) */
if (0 == strncmp(ofiuri, OFIADDR, strlen(OFIADDR)) ) {
/* allocate and initialise the peer object to be inserted in hashtable */
pr->ofi_ep_len = sizeof(struct sockaddr_in);
ep_sockaddr = malloc( sizeof ( struct sockaddr_in) );
/* ofiuri for socket provider is of format - ofi-socket:<sin_family,sin_addr,sin_port> */
convert_to_sockaddr(ofiuri, ep_sockaddr);
convert_to_sockaddr(ofiuri, ep_sockaddr);
pr->ofi_ep = (void *)ep_sockaddr;
tot_found++;
}
}
free( ofiuri);
}
/* if atleast one OFI address is known for peer insert it */
if( 1 <= tot_found ) {
if (OPAL_SUCCESS !=
if (OPAL_SUCCESS !=
(rc = opal_hash_table_set_value_uint64(&orte_rml_ofi.peers, ui64, (void*)pr))) {
opal_output_verbose(15, orte_rml_base_framework.framework_output,
"%s: ofi peer address insertion failed for peer %s ",
@ -1219,7 +1219,7 @@ static void process_uri( char *uri)
opal_output_verbose(15,orte_rml_base_framework.framework_output,
"%s OFI set_name() port = 0x%x, InternetAddr = %s ",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),ntohs(ep_sockaddr->sin_port),inet_ntoa(ep_sockaddr->sin_addr));
}
}
}
opal_output_verbose(10,orte_rml_base_framework.framework_output,
"%s OFI end of set_contact_info()",
@ -1234,7 +1234,6 @@ void convert_to_sockaddr( char *ofiuri, struct sockaddr_in* ep_sockaddr)
{
char *tmp, *sin_fly, *sin_port, *sin_addr;
short port;
int res;
tmp = strchr(ofiuri,':');
sin_fly = tmp+1;
@ -1251,9 +1250,8 @@ void convert_to_sockaddr( char *ofiuri, struct sockaddr_in* ep_sockaddr)
ep_sockaddr->sin_family = atoi( sin_fly );
port = atoi( sin_port);
ep_sockaddr->sin_port = htons(port);
res = inet_aton(sin_addr,(struct in_addr *)&ep_sockaddr->sin_addr);
opal_output_verbose(1,orte_rml_base_framework.framework_output,
"%s OFI convert_to_sockaddr() port = 0x%x decimal-%d, InternetAddr = %s ",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),ntohs(ep_sockaddr->sin_port),ntohs(ep_sockaddr->sin_port),
inet_ntoa(ep_sockaddr->sin_addr));
}
}

34
orte/mca/rml/ofi/rml_ofi_send.c
Просмотреть файл

@ -134,7 +134,7 @@ static void send_self_exe(int fd, short args, void* data)
/** Send callback */
/* [Desc] This is called from the progress fn when a send completion
** is received in the cq
** wc [in] : the completion queue data entry
** wc [in] : the completion queue data entry
** ofi_send_req [in]: ofi send request with the send msg and callback
*/
int orte_rml_ofi_send_callback(struct fi_cq_data_entry *wc,
@ -174,7 +174,7 @@ int orte_rml_ofi_send_callback(struct fi_cq_data_entry *wc,
/** Error callback */
/* [Desc] This is called from the progress fn when a send completion
** is received in the cq
** wc [in] : the completion queue data entry
** wc [in] : the completion queue data entry
** ofi_send_req [in]: ofi send request with the send msg and callback
*/
int orte_rml_ofi_error_callback(struct fi_cq_err_entry *error,
@ -195,7 +195,7 @@ int orte_rml_ofi_error_callback(struct fi_cq_err_entry *error,
/** Recv handler */
/* [Desc] This is called from the progress fn when a recv completion
** is received in the cq
** wc [in] : the completion queue data entry */
** wc [in] : the completion queue data entry */
int orte_rml_ofi_recv_handler(struct fi_cq_data_entry *wc, uint8_t ofi_prov_id)
{
orte_rml_ofi_msg_header_t msg_hdr;
@ -435,7 +435,7 @@ static void send_msg(int fd, short args, void *cbdata)
ORTE_NAME_PRINT(peer), tag);
/* get the peer address by doing modex_receive */
/* get the peer address by doing modex_receive */
opal_output_verbose(10, orte_rml_base_framework.framework_output,
"%s calling OPAL_MODEX_RECV_STRING ", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME) );
// if dest is same as me then instead of doing lookup just populate the dest_ep_name
@ -451,9 +451,9 @@ static void send_msg(int fd, short args, void *cbdata)
if (ORTE_PROC_IS_APP ) {
asprintf(&pmix_key,"%s%d",orte_rml_ofi.ofi_prov[ofi_prov_id].fabric_info->fabric_attr->prov_name,ofi_prov_id);
opal_output_verbose(1, orte_rml_base_framework.framework_output,
"%s calling OPAL_MODEX_RECV_STRING for ORTE_PROC_APP peer - %s, key - %s ",
"%s calling OPAL_MODEX_RECV_STRING for ORTE_PROC_APP peer - %s, key - %s ",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(peer),pmix_key );
OPAL_MODEX_RECV_STRING(ret, pmix_key, peer , (char **) &dest_ep_name, &dest_ep_namelen);
OPAL_MODEX_RECV_STRING(ret, pmix_key, peer , (uint8_t **) &dest_ep_name, &dest_ep_namelen);
opal_output_verbose(10, orte_rml_base_framework.framework_output, "Returned from MODEX_RECV");
opal_output_verbose(50, orte_rml_base_framework.framework_output,
"%s Return value from OPAL_MODEX_RECV_STRING - %d, length returned - %lu",
@ -461,7 +461,7 @@ static void send_msg(int fd, short args, void *cbdata)
free(pmix_key);
} else {
opal_output_verbose(1, orte_rml_base_framework.framework_output,
"%s calling OPAL_MODEX_RECV_STRING for DAEMON peer %s",
"%s calling OPAL_MODEX_RECV_STRING for DAEMON peer %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(peer));
if (OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, peer, ORTE_PROC_MY_NAME)) {
opal_output_verbose(1, orte_rml_base_framework.framework_output,
@ -530,19 +530,19 @@ static void send_msg(int fd, short args, void *cbdata)
*/
ORTE_RML_ACTIVATE_MESSAGE(rcv);
OBJ_RELEASE(req);
return;
return;
} else {
memcpy(&ui64, (char*)peer, sizeof(uint64_t));
if (OPAL_SUCCESS != opal_hash_table_get_value_uint64(&orte_rml_ofi.peers,
ui64, (void**)&pr) || NULL == pr) {
opal_output_verbose(1, orte_rml_base_framework.framework_output,
"%s rml:ofi: Send failed to get peer OFI contact info ",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
return;
}
opal_output_verbose(1, orte_rml_base_framework.framework_output,
"%s rml:ofi: OFI peer contact info got from hash table",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
dest_ep_name = pr->ofi_ep;
dest_ep_namelen = pr->ofi_ep_len;
ret = OPAL_SUCCESS;
@ -557,7 +557,7 @@ static void send_msg(int fd, short args, void *cbdata)
/*[debug] - print the sockaddr - port and s_addr */
ep_sockaddr = (struct sockaddr_in*)dest_ep_name;
opal_output_verbose(1,orte_rml_base_framework.framework_output,
"%s peer %s epnamelen is %d, port = %d (or) 0x%x, InternetAddr = 0x%s ",
"%s peer %s epnamelen is %lu, port = %d (or) 0x%x, InternetAddr = 0x%s ",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),ORTE_NAME_PRINT(peer),
orte_rml_ofi.ofi_prov[ofi_prov_id].epnamelen,ntohs(ep_sockaddr->sin_port),
ntohs(ep_sockaddr->sin_port),inet_ntoa(ep_sockaddr->sin_addr));
@ -576,8 +576,8 @@ static void send_msg(int fd, short args, void *cbdata)
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),ret );
/* call the send-callback fn with error and return, also return failure status */
snd->status = ORTE_ERR_ADDRESSEE_UNKNOWN;
ORTE_RML_SEND_COMPLETE(snd);
ORTE_RML_SEND_COMPLETE(snd);
return;
}
} else {
@ -597,12 +597,12 @@ static void send_msg(int fd, short args, void *cbdata)
ofi_send_req->completion_count = 1;
/* [DESC] we want to send the pid,seqnum,tag in addition to the data
* copy all of this to header of message from the ofi_send_t* send
* copy all of this to header of message from the ofi_send_t* send
*/
ofi_send_req->hdr.dst = ofi_send_req->send->dst;
ofi_send_req->hdr.origin = ofi_send_req->send->origin;
ofi_send_req->hdr.seq_num = ofi_send_req->send->seq_num;
ofi_send_req->hdr.tag = ofi_send_req->send->tag;
ofi_send_req->hdr.tag = ofi_send_req->send->tag;
/*
* also insert ofi plugin specific header details -
@ -658,7 +658,7 @@ static void send_msg(int fd, short args, void *cbdata)
ofi_send_req->hdr.tot_pkts = total_packets;
opal_output_verbose(15, orte_rml_base_framework.framework_output,
"%s datalen_per_pkt = %lu, ofi_send_req->length= %d, total packets = %d",
"%s datalen_per_pkt = %lu, ofi_send_req->length= %lu, total packets = %d",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), datalen_per_pkt, ofi_send_req->length, total_packets );
/* in a loop send create and send the packets */
@ -676,7 +676,7 @@ static void send_msg(int fd, short args, void *cbdata)
ofi_msg_pkt->data = malloc( ofi_msg_pkt->pkt_size);
memcpy(ofi_msg_pkt->data, &ofi_send_req->hdr, hdrsize );
memcpy( ( (char *)ofi_msg_pkt->data + hdrsize ),
(ofi_send_req->data_blob + sent_data),
((char*)ofi_send_req->data_blob + sent_data),
data_in_pkt);
opal_output_verbose(15, orte_rml_base_framework.framework_output,
"%s Copying header, data into packets completed",