From 5f5d8ad231bfee10c99eadbb0b27ab98b7453cec Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Mon, 5 Jan 2009 15:09:54 +0000 Subject: [PATCH] CID 1139-1141: remove outdated variable from the various routed components This commit was SVN r20201. --- orte/mca/routed/binomial/routed_binomial.c | 14 -------------- orte/mca/routed/linear/routed_linear.c | 14 -------------- orte/mca/routed/radix/routed_radix.c | 14 -------------- 3 files changed, 42 deletions(-) diff --git a/orte/mca/routed/binomial/routed_binomial.c b/orte/mca/routed/binomial/routed_binomial.c index 8b8116c18e..8688cbdd2f 100644 --- a/orte/mca/routed/binomial/routed_binomial.c +++ b/orte/mca/routed/binomial/routed_binomial.c @@ -76,7 +76,6 @@ orte_routed_module_t orte_routed_binomial_module = { /* local globals */ static opal_hash_table_t jobfam_list; -static orte_process_name_t wildcard_route; static opal_condition_t cond; static opal_mutex_t lock; static orte_process_name_t *lifeline=NULL; @@ -92,9 +91,6 @@ static int init(void) OBJ_CONSTRUCT(&jobfam_list, opal_hash_table_t); opal_hash_table_init(&jobfam_list, 128); - wildcard_route.jobid = ORTE_NAME_INVALID->jobid; - wildcard_route.vpid = ORTE_NAME_INVALID->vpid; - /* setup the global condition and lock */ OBJ_CONSTRUCT(&cond, opal_condition_t); OBJ_CONSTRUCT(&lock, opal_mutex_t); @@ -526,12 +522,6 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) return rc; } - /* set the wildcard route for anybody whose name we don't recognize - * to be the HNP - */ - wildcard_route.jobid = ORTE_PROC_MY_HNP->jobid; - wildcard_route.vpid = ORTE_PROC_MY_HNP->vpid; - /* set our lifeline to the HNP - we will abort if that connection is lost */ lifeline = ORTE_PROC_MY_HNP; @@ -699,10 +689,6 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) return rc; } - /* setup the route to all other procs to flow through the daemon */ - wildcard_route.jobid = ORTE_PROC_MY_DAEMON->jobid; - wildcard_route.vpid = ORTE_PROC_MY_DAEMON->vpid; - /* set our lifeline to the local daemon - we will abort if this connection is lost */ lifeline = ORTE_PROC_MY_DAEMON; diff --git a/orte/mca/routed/linear/routed_linear.c b/orte/mca/routed/linear/routed_linear.c index 90473e5497..8d1192ae49 100644 --- a/orte/mca/routed/linear/routed_linear.c +++ b/orte/mca/routed/linear/routed_linear.c @@ -74,7 +74,6 @@ orte_routed_module_t orte_routed_linear_module = { /* local globals */ static opal_hash_table_t jobfam_list; -static orte_process_name_t wildcard_route; static opal_condition_t cond; static opal_mutex_t lock; static orte_process_name_t *lifeline=NULL; @@ -88,9 +87,6 @@ static int init(void) OBJ_CONSTRUCT(&jobfam_list, opal_hash_table_t); opal_hash_table_init(&jobfam_list, 128); - wildcard_route.jobid = ORTE_NAME_INVALID->jobid; - wildcard_route.vpid = ORTE_NAME_INVALID->vpid; - /* setup the global condition and lock */ OBJ_CONSTRUCT(&cond, opal_condition_t); OBJ_CONSTRUCT(&lock, opal_mutex_t); @@ -519,12 +515,6 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) return rc; } - /* set the wildcard route for anybody whose name we don't recognize - * to be the HNP - */ - wildcard_route.jobid = ORTE_PROC_MY_HNP->jobid; - wildcard_route.vpid = ORTE_PROC_MY_HNP->vpid; - /* set our lifeline to the the HNP - we will abort if that connection is lost */ lifeline = ORTE_PROC_MY_HNP; @@ -692,10 +682,6 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) return rc; } - /* setup the route to all other procs to flow through the daemon */ - wildcard_route.jobid = ORTE_PROC_MY_DAEMON->jobid; - wildcard_route.vpid = ORTE_PROC_MY_DAEMON->vpid; - /* set our lifeline to the local daemon - we will abort if this connection is lost */ lifeline = ORTE_PROC_MY_DAEMON; diff --git a/orte/mca/routed/radix/routed_radix.c b/orte/mca/routed/radix/routed_radix.c index dab1900025..32467cbd31 100644 --- a/orte/mca/routed/radix/routed_radix.c +++ b/orte/mca/routed/radix/routed_radix.c @@ -77,7 +77,6 @@ orte_routed_module_t orte_routed_radix_module = { /* local globals */ static opal_hash_table_t jobfam_list; -static orte_process_name_t wildcard_route; static opal_condition_t cond; static opal_mutex_t lock; static orte_process_name_t *lifeline=NULL; @@ -93,9 +92,6 @@ static int init(void) OBJ_CONSTRUCT(&jobfam_list, opal_hash_table_t); opal_hash_table_init(&jobfam_list, 128); - wildcard_route.jobid = ORTE_NAME_INVALID->jobid; - wildcard_route.vpid = ORTE_NAME_INVALID->vpid; - /* setup the global condition and lock */ OBJ_CONSTRUCT(&cond, opal_condition_t); OBJ_CONSTRUCT(&lock, opal_mutex_t); @@ -553,12 +549,6 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) return rc; } - /* set the wildcard route for anybody whose name we don't recognize - * to be the HNP - */ - wildcard_route.jobid = ORTE_PROC_MY_HNP->jobid; - wildcard_route.vpid = ORTE_PROC_MY_HNP->vpid; - /* set our lifeline to the HNP - we will abort if that connection is lost */ lifeline = ORTE_PROC_MY_HNP; @@ -726,10 +716,6 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) return rc; } - /* setup the route to all other procs to flow through the daemon */ - wildcard_route.jobid = ORTE_PROC_MY_DAEMON->jobid; - wildcard_route.vpid = ORTE_PROC_MY_DAEMON->vpid; - /* set our lifeline to the local daemon - we will abort if this connection is lost */ lifeline = ORTE_PROC_MY_DAEMON;