Even less warnings.
This commit was SVN r13429.
Этот коммит содержится в:
родитель
56ffbfc5ff
Коммит
79ea6d471b
@ -195,7 +195,7 @@ int ompi_file_finalize(void)
|
||||
we're destroying everything, it isn't worth it */
|
||||
}
|
||||
if (num_unnamed > 0) {
|
||||
opal_output(0, "WARNING: %d unnamed MPI_File handles still allocated at MPI_FINALIZE", num_unnamed);
|
||||
opal_output(0, "WARNING: %lu unnamed MPI_File handles still allocated at MPI_FINALIZE", (unsigned long)num_unnamed);
|
||||
}
|
||||
OBJ_DESTRUCT(&ompi_file_f_to_c_table);
|
||||
|
||||
|
@ -151,8 +151,8 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name,
|
||||
|
||||
/* is addr past end of file ? */
|
||||
if( (unsigned char*)seg+size < addr ) {
|
||||
opal_output(0, "mca_common_sm_mmap_init: memory region too small len %d addr %p\n",
|
||||
size,addr);
|
||||
opal_output(0, "mca_common_sm_mmap_init: memory region too small len %lu addr %p\n",
|
||||
(unsigned long)size, addr);
|
||||
goto file_opened;
|
||||
}
|
||||
map->data_addr = addr;
|
||||
@ -206,7 +206,7 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name,
|
||||
ORTE_RML_TAG_SM_BACK_FILE_CREATED,0);
|
||||
if( rc < 0 ) {
|
||||
opal_output(0, "mca_common_sm_mmap_init: orte_rml.recv failed from %ld with errno=%d\n",
|
||||
0, errno);
|
||||
0L, errno);
|
||||
goto return_error;
|
||||
}
|
||||
/* check to see if file inited correctly */
|
||||
@ -251,8 +251,8 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name,
|
||||
|
||||
/* is addr past end of file ? */
|
||||
if( (unsigned char*)seg+size < addr ) {
|
||||
opal_output(0, "mca_common_sm_mmap_init: memory region too small len %d addr %p\n",
|
||||
size,addr);
|
||||
opal_output(0, "mca_common_sm_mmap_init: memory region too small len %lu addr %p\n",
|
||||
(unsigned long)size,addr);
|
||||
goto return_error;
|
||||
}
|
||||
map->data_addr = addr;
|
||||
|
@ -55,9 +55,9 @@ void mca_mpool_base_mem_cb(void* base, size_t size, void* cbdata,
|
||||
base, size);
|
||||
|
||||
if(rc != OMPI_SUCCESS && true == warn) {
|
||||
opal_output(0, "Memory %p:%llu cannot be freed from the "
|
||||
opal_output(0, "Memory %p:%lu cannot be freed from the "
|
||||
"registration cache. Possible memory corruption.\n",
|
||||
base, size);
|
||||
base, (unsigned long)size);
|
||||
warn = false;
|
||||
}
|
||||
}
|
||||
|
@ -174,7 +174,7 @@ int mca_pml_dr_add_procs(ompi_proc_t** procs, size_t nprocs)
|
||||
endpoint->proc_ompi = procs[i];
|
||||
procs[i]->proc_pml = (struct mca_pml_base_endpoint_t*) endpoint;
|
||||
MCA_PML_DR_DEBUG(10, (0, "%s:%d: adding endpoint %p to proc_pml %p\n",
|
||||
__FILE__, __LINE__, endpoint, procs[i]));
|
||||
__FILE__, __LINE__, (void*)endpoint, (void*)procs[i]));
|
||||
|
||||
/* this won't work for comm spawn and other dynamic
|
||||
processes, but will work for initial job start */
|
||||
|
@ -113,8 +113,8 @@ void mca_pml_dr_recv_frag_callback(
|
||||
(btl->btl_flags & MCA_BTL_FLAGS_NEED_CSUM);
|
||||
|
||||
if(segments->seg_len < sizeof(mca_pml_dr_common_hdr_t)) {
|
||||
MCA_PML_DR_DEBUG(0,(0, "%s:%d: wtf? segments->seg_len:%d < sizeof(mca_pml_dr_common_hdr_t):%d\n",
|
||||
__FILE__, __LINE__, segments->seg_len, sizeof(mca_pml_dr_common_hdr_t)));
|
||||
MCA_PML_DR_DEBUG(0,(0, "%s:%d: wtf? segments->seg_len:%d < sizeof(mca_pml_dr_common_hdr_t):%lu\n",
|
||||
__FILE__, __LINE__, segments->seg_len, (unsigned long)sizeof(mca_pml_dr_common_hdr_t)));
|
||||
|
||||
return;
|
||||
}
|
||||
@ -701,9 +701,9 @@ rematch:
|
||||
mca_pml_dr_recv_frag_ack(btl,
|
||||
(mca_bml_base_endpoint_t*)ompi_proc->proc_bml,
|
||||
&hdr->hdr_common, hdr->hdr_src_ptr.pval, 0, 0);
|
||||
MCA_PML_DR_DEBUG(0,(0, "%s:%d: received corrupted data 0x%08x != 0x%08x (segments %d length %d)\n",
|
||||
__FILE__, __LINE__, csum, hdr->hdr_csum, num_segments,
|
||||
segments[0].seg_len - mca_pml_dr_hdr_size(hdr->hdr_common.hdr_type)));
|
||||
MCA_PML_DR_DEBUG(0,(0, "%s:%d: received corrupted data 0x%08x != 0x%08x (segments %lu length %lu)\n",
|
||||
__FILE__, __LINE__, csum, hdr->hdr_csum, (unsigned long)num_segments,
|
||||
(unsigned long)(segments[0].seg_len - mca_pml_dr_hdr_size(hdr->hdr_common.hdr_type))));
|
||||
MCA_PML_DR_RECV_FRAG_RETURN(frag);
|
||||
OPAL_THREAD_UNLOCK(&comm->matching_lock);
|
||||
return false;
|
||||
@ -970,7 +970,7 @@ rematch:
|
||||
match->req_proc = proc;
|
||||
match->req_endpoint = (mca_pml_dr_endpoint_t*)proc->ompi_proc->proc_pml;
|
||||
MCA_PML_DR_DEBUG(10, (0, "%s:%d: adding endpoint %p match %p\n",
|
||||
__FILE__, __LINE__, proc->ompi_proc->proc_pml, match->req_endpoint));
|
||||
__FILE__, __LINE__, (void*)proc->ompi_proc->proc_pml, (void*)match->req_endpoint));
|
||||
|
||||
/* add this fragment descriptor to the list of
|
||||
* descriptors to be processed later
|
||||
|
@ -1111,7 +1111,7 @@ void mca_pml_dr_send_request_frag_ack(
|
||||
|
||||
/* need to retransmit? */
|
||||
if(vfrag->vf_ack != vfrag->vf_mask) {
|
||||
MCA_PML_DR_DEBUG(0,(0, "got a vfrag NACK, retransmitting %x\n", ~vfrag->vf_ack));
|
||||
MCA_PML_DR_DEBUG(0,(0, "got a vfrag NACK, retransmitting %llx\n", ~vfrag->vf_ack));
|
||||
MCA_PML_DR_SEND_REQUEST_VFRAG_RETRANS(sendreq,vfrag);
|
||||
schedule = true;
|
||||
|
||||
|
@ -70,7 +70,7 @@ static void mca_pml_dr_vfrag_wdog_timeout(int fd, short event, void* data)
|
||||
mca_pml_dr_send_request_t* sendreq = (mca_pml_dr_send_request_t*)vfrag->vf_send.pval;
|
||||
|
||||
MCA_PML_DR_DEBUG(0,(0, "%s:%d:%s: wdog timeout: %p vid: %d",
|
||||
__FILE__, __LINE__, __func__, vfrag, vfrag->vf_id));
|
||||
__FILE__, __LINE__, __func__, (void*)vfrag, vfrag->vf_id));
|
||||
|
||||
/* update pending counts */
|
||||
OPAL_THREAD_ADD_SIZE_T(&sendreq->req_pipeline_depth,-vfrag->vf_pending);
|
||||
@ -114,7 +114,7 @@ static void mca_pml_dr_vfrag_ack_timeout(int fd, short event, void* data)
|
||||
{
|
||||
mca_pml_dr_vfrag_t* vfrag = (mca_pml_dr_vfrag_t*) data;
|
||||
MCA_PML_DR_DEBUG(0,(0, "%s:%d:%s: ack timeout: %p",
|
||||
__FILE__, __LINE__, __func__, vfrag));
|
||||
__FILE__, __LINE__, __func__, (void*)vfrag));
|
||||
|
||||
/* stop ack timer */
|
||||
MCA_PML_DR_VFRAG_ACK_STOP(vfrag);
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user