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

shmem fixes to make the trunk build with C/R flags on.

Просмотр исходного кода 
This commit was SVN r24871.
Этот коммит содержится в:
Abhishek Kulkarni 2011-07-10 23:32:23 +00:00
родитель 7d39eed7ed
Коммит 5501f83fb5
4 изменённых файлов: 17 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana * Copyright (c) 2004-2011 The Trustees of Indiana University and Indiana
* University Research and Technology * University Research and Technology
* Corporation. All rights reserved. * Corporation. All rights reserved.
* Copyright (c) 2004-2009 The University of Tennessee and The University * Copyright (c) 2004-2009 The University of Tennessee and The University
@ -1114,14 +1114,14 @@ int mca_btl_sm_ft_event(int state) {
*/ */
orte_sstore.set_attr(orte_sstore_handle_current, orte_sstore.set_attr(orte_sstore_handle_current,
SSTORE_METADATA_LOCAL_TOUCH, SSTORE_METADATA_LOCAL_TOUCH,
mca_btl_sm_component.sm_seg->module_seg_path); mca_btl_sm_component.sm_seg->shmem_ds.seg_name);
} }
} }
else if(OPAL_CRS_CONTINUE == state) { else if(OPAL_CRS_CONTINUE == state) {
if( orte_cr_continue_like_restart ) { if( orte_cr_continue_like_restart ) {
if( NULL != mca_btl_sm_component.sm_seg ) { if( NULL != mca_btl_sm_component.sm_seg ) {
/* Add shared memory file */ /* Add shared memory file */
opal_crs_base_cleanup_append(mca_btl_sm_component.sm_seg->module_seg_path, false); opal_crs_base_cleanup_append(mca_btl_sm_component.sm_seg->shmem_ds.seg_name, false);
} }
/* Clear this so we force the module to re-init the sm files */ /* Clear this so we force the module to re-init the sm files */
@ -1132,7 +1132,7 @@ int mca_btl_sm_ft_event(int state) {
OPAL_CRS_RESTART_PRE == state) { OPAL_CRS_RESTART_PRE == state) {
if( NULL != mca_btl_sm_component.sm_seg ) { if( NULL != mca_btl_sm_component.sm_seg ) {
/* Add shared memory file */ /* Add shared memory file */
opal_crs_base_cleanup_append(mca_btl_sm_component.sm_seg->module_seg_path, false); opal_crs_base_cleanup_append(mca_btl_sm_component.sm_seg->shmem_ds.seg_name, false);
} }
/* Clear this so we force the module to re-init the sm files */ /* Clear this so we force the module to re-init the sm files */

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana * Copyright (c) 2004-2011 The Trustees of Indiana University and Indiana
* University Research and Technology * University Research and Technology
* Corporation. All rights reserved. * Corporation. All rights reserved.
* Copyright (c) 2004-2009 The University of Tennessee and The University * Copyright (c) 2004-2009 The University of Tennessee and The University
@ -304,7 +304,7 @@ static int mca_btl_sm_component_close(void)
*/ */
if(OPAL_CR_STATUS_RESTART_PRE != opal_cr_checkpointing_state && if(OPAL_CR_STATUS_RESTART_PRE != opal_cr_checkpointing_state &&
OPAL_CR_STATUS_RESTART_POST != opal_cr_checkpointing_state ) { OPAL_CR_STATUS_RESTART_POST != opal_cr_checkpointing_state ) {
unlink(mca_btl_sm_component.sm_seg->shmem_ds.name); unlink(mca_btl_sm_component.sm_seg->shmem_ds.seg_name);
} }
#else #else
unlink(mca_btl_sm_component.sm_seg->shmem_ds.seg_name); unlink(mca_btl_sm_component.sm_seg->shmem_ds.seg_name);

14
ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c
Просмотреть файл

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004-2010 The Trustees of Indiana University. * Copyright (c) 2004-2011 The Trustees of Indiana University.
* All rights reserved. * All rights reserved.
* Copyright (c) 2010-2011 The University of Tennessee and The University * Copyright (c) 2010-2011 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights * of Tennessee Research Foundation. All rights
@ -702,7 +702,7 @@ OBJ_CLASS_INSTANCE(ompi_crcp_bkmrk_pml_peer_ref_t,
void ompi_crcp_bkmrk_pml_peer_ref_construct(ompi_crcp_bkmrk_pml_peer_ref_t *peer_ref) { void ompi_crcp_bkmrk_pml_peer_ref_construct(ompi_crcp_bkmrk_pml_peer_ref_t *peer_ref) {
peer_ref->proc_name.jobid = ORTE_JOBID_INVALID; peer_ref->proc_name.jobid = ORTE_JOBID_INVALID;
peer_ref->proc_name.vpid = ORTE_VPID_INVALID; peer_ref->proc_name.vpid = ORTE_VPID_INVALID;
peer_rev->proc_name.epoch = ORTE_EPOCH_MIN; peer_ref->proc_name.epoch = ORTE_EPOCH_MIN;
OBJ_CONSTRUCT(&peer_ref->send_list, opal_list_t); OBJ_CONSTRUCT(&peer_ref->send_list, opal_list_t);
OBJ_CONSTRUCT(&peer_ref->isend_list, opal_list_t); OBJ_CONSTRUCT(&peer_ref->isend_list, opal_list_t);
@ -3237,13 +3237,13 @@ static int traffic_message_append(ompi_crcp_bkmrk_pml_peer_ref_t *peer_ref,
CREATE_NEW_MSG((*msg_ref), msg_type, CREATE_NEW_MSG((*msg_ref), msg_type,
count, ddt_size, tag, dest, comm, count, ddt_size, tag, dest, comm,
peer_ref->proc_name.jobid, peer_ref->proc_name.jobid,
peer_ref->proc_name.vpid peer_ref->proc_name.vpid,
peer_ref->proc_name.epoch); peer_ref->proc_name.epoch);
} else { } else {
CREATE_NEW_MSG((*msg_ref), msg_type, CREATE_NEW_MSG((*msg_ref), msg_type,
count, ddt_size, tag, dest, comm, count, ddt_size, tag, dest, comm,
ORTE_JOBID_INVALID, ORTE_JOBID_INVALID, ORTE_VPID_INVALID,
ORTE_VPID_INVALID); ORTE_EPOCH_INVALID);
} }
if( msg_type == COORD_MSG_TYPE_P_SEND || if( msg_type == COORD_MSG_TYPE_P_SEND ||
@ -3808,7 +3808,7 @@ static int drain_message_append(ompi_crcp_bkmrk_pml_peer_ref_t *peer_ref,
CREATE_NEW_DRAIN_MSG((*msg_ref), msg_type, CREATE_NEW_DRAIN_MSG((*msg_ref), msg_type,
count, NULL, tag, dest, comm, count, NULL, tag, dest, comm,
peer_ref->proc_name.jobid, peer_ref->proc_name.jobid,
peer_ref->proc_name.vpid peer_ref->proc_name.vpid,
peer_ref->proc_name.epoch); peer_ref->proc_name.epoch);
(*msg_ref)->done = 0; (*msg_ref)->done = 0;
@ -6167,7 +6167,7 @@ static int do_recv_msg_detail_check_drain(ompi_crcp_bkmrk_pml_peer_ref_t *peer_r
count, datatype_size, tag, rank, count, datatype_size, tag, rank,
ompi_comm_lookup(comm_id), ompi_comm_lookup(comm_id),
peer_ref->proc_name.jobid, peer_ref->proc_name.jobid,
peer_ref->proc_name.vpid peer_ref->proc_name.vpid,
peer_ref->proc_name.epoch); peer_ref->proc_name.epoch);
traffic_message_create_drain_message(true, num_left_unresolved, traffic_message_create_drain_message(true, num_left_unresolved,

8
ompi/mca/mpool/sm/mpool_sm_module.c
Просмотреть файл

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana * Copyright (c) 2004-2011 The Trustees of Indiana University and Indiana
* University Research and Technology * University Research and Technology
* Corporation. All rights reserved. * Corporation. All rights reserved.
* Copyright (c) 2004-2005 The University of Tennessee and The University * Copyright (c) 2004-2005 The University of Tennessee and The University
@ -144,7 +144,7 @@ static void sm_module_finalize(mca_mpool_base_module_t* module)
time. */ time. */
if (OPAL_CR_STATUS_RESTART_PRE != opal_cr_checkpointing_state && if (OPAL_CR_STATUS_RESTART_PRE != opal_cr_checkpointing_state &&
OPAL_CR_STATUS_RESTART_POST != opal_cr_checkpointing_state ) { OPAL_CR_STATUS_RESTART_POST != opal_cr_checkpointing_state ) {
unlink(sm_module->sm_common_module->module_seg_path); unlink(sm_module->sm_common_module->shmem_ds.seg_name);
} }
#else #else
unlink(sm_module->sm_common_module->shmem_ds.seg_name); unlink(sm_module->sm_common_module->shmem_ds.seg_name);
@ -182,7 +182,7 @@ int mca_mpool_sm_ft_event(int state) {
/* Mark the old sm file for eventual removal via CRS */ /* Mark the old sm file for eventual removal via CRS */
if (NULL != self_sm_module->sm_common_module) { if (NULL != self_sm_module->sm_common_module) {
opal_crs_base_cleanup_append(self_sm_module->sm_common_module->module_seg_path, false); opal_crs_base_cleanup_append(self_sm_module->sm_common_module->shmem_ds.seg_name, false);
} }
/* Remove self from the list of all modules */ /* Remove self from the list of all modules */
@ -197,7 +197,7 @@ int mca_mpool_sm_ft_event(int state) {
/* Mark the old sm file for eventual removal via CRS */ /* Mark the old sm file for eventual removal via CRS */
if (NULL != self_sm_module->sm_common_module) { if (NULL != self_sm_module->sm_common_module) {
opal_crs_base_cleanup_append(self_sm_module->sm_common_module->module_seg_path, false); opal_crs_base_cleanup_append(self_sm_module->sm_common_module->shmem_ds.seg_name, false);
} }
/* Remove self from the list of all modules */ /* Remove self from the list of all modules */