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

correct addressing.

Просмотр исходного кода 
This commit was SVN r17519.
Этот коммит содержится в:
Rich Graham 2008-02-20 01:12:43 +00:00
родитель 99144db970
Коммит 09afc36f5f
1 изменённых файлов: 17 добавлений и 19 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

36
ompi/mca/coll/sm2/coll_sm2_barrier.c
Просмотреть файл

@ -92,7 +92,7 @@ int mca_coll_sm2_nbbarrier_intra(struct ompi_communicator_t *comm,
for( child=0 ; child < sm_module->barrier_tree.n_children ; child++ ) { for( child=0 ; child < sm_module->barrier_tree.n_children ; child++ ) {
/* compute flag address */ /* compute flag address */
sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *) sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *)
(sm_barrier_region+ ((char *)sm_barrier_region+
sm_module->barrier_tree.children_ranks[child] * sm_module->barrier_tree.children_ranks[child] *
sm_module->segement_size_per_process); sm_module->segement_size_per_process);
if(sm_address->flag == tag ) { if(sm_address->flag == tag ) {
@ -115,7 +115,7 @@ int mca_coll_sm2_nbbarrier_intra(struct ompi_communicator_t *comm,
/* Set my completion flag */ /* Set my completion flag */
sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *) sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *)
(sm_barrier_region+ ((char *)sm_barrier_region+
sm_module->barrier_tree.my_rank* sm_module->barrier_tree.my_rank*
sm_module->segement_size_per_process); sm_module->segement_size_per_process);
sm_address->flag=tag; sm_address->flag=tag;
@ -132,22 +132,21 @@ int mca_coll_sm2_nbbarrier_intra(struct ompi_communicator_t *comm,
*/ */
if(sm_module->barrier_tree.n_parents > 0 ) { if(sm_module->barrier_tree.n_parents > 0 ) {
sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *) sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *)
(sm_barrier_region+ ((char *)sm_barrier_region+
sm_module->barrier_tree.parent_rank* sm_module->barrier_tree.parent_rank*
sm_module->segement_size_per_process); sm_module->segement_size_per_process);
if( sm_address->flag != -tag ) { if( sm_address->flag != -tag ) {
/* set restart parameters, and exit */ /* if parent has not checked in - set parameters for async
* completion, incomplet barrier flag, and bail
*/
request->sm2_barrier_phase=NB_BARRIER_FAN_OUT; request->sm2_barrier_phase=NB_BARRIER_FAN_OUT;
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
} }
/* if parent has not checked in - set parameters for async
* completion, incomplet barrier flag, and bail
*/
sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *) sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *)
(sm_barrier_region+ ((char *)sm_barrier_region+
sm_module->barrier_tree.children_ranks[sm_module->barrier_tree.my_rank] * sm_module->barrier_tree.my_rank *
sm_module->segement_size_per_process); sm_module->segement_size_per_process);
sm_address->flag=-tag; sm_address->flag=-tag;
@ -206,7 +205,7 @@ int mca_coll_sm2_nbbarrier_intra_progress(struct ompi_communicator_t *comm,
for( child=0 ; child < sm_module->barrier_tree.n_children ; child++ ) { for( child=0 ; child < sm_module->barrier_tree.n_children ; child++ ) {
/* compute flag address */ /* compute flag address */
sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *) sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *)
(sm_barrier_region+ ((char *)sm_barrier_region+
sm_module->barrier_tree.children_ranks[child] * sm_module->barrier_tree.children_ranks[child] *
sm_module->segement_size_per_process); sm_module->segement_size_per_process);
if(sm_address->flag == tag ) { if(sm_address->flag == tag ) {
@ -229,8 +228,8 @@ int mca_coll_sm2_nbbarrier_intra_progress(struct ompi_communicator_t *comm,
/* Set my completion flag */ /* Set my completion flag */
sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *) sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *)
(sm_barrier_region+ ((char *)sm_barrier_region+
sm_module->barrier_tree.children_ranks[sm_module->barrier_tree.my_rank] * sm_module->barrier_tree.my_rank *
sm_module->segement_size_per_process); sm_module->segement_size_per_process);
sm_address->flag=tag; sm_address->flag=tag;
/* don't need memory barrier here, as we are not setting any other sm /* don't need memory barrier here, as we are not setting any other sm
@ -247,22 +246,21 @@ FANOUT:
*/ */
if(sm_module->barrier_tree.n_parents > 0 ) { if(sm_module->barrier_tree.n_parents > 0 ) {
sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *) sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *)
(sm_barrier_region+ ((char *)sm_barrier_region+
sm_module->barrier_tree.parent_rank* sm_module->barrier_tree.parent_rank*
sm_module->segement_size_per_process); sm_module->segement_size_per_process);
if( sm_address->flag != -tag ) { if( sm_address->flag != -tag ) {
/* set restart parameters, and exit */ /* if parent has not checked in - set parameters for async
* completion, incomplet barrier flag, and bail
*/
request->sm2_barrier_phase=NB_BARRIER_FAN_OUT; request->sm2_barrier_phase=NB_BARRIER_FAN_OUT;
return OMPI_SUCCESS; return OMPI_SUCCESS;
} }
} }
/* if parent has not checked in - set parameters for async
* completion, incomplet barrier flag, and bail
*/
sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *) sm_address=(mca_coll_sm2_nb_request_process_shared_mem_t *)
(sm_barrier_region+ ((char *)sm_barrier_region+
sm_module->barrier_tree.children_ranks[sm_module->barrier_tree.my_rank] * sm_module->barrier_tree.my_rank *
sm_module->segement_size_per_process); sm_module->segement_size_per_process);
sm_address->flag=-tag; sm_address->flag=-tag;