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

Standardize the initialization of the EPOCH's.

Просмотр исходного кода 
Everyone will be starting at MIN anyway (until we implement restart of course)
so there's no reason to set the epoch to INVALID and then immediately reset them
to MIN. This way there's less room to make mistakes later.

This commit was SVN r24829.
Этот коммит содержится в:
Wesley Bland 2011-06-28 14:20:33 +00:00
родитель c203eee223
Коммит 84be81df95
19 изменённых файлов: 38 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -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) {
peer_ref->proc_name.jobid = ORTE_JOBID_INVALID;
peer_ref->proc_name.vpid = ORTE_VPID_INVALID;
peer_rev->proc_name.epoch = ORTE_EPOCH_INVALID;
peer_rev->proc_name.epoch = ORTE_EPOCH_MIN;
OBJ_CONSTRUCT(&peer_ref->send_list, opal_list_t);
OBJ_CONSTRUCT(&peer_ref->isend_list, opal_list_t);
@ -730,7 +730,7 @@ void ompi_crcp_bkmrk_pml_peer_ref_destruct( ompi_crcp_bkmrk_pml_peer_ref_t *peer
peer_ref->proc_name.jobid = ORTE_JOBID_INVALID;
peer_ref->proc_name.vpid = ORTE_VPID_INVALID;
peer_ref->proc_name.epoch = ORTE_EPOCH_INVALID;
peer_ref->proc_name.epoch = ORTE_EPOCH_MIN;
while( NULL != (item = opal_list_remove_first(&peer_ref->send_list)) ) {
HOKE_TRAFFIC_MSG_REF_RETURN(item);
@ -840,7 +840,7 @@ void ompi_crcp_bkmrk_pml_traffic_message_ref_construct(ompi_crcp_bkmrk_pml_traff
msg_ref->proc_name.jobid = ORTE_JOBID_INVALID;
msg_ref->proc_name.vpid = ORTE_VPID_INVALID;
msg_ref->proc_name.epoch = ORTE_EPOCH_INVALID;
msg_ref->proc_name.epoch = ORTE_EPOCH_MIN;
msg_ref->matched = INVALID_INT;
msg_ref->done = INVALID_INT;
@ -868,7 +868,7 @@ void ompi_crcp_bkmrk_pml_traffic_message_ref_destruct( ompi_crcp_bkmrk_pml_traff
msg_ref->proc_name.jobid = ORTE_JOBID_INVALID;
msg_ref->proc_name.vpid = ORTE_VPID_INVALID;
msg_ref->proc_name.epoch = ORTE_EPOCH_INVALID;
msg_ref->proc_name.epoch = ORTE_EPOCH_MIN;
msg_ref->matched = INVALID_INT;
msg_ref->done = INVALID_INT;
@ -902,7 +902,7 @@ void ompi_crcp_bkmrk_pml_drain_message_ref_construct(ompi_crcp_bkmrk_pml_drain_m
msg_ref->proc_name.jobid = ORTE_JOBID_INVALID;
msg_ref->proc_name.vpid = ORTE_VPID_INVALID;
msg_ref->proc_name.epoch = ORTE_EPOCH_INVALID;
msg_ref->proc_name.epoch = ORTE_EPOCH_MIN;
msg_ref->done = INVALID_INT;
msg_ref->active = INVALID_INT;
@ -934,7 +934,7 @@ void ompi_crcp_bkmrk_pml_drain_message_ref_destruct( ompi_crcp_bkmrk_pml_drain_m
msg_ref->proc_name.jobid = ORTE_JOBID_INVALID;
msg_ref->proc_name.vpid = ORTE_VPID_INVALID;
msg_ref->proc_name.epoch = ORTE_EPOCH_INVALID;
msg_ref->proc_name.epoch = ORTE_EPOCH_MIN;
msg_ref->done = INVALID_INT;
msg_ref->active = INVALID_INT;
@ -954,7 +954,7 @@ void ompi_crcp_bkmrk_pml_drain_message_ack_ref_construct(ompi_crcp_bkmrk_pml_dra
msg_ack_ref->peer.jobid = ORTE_JOBID_INVALID;
msg_ack_ref->peer.vpid = ORTE_VPID_INVALID;
msg_ack_ref->peer.epoch = ORTE_EPOCH_INVALID;
msg_ack_ref->peer.epoch = ORTE_EPOCH_MIN;
}
void ompi_crcp_bkmrk_pml_drain_message_ack_ref_destruct( ompi_crcp_bkmrk_pml_drain_message_ack_ref_t *msg_ack_ref) {
@ -962,7 +962,7 @@ void ompi_crcp_bkmrk_pml_drain_message_ack_ref_destruct( ompi_crcp_bkmrk_pml_dra
msg_ack_ref->peer.jobid = ORTE_JOBID_INVALID;
msg_ack_ref->peer.vpid = ORTE_VPID_INVALID;
msg_ack_ref->peer.epoch = ORTE_EPOCH_INVALID;
msg_ack_ref->peer.epoch = ORTE_EPOCH_MIN;
}

6
orte/mca/errmgr/base/errmgr_base_fns.c
Просмотреть файл

@ -97,7 +97,7 @@ void orte_errmgr_predicted_proc_construct(orte_errmgr_predicted_proc_t *item)
{
item->proc_name.vpid = ORTE_VPID_INVALID;
item->proc_name.jobid = ORTE_JOBID_INVALID;
item->proc_name.epoch = ORTE_EPOCH_INVALID;
item->proc_name.epoch = ORTE_EPOCH_MIN;
}
void orte_errmgr_predicted_proc_destruct( orte_errmgr_predicted_proc_t *item)
@ -139,13 +139,13 @@ OBJ_CLASS_INSTANCE(orte_errmgr_predicted_map_t,
void orte_errmgr_predicted_map_construct(orte_errmgr_predicted_map_t *item)
{
item->proc_name.vpid = ORTE_VPID_INVALID;
item->proc_name.epoch = ORTE_EPOCH_INVALID;
item->proc_name.epoch = ORTE_EPOCH_MIN;
item->proc_name.jobid = ORTE_JOBID_INVALID;
item->node_name = NULL;
item->map_proc_name.vpid = ORTE_VPID_INVALID;
item->map_proc_name.epoch = ORTE_EPOCH_INVALID;
item->map_proc_name.epoch = ORTE_EPOCH_MIN;
item->map_proc_name.jobid = ORTE_JOBID_INVALID;
item->map_node_name = NULL;

2
orte/mca/errmgr/base/errmgr_base_tool.c
Просмотреть файл

@ -267,7 +267,7 @@ static int errmgr_base_tool_start_cmdline_listener(void)
*/
errmgr_cmdline_sender.jobid = ORTE_JOBID_INVALID;
errmgr_cmdline_sender.vpid = ORTE_VPID_INVALID;
errmgr_cmdline_sender.epoch = ORTE_EPOCH_INVALID;
errmgr_cmdline_sender.epoch = ORTE_EPOCH_MIN;
if (ORTE_SUCCESS != (ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD,
ORTE_RML_TAG_MIGRATE,
0,

2
orte/mca/errmgr/hnp/errmgr_hnp_autor.c
Просмотреть файл

@ -626,7 +626,7 @@ void errmgr_autor_wp_item_construct(errmgr_autor_wp_item_t *wp)
{
wp->name.jobid = ORTE_JOBID_INVALID;
wp->name.vpid = ORTE_VPID_INVALID;
wp->name.epoch = ORTE_EPOCH_INVALID;
wp->name.epoch = ORTE_EPOCH_MIN;
wp->state = 0;
}

2
orte/mca/grpcomm/hier/grpcomm_hier_module.c
Просмотреть файл

@ -95,7 +95,7 @@ static int init(void)
my_local_rank_zero_proc.jobid = ORTE_PROC_MY_NAME->jobid;
my_local_rank_zero_proc.vpid = ORTE_VPID_INVALID;
my_local_rank_zero_proc.epoch = ORTE_EPOCH_INVALID;
my_local_rank_zero_proc.epoch = ORTE_EPOCH_MIN;
if (ORTE_SUCCESS != (rc = orte_grpcomm_base_modex_init())) {
ORTE_ERROR_LOG(rc);

2
orte/mca/iof/base/iof_base_open.c
Просмотреть файл

@ -91,7 +91,7 @@ static void orte_iof_base_sink_construct(orte_iof_sink_t* ptr)
{
ptr->daemon.jobid = ORTE_JOBID_INVALID;
ptr->daemon.vpid = ORTE_VPID_INVALID;
ptr->daemon.epoch = ORTE_EPOCH_INVALID;
ptr->daemon.epoch = ORTE_EPOCH_MIN;
ptr->wev = OBJ_NEW(orte_iof_write_event_t);
}
static void orte_iof_base_sink_destruct(orte_iof_sink_t* ptr)

1
orte/mca/odls/base/odls_base_default_fns.c
Просмотреть файл

@ -946,7 +946,6 @@ find_my_procs:
proc.jobid = jobdat->jobid;
for (j=0; j < jobdat->num_procs; j++) {
proc.vpid = j;
proc.epoch = ORTE_EPOCH_INVALID;
proc.epoch = orte_ess.proc_get_epoch(&proc);
/* get the vpid of the daemon that is to host this proc */
if (ORTE_VPID_INVALID == (host_daemon = orte_ess.proc_get_daemon(&proc))) {

1
orte/mca/plm/base/plm_base_receive.c
Просмотреть файл

@ -394,7 +394,6 @@ static void process_msg(int fd, short event, void *data)
break;
}
name.vpid = vpid;
name.epoch = ORTE_EPOCH_INVALID;
name.epoch = orte_ess.proc_get_epoch(&name);
/* unpack the pid */

4
orte/mca/rmcast/base/rmcast_base_open.c
Просмотреть файл

@ -341,7 +341,7 @@ static void recv_construct(rmcast_base_recv_t *ptr)
{
ptr->name.jobid = ORTE_JOBID_INVALID;
ptr->name.vpid = ORTE_VPID_INVALID;
ptr->name.epoch= ORTE_EPOCH_INVALID;
ptr->name.epoch = ORTE_EPOCH_MIN;
ptr->channel = ORTE_RMCAST_INVALID_CHANNEL;
OBJ_CONSTRUCT(&ptr->ctl, orte_thread_ctl_t);
ptr->seq_num = ORTE_RMCAST_SEQ_INVALID;
@ -429,7 +429,7 @@ static void recvlog_construct(rmcast_recv_log_t *ptr)
{
ptr->name.jobid = ORTE_JOBID_INVALID;
ptr->name.vpid = ORTE_VPID_INVALID;
ptr->name.epoch = ORTE_EPOCH_INVALID;
ptr->name.epoch = ORTE_EPOCH_MIN;
OBJ_CONSTRUCT(&ptr->last_msg, opal_list_t);
}
static void recvlog_destruct(rmcast_recv_log_t *ptr)

2
orte/mca/rml/base/rml_base_components.c
Просмотреть файл

@ -67,7 +67,7 @@ static void msg_pkt_constructor(orte_msg_packet_t *pkt)
{
pkt->sender.jobid = ORTE_JOBID_INVALID;
pkt->sender.vpid = ORTE_VPID_INVALID;
pkt->sender.epoch = ORTE_EPOCH_INVALID;
pkt->sender.epoch = ORTE_EPOCH_MIN;
pkt->buffer = NULL;
}
static void msg_pkt_destructor(orte_msg_packet_t *pkt)

2
orte/mca/routed/base/routed_base_components.c
Просмотреть файл

@ -65,7 +65,7 @@ static void jfamconst(orte_routed_jobfam_t *ptr)
{
ptr->route.jobid = ORTE_JOBID_INVALID;
ptr->route.vpid = ORTE_VPID_INVALID;
ptr->route.epoch = ORTE_EPOCH_INVALID;
ptr->route.epoch = ORTE_EPOCH_MIN;
ptr->hnp_uri = NULL;
}
static void jfamdest(orte_routed_jobfam_t *ptr)

4
orte/mca/sstore/central/sstore_central_local.c
Просмотреть файл

@ -210,7 +210,7 @@ void orte_sstore_central_local_app_snapshot_info_construct(orte_sstore_central_l
{
info->name.jobid = ORTE_JOBID_INVALID;
info->name.vpid = ORTE_VPID_INVALID;
info->name.epoch = ORTE_EPOCH_INVALID;
info->name.epoch = ORTE_EPOCH_MIN;
info->local_location = NULL;
info->metadata_filename = NULL;
@ -222,7 +222,7 @@ void orte_sstore_central_local_app_snapshot_info_destruct( orte_sstore_central_l
{
info->name.jobid = ORTE_JOBID_INVALID;
info->name.vpid = ORTE_VPID_INVALID;
info->name.epoch = ORTE_EPOCH_INVALID;
info->name.epoch = ORTE_EPOCH_MIN;
if( NULL != info->local_location ) {
free(info->local_location);

4
orte/mca/sstore/stage/sstore_stage_local.c
Просмотреть файл

@ -287,7 +287,7 @@ void orte_sstore_stage_local_app_snapshot_info_construct(orte_sstore_stage_local
{
info->name.jobid = ORTE_JOBID_INVALID;
info->name.vpid = ORTE_VPID_INVALID;
info->name.epoch = ORTE_EPOCH_INVALID;
info->name.epoch = ORTE_EPOCH_MIN;
info->local_location = NULL;
info->compressed_local_location = NULL;
@ -302,7 +302,7 @@ void orte_sstore_stage_local_app_snapshot_info_destruct( orte_sstore_stage_local
{
info->name.jobid = ORTE_JOBID_INVALID;
info->name.vpid = ORTE_VPID_INVALID;
info->name.epoch = ORTE_EPOCH_INVALID;
info->name.epoch = ORTE_EPOCH_MIN;
if( NULL != info->local_location ) {
free(info->local_location);

2
orte/orted/orted_comm.c
Просмотреть файл

@ -123,7 +123,7 @@ static void send_relay(opal_buffer_t *buf)
nm = (orte_routed_tree_t*)item;
target.vpid = nm->vpid;
target.epoch = ORTE_EPOCH_INVALID;
target.epoch = orte_util_lookup_epoch(&target);
if (!orte_util_proc_is_running(&target)) {
continue;

2
orte/runtime/orte_globals.c
Просмотреть файл

@ -920,7 +920,7 @@ static void orte_proc_construct(orte_proc_t* proc)
proc->reported = false;
proc->beat = 0;
OBJ_CONSTRUCT(&proc->stats, opal_pstats_t);
proc->name.epoch = ORTE_EPOCH_INVALID;
proc->name.epoch = ORTE_EPOCH_MIN;
#if OPAL_ENABLE_FT_CR == 1
proc->ckpt_state = 0;
proc->ckpt_snapshot_ref = NULL;

2
orte/util/hnp_contact.c
Просмотреть файл

@ -55,7 +55,7 @@ static void orte_hnp_contact_construct(orte_hnp_contact_t *ptr)
{
ptr->name.jobid = ORTE_JOBID_INVALID;
ptr->name.vpid = ORTE_VPID_INVALID;
ptr->name.epoch = ORTE_EPOCH_INVALID;
ptr->name.epoch = ORTE_EPOCH_MIN;
ptr->rml_uri = NULL;
}
static void orte_hnp_contact_destruct(orte_hnp_contact_t *ptr)

4
orte/util/name_fns.c
Просмотреть файл

@ -46,7 +46,7 @@ static void orte_namelist_construct(orte_namelist_t* list)
{
list->name.jobid = ORTE_JOBID_INVALID;
list->name.vpid = ORTE_VPID_INVALID;
list->name.epoch = ORTE_EPOCH_INVALID;
list->name.epoch = ORTE_EPOCH_MIN;
}
/* destructor - used to free any resources held by instance */
@ -463,7 +463,7 @@ int orte_util_convert_string_to_process_name(orte_process_name_t *name,
/* set default */
name->jobid = ORTE_JOBID_INVALID;
name->vpid = ORTE_VPID_INVALID;
name->epoch = ORTE_EPOCH_INVALID;
name->epoch = ORTE_EPOCH_MIN;
/* check for NULL string - error */
if (NULL == name_string) {

6
orte/util/nidmap.c
Просмотреть файл

@ -1104,6 +1104,12 @@ int orte_util_set_proc_state(orte_process_name_t *proc, orte_proc_state_t state)
return ORTE_ERROR;
}
/*
* This function performs both the get and set operations on the epoch for a
* sepcific process name. If the epoch passed into the function is
* ORTE_EPOCH_INVALID, then we are performing a get operation. If the epoch is
* anything else, we are performing a set operation.
*/
orte_epoch_t get_epoch_from_orte_job_data(orte_process_name_t *proc, orte_epoch_t epoch) {
int ret, i;
unsigned int j;

8
orte/util/proc_info.c
Просмотреть файл

@ -37,12 +37,12 @@
#include "orte/util/proc_info.h"
ORTE_DECLSPEC orte_proc_info_t orte_process_info = {
/* .my_name = */ {ORTE_JOBID_INVALID, ORTE_VPID_INVALID, ORTE_EPOCH_INVALID},
/* .my_daemon = */ {ORTE_JOBID_INVALID, ORTE_VPID_INVALID, ORTE_EPOCH_INVALID},
/* .my_name = */ {ORTE_JOBID_INVALID, ORTE_VPID_INVALID, ORTE_EPOCH_MIN},
/* .my_daemon = */ {ORTE_JOBID_INVALID, ORTE_VPID_INVALID, ORTE_EPOCH_MIN},
/* .my_daemon_uri = */ NULL,
/* .my_hnp = */ {ORTE_JOBID_INVALID, ORTE_VPID_INVALID, ORTE_EPOCH_INVALID},
/* .my_hnp = */ {ORTE_JOBID_INVALID, ORTE_VPID_INVALID, ORTE_EPOCH_MIN},
/* .my_hnp_uri = */ NULL,
/* .my_parent = */ {ORTE_JOBID_INVALID, ORTE_VPID_INVALID, ORTE_EPOCH_INVALID},
/* .my_parent = */ {ORTE_JOBID_INVALID, ORTE_VPID_INVALID, ORTE_EPOCH_MIN},
/* .hnp_pid = */ 0,
/* .app_num = */ 0,
/* .num_procs = */ 1,