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

remove tabs. Remove old code that was commented out.

Просмотр исходного кода 
This commit was SVN r15975.
Этот коммит содержится в:
Rich Graham 2007-08-28 03:08:36 +00:00
родитель 4d58f9aed7
Коммит bc97d22182
2 изменённых файлов: 10 добавлений и 19 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
ompi/mca/btl/sm/btl_sm.c
Просмотреть файл

@ -397,7 +397,7 @@ int mca_btl_sm_add_procs(
segment_header.base_shared_mem_segment,
mca_btl_sm_component.sm_mpool_base);
mca_btl_sm_component.sm_ctl_header->segment_header.
mca_btl_sm_component.sm_ctl_header->segment_header.
base_shared_mem_flags = (volatile int *)
ADDR2OFFSET(mca_btl_sm_component.sm_ctl_header->segment_header.
base_shared_mem_flags,
@ -435,11 +435,11 @@ int mca_btl_sm_add_procs(
* flags are set */
opal_atomic_wmb();
/* Set my flag to 1 (convert from relative address first) */
/* Set my flag to 1 (convert from relative address first) */
tmp_int_ptr=(volatile int *)
OFFSET2ADDR(mca_btl_sm_component.sm_ctl_header->segment_header.
base_shared_mem_flags, mca_btl_sm_component.sm_mpool_base);
tmp_int_ptr[mca_btl_sm_component.my_smp_rank]=1;
tmp_int_ptr[mca_btl_sm_component.my_smp_rank]=1;
opal_atomic_wmb();
/*
@ -470,11 +470,11 @@ int mca_btl_sm_add_procs(
return_code = OMPI_ERR_OUT_OF_RESOURCE;
goto CLEANUP;
}
my_fifos[j].head_lock = (opal_atomic_lock_t*)buf;
my_fifos[j].tail_lock = (opal_atomic_lock_t*)(buf +
CACHE_LINE_SIZE);
opal_atomic_init(my_fifos[j].head_lock, OPAL_ATOMIC_UNLOCKED);
opal_atomic_init(my_fifos[j].tail_lock, OPAL_ATOMIC_UNLOCKED);
my_fifos[j].head_lock = (opal_atomic_lock_t*)buf;
my_fifos[j].tail_lock = (opal_atomic_lock_t*)(buf +
CACHE_LINE_SIZE);
opal_atomic_init(my_fifos[j].head_lock, OPAL_ATOMIC_UNLOCKED);
opal_atomic_init(my_fifos[j].tail_lock, OPAL_ATOMIC_UNLOCKED);
} else {
my_fifos[j].head_lock = NULL;
my_fifos[j].tail_lock = NULL;

13
ompi/mca/btl/sm/btl_sm_component.c
Просмотреть файл

@ -388,20 +388,11 @@ int mca_btl_sm_component_progress(void)
mca_btl_sm_component.sm_offset[peer_smp_rank]);
/* recv upcall */
reg = mca_btl_sm.sm_reg + hdr->tag;
/*
MCA_BTL_SM_FRAG_ALLOC(frag, rc);
frag->segment.seg_addr.pval = ((char*)hdr) +
sizeof(mca_btl_sm_hdr_t);
frag->segment.seg_len = hdr->len;
reg->cbfunc(&mca_btl_sm.super, hdr->tag, &frag->base,
reg->cbdata);
MCA_BTL_SM_FRAG_RETURN(frag);
*/
Frag.segment.seg_addr.pval = ((char*)hdr) +
sizeof(mca_btl_sm_hdr_t);
Frag.segment.seg_len = hdr->len;
Frag.base.des_dst_cnt = 1;
Frag.base.des_dst = &(Frag.segment);
Frag.base.des_dst_cnt = 1;
Frag.base.des_dst = &(Frag.segment);
reg->cbfunc(&mca_btl_sm.super, hdr->tag, &(Frag.base),
reg->cbdata);
MCA_BTL_SM_FIFO_WRITE(