modifying the get_value_ptr* interfaces as discussed
This commit was SVN r3438.
Этот коммит содержится в:
Edgar Gabriel
родитель
1593b7fd24
Коммит
2d8d4639b4
@ -115,7 +115,8 @@ static OBJ_CLASS_INSTANCE(ompi_uint32_hash_node_t,
|
||||
NULL);
|
||||
|
||||
|
||||
void* ompi_hash_table_get_value_uint32(ompi_hash_table_t* ht, uint32_t key)
|
||||
int ompi_hash_table_get_value_uint32(ompi_hash_table_t* ht, uint32_t key,
|
||||
void **ptr)
|
||||
{
|
||||
ompi_list_t* list = ht->ht_table + (key & ht->ht_mask);
|
||||
ompi_uint32_hash_node_t *node;
|
||||
@ -124,17 +125,18 @@ void* ompi_hash_table_get_value_uint32(ompi_hash_table_t* ht, uint32_t key)
|
||||
if(ht->ht_table_size == 0) {
|
||||
ompi_output(0, "ompi_hash_table_get_value_uint32:"
|
||||
"ompi_hash_table_init() has not been called");
|
||||
return NULL;
|
||||
return OMPI_ERROR;
|
||||
}
|
||||
#endif
|
||||
for(node = (ompi_uint32_hash_node_t*)ompi_list_get_first(list);
|
||||
node != (ompi_uint32_hash_node_t*)ompi_list_get_end(list);
|
||||
node = (ompi_uint32_hash_node_t*)ompi_list_get_next(node)) {
|
||||
if (node->hn_key == key) {
|
||||
return node->hn_value;
|
||||
*ptr = node->hn_value;
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
return OMPI_ERR_NOT_FOUND;
|
||||
}
|
||||
|
||||
|
||||
@ -219,7 +221,8 @@ static OBJ_CLASS_INSTANCE(ompi_uint64_hash_node_t,
|
||||
NULL);
|
||||
|
||||
|
||||
void* ompi_hash_table_get_value_uint64(ompi_hash_table_t* ht, uint64_t key)
|
||||
int ompi_hash_table_get_value_uint64(ompi_hash_table_t* ht, uint64_t key,
|
||||
void **ptr)
|
||||
{
|
||||
ompi_list_t* list = ht->ht_table + (key & ht->ht_mask);
|
||||
ompi_uint64_hash_node_t *node;
|
||||
@ -228,17 +231,18 @@ void* ompi_hash_table_get_value_uint64(ompi_hash_table_t* ht, uint64_t key)
|
||||
if(ht->ht_table_size == 0) {
|
||||
ompi_output(0, "ompi_hash_table_get_value_uint64:"
|
||||
"ompi_hash_table_init() has not been called");
|
||||
return NULL;
|
||||
return OMPI_ERROR;
|
||||
}
|
||||
#endif
|
||||
for(node = (ompi_uint64_hash_node_t*)ompi_list_get_first(list);
|
||||
node != (ompi_uint64_hash_node_t*)ompi_list_get_end(list);
|
||||
node = (ompi_uint64_hash_node_t*)ompi_list_get_next(node)) {
|
||||
if (node->hn_key == key) {
|
||||
return node->hn_value;
|
||||
*ptr = node->hn_value;
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
return OMPI_ERR_NOT_FOUND;
|
||||
}
|
||||
|
||||
|
||||
@ -352,8 +356,8 @@ static inline uint32_t ompi_hash_value(size_t mask, const void *key,
|
||||
return (h & mask);
|
||||
}
|
||||
|
||||
void* ompi_hash_table_get_value_ptr(ompi_hash_table_t* ht, const void* key,
|
||||
size_t key_size)
|
||||
int ompi_hash_table_get_value_ptr(ompi_hash_table_t* ht, const void* key,
|
||||
size_t key_size, void **ptr)
|
||||
{
|
||||
ompi_list_t* list = ht->ht_table + ompi_hash_value(ht->ht_mask, key,
|
||||
key_size);
|
||||
@ -363,7 +367,7 @@ void* ompi_hash_table_get_value_ptr(ompi_hash_table_t* ht, const void* key,
|
||||
if(ht->ht_table_size == 0) {
|
||||
ompi_output(0, "ompi_hash_table_get_value_ptr:"
|
||||
"ompi_hash_table_init() has not been called");
|
||||
return NULL;
|
||||
return OMPI_ERROR;
|
||||
}
|
||||
#endif
|
||||
for(node = (ompi_ptr_hash_node_t*)ompi_list_get_first(list);
|
||||
@ -371,10 +375,11 @@ void* ompi_hash_table_get_value_ptr(ompi_hash_table_t* ht, const void* key,
|
||||
node = (ompi_ptr_hash_node_t*)ompi_list_get_next(node)) {
|
||||
if (node->hn_key_size == key_size &&
|
||||
memcmp(node->hn_key, key, key_size) == 0) {
|
||||
return node->hn_value;
|
||||
*ptr = node->hn_value;
|
||||
return OMPI_SUCCESS;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
return OMPI_ERR_NOT_FOUND;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -80,11 +80,16 @@ OMPI_DECLSPEC int ompi_hash_table_remove_all(ompi_hash_table_t *ht);
|
||||
*
|
||||
* @param table The input hash table (IN).
|
||||
* @param key The input key (IN).
|
||||
* @return The value associated with the key or NULL if the item is not found.
|
||||
* @param ptr The value associated with the key
|
||||
* @return integer return code:
|
||||
* - OMPI_SUCCESS if key was found
|
||||
* - OMPI_ERR_NOT_FOUND if key was not found
|
||||
* - OMPI_ERROR other error
|
||||
*
|
||||
*/
|
||||
|
||||
OMPI_DECLSPEC void *ompi_hash_table_get_value_uint32(ompi_hash_table_t* table, uint32_t key);
|
||||
OMPI_DECLSPEC int ompi_hash_table_get_value_uint32(ompi_hash_table_t* table, uint32_t key,
|
||||
void** ptr);
|
||||
|
||||
/**
|
||||
* Set value based on uint32_t key.
|
||||
@ -114,11 +119,16 @@ OMPI_DECLSPEC int ompi_hash_table_remove_value_uint32(ompi_hash_table_t* table,
|
||||
*
|
||||
* @param table The input hash table (IN).
|
||||
* @param key The input key (IN).
|
||||
* @return The value associated with the key or NULL if the item is not found.
|
||||
* @param ptr The value associated with the key
|
||||
* @return integer return code:
|
||||
* - OMPI_SUCCESS if key was found
|
||||
* - OMPI_ERR_NOT_FOUND if key was not found
|
||||
* - OMPI_ERROR other error
|
||||
*
|
||||
*/
|
||||
|
||||
OMPI_DECLSPEC void *ompi_hash_table_get_value_uint64(ompi_hash_table_t *table, uint64_t key);
|
||||
OMPI_DECLSPEC int ompi_hash_table_get_value_uint64(ompi_hash_table_t *table, uint64_t key,
|
||||
void **ptr);
|
||||
|
||||
/**
|
||||
* Set value based on uint64_t key.
|
||||
@ -148,11 +158,16 @@ OMPI_DECLSPEC int ompi_hash_table_remove_value_uint64(ompi_hash_table_t *table,
|
||||
*
|
||||
* @param table The input hash table (IN).
|
||||
* @param key The input key (IN).
|
||||
* @return The value associated with the key or NULL if the item is not found.
|
||||
* @param ptr The value associated with the key
|
||||
* @return integer return code:
|
||||
* - OMPI_SUCCESS if key was found
|
||||
* - OMPI_ERR_NOT_FOUND if key was not found
|
||||
* - OMPI_ERROR other error
|
||||
*
|
||||
*/
|
||||
|
||||
OMPI_DECLSPEC void *ompi_hash_table_get_value_ptr(ompi_hash_table_t *table, const void* key, size_t keylen);
|
||||
OMPI_DECLSPEC int ompi_hash_table_get_value_ptr(ompi_hash_table_t *table, const void* key,
|
||||
size_t keylen, void **ptr);
|
||||
|
||||
/**
|
||||
* Set value based on arbitrary length binary key.
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user