1
1

Fix logic error, and remove uneeded checks for invalid results.

This commit was SVN r17756.
Этот коммит содержится в:
Tim Prins 2008-03-06 04:38:13 +00:00
родитель 6d94e7b232
Коммит d56f19c77d
2 изменённых файлов: 4 добавлений и 8 удалений

Просмотреть файл

@ -115,8 +115,7 @@ orte_routed_tree_get_route(orte_process_name_t *target)
/* check exact matches */ /* check exact matches */
rc = opal_hash_table_get_value_uint64(&orte_routed_tree_module.peer_list, rc = opal_hash_table_get_value_uint64(&orte_routed_tree_module.peer_list,
orte_util_hash_name(target), (void**)&ret); orte_util_hash_name(target), (void**)&ret);
if (ORTE_SUCCESS == rc && if (ORTE_SUCCESS == rc) {
OPAL_EQUAL != orte_util_compare_name_fields(ORTE_NS_CMP_ALL, ret, ORTE_NAME_INVALID)) {
/* got a good result - return it */ /* got a good result - return it */
goto found; goto found;
} }
@ -124,8 +123,7 @@ orte_routed_tree_get_route(orte_process_name_t *target)
/* didn't find an exact match - check to see if a route for this job was defined */ /* didn't find an exact match - check to see if a route for this job was defined */
rc = opal_hash_table_get_value_uint32(&orte_routed_tree_module.vpid_wildcard_list, rc = opal_hash_table_get_value_uint32(&orte_routed_tree_module.vpid_wildcard_list,
target->jobid, (void**)&ret); target->jobid, (void**)&ret);
if (ORTE_SUCCESS == rc && if (ORTE_SUCCESS == rc) {
OPAL_EQUAL != orte_util_compare_name_fields(ORTE_NS_CMP_ALL, ret, ORTE_NAME_INVALID)) {
/* got a good result - return it */ /* got a good result - return it */
goto found; goto found;
} }

Просмотреть файл

@ -224,8 +224,7 @@ orte_routed_unity_get_route(orte_process_name_t *target)
if (ORTE_JOB_FAMILY(target->jobid) != ORTE_JOB_FAMILY(ORTE_PROC_MY_NAME->jobid)) { if (ORTE_JOB_FAMILY(target->jobid) != ORTE_JOB_FAMILY(ORTE_PROC_MY_NAME->jobid)) {
rc = opal_hash_table_get_value_uint64(&peer_list, orte_util_hash_name(target), rc = opal_hash_table_get_value_uint64(&peer_list, orte_util_hash_name(target),
(void**)&ret); (void**)&ret);
if (ORTE_SUCCESS != rc && if (ORTE_SUCCESS == rc) {
OPAL_EQUAL != orte_util_compare_name_fields(ORTE_NS_CMP_ALL, ret, ORTE_NAME_INVALID)) {
/* got a good result - return it */ /* got a good result - return it */
goto found; goto found;
} }
@ -234,8 +233,7 @@ orte_routed_unity_get_route(orte_process_name_t *target)
lookup.vpid = ORTE_VPID_WILDCARD; lookup.vpid = ORTE_VPID_WILDCARD;
rc = opal_hash_table_get_value_uint64(&peer_list, orte_util_hash_name(&lookup), rc = opal_hash_table_get_value_uint64(&peer_list, orte_util_hash_name(&lookup),
(void**)&ret); (void**)&ret);
if (ORTE_SUCCESS == rc && if (ORTE_SUCCESS == rc) {
OPAL_EQUAL != orte_util_compare_name_fields(ORTE_NS_CMP_ALL, ret, ORTE_NAME_INVALID)) {
/* got a good result - return it */ /* got a good result - return it */
goto found; goto found;
} }