1
1
openmpi/orte/class/orte_proc_table.c
Brian Barrett 27ad954265 Fix a couple of problems with the way we were using orte_process_name_t
structures in the system.  Instead of using memcmp, use the ns function.
This won't cause a problem as long as all three elements of the name are
ints, but if they have different sizes, alignment and padding rules
can cause memcmp() to compare padding space, which rarely holds a sane
value.

This commit was SVN r14998.
2007-06-11 19:12:11 +00:00

143 строки
4.4 KiB
C

/*
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
* University Research and Technology
* Corporation. All rights reserved.
* Copyright (c) 2004-2005 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
*
* $HEADER$
*/
#include "orte_config.h"
#include <string.h>
#include <stdlib.h>
#include "orte/orte_constants.h"
#include "opal/util/output.h"
#include "orte/class/orte_proc_table.h"
#include "orte/mca/ns/ns.h"
#include "orte/mca/ns/ns_types.h"
/*
* orte_process_name_hash_node_t
*/
struct orte_proc_hash_node_t
{
opal_list_item_t super;
orte_process_name_t hn_key;
void *hn_value;
};
typedef struct orte_proc_hash_node_t orte_proc_hash_node_t;
static OBJ_CLASS_INSTANCE(
orte_proc_hash_node_t,
opal_list_item_t,
NULL,
NULL);
#define GET_KEY(proc) \
( (((uint32_t) proc->cellid) << 24) + (((uint32_t) proc->jobid) << 16) + ((uint32_t) proc->vpid) )
void* orte_hash_table_get_proc(opal_hash_table_t* ht,
const orte_process_name_t* proc)
{
uint32_t key = GET_KEY(proc);
opal_list_t* list = ht->ht_table + (key & ht->ht_mask);
orte_proc_hash_node_t *node;
#if OMPI_ENABLE_DEBUG
if(ht->ht_table_size == 0) {
opal_output(0, "opal_hash_table_get_proc:"
"opal_hash_table_init() has not been called");
return NULL;
}
#endif
for(node = (orte_proc_hash_node_t*)opal_list_get_first(list);
node != (orte_proc_hash_node_t*)opal_list_get_end(list);
node = (orte_proc_hash_node_t*)opal_list_get_next(node)) {
if (0 == orte_ns.compare_fields(ORTE_NS_CMP_ALL, &node->hn_key, proc)) {
return node->hn_value;
}
}
return NULL;
}
int orte_hash_table_set_proc(
opal_hash_table_t* ht,
const orte_process_name_t* proc,
void* value)
{
uint32_t key = GET_KEY(proc);
opal_list_t* list = ht->ht_table + (key & ht->ht_mask);
orte_proc_hash_node_t *node;
#if OMPI_ENABLE_DEBUG
if(ht->ht_table_size == 0) {
opal_output(0, "opal_hash_table_set_value_proc:"
"opal_hash_table_init() has not been called");
return ORTE_ERR_BAD_PARAM;
}
#endif
for(node = (orte_proc_hash_node_t*)opal_list_get_first(list);
node != (orte_proc_hash_node_t*)opal_list_get_end(list);
node = (orte_proc_hash_node_t*)opal_list_get_next(node)) {
if (0 == orte_ns.compare_fields(ORTE_NS_CMP_ALL, &node->hn_key, proc)) {
node->hn_value = value;
return ORTE_SUCCESS;
}
}
node = (orte_proc_hash_node_t*)opal_list_remove_first(&ht->ht_nodes);
if(NULL == node) {
node = OBJ_NEW(orte_proc_hash_node_t);
if(NULL == node)
return ORTE_ERR_OUT_OF_RESOURCE;
}
node->hn_key = *proc;
node->hn_value = value;
opal_list_append(list, (opal_list_item_t*)node);
ht->ht_size++;
return ORTE_SUCCESS;
}
int orte_hash_table_remove_proc(
opal_hash_table_t* ht,
const orte_process_name_t* proc)
{
uint32_t key = GET_KEY(proc);
opal_list_t* list = ht->ht_table + (key & ht->ht_mask);
orte_proc_hash_node_t *node;
#if OMPI_ENABLE_DEBUG
if(ht->ht_table_size == 0) {
opal_output(0, "opal_hash_table_remove_value_proc:"
"opal_hash_table_init() has not been called");
return ORTE_ERR_BAD_PARAM;
}
#endif
for(node = (orte_proc_hash_node_t*)opal_list_get_first(list);
node != (orte_proc_hash_node_t*)opal_list_get_end(list);
node = (orte_proc_hash_node_t*)opal_list_get_next(node)) {
if (0 == orte_ns.compare_fields(ORTE_NS_CMP_ALL, &node->hn_key, proc)) {
opal_list_remove_item(list, (opal_list_item_t*)node);
opal_list_append(&ht->ht_nodes, (opal_list_item_t*)node);
ht->ht_size--;
return ORTE_SUCCESS;
}
}
return ORTE_ERR_NOT_FOUND;
}