/* dict - a generic dictionary, variation over hash table */
-/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2022. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/dict.h"
#include "dict_private.h"
#include "simgrid/Exception.hpp"
-#include "src/xbt_modinter.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include "xbt/mallocator.h"
#include "xbt/str.h"
#include "xbt/string.hpp"
+#include "xbt/xbt_modinter.h"
+#include <algorithm>
#include <cstdio>
#include <cstring>
*/
xbt_dict_t xbt_dict_new_homogeneous(void_f_pvoid_t free_ctn)
{
- if (dict_elm_mallocator == nullptr)
- xbt_dict_preinit();
+ xbt_dict_preinit();
xbt_dict_t dict;
const unsigned oldsize = dict->table_size + 1;
unsigned newsize = oldsize * 2;
- xbt_dictelm_t *currcell = (xbt_dictelm_t *) xbt_realloc((char *) dict->table, newsize * sizeof(xbt_dictelm_t));
- memset(&currcell[oldsize], 0, oldsize * sizeof(xbt_dictelm_t)); /* zero second half */
+ auto* newtable = static_cast<xbt_dictelm_t*>(xbt_realloc(dict->table, newsize * sizeof(xbt_dictelm_t)));
+ std::fill(newtable + oldsize, newtable + newsize, nullptr); /* zero second half */
newsize--;
dict->table_size = newsize;
- dict->table = currcell;
+ dict->table = newtable;
XBT_DEBUG("REHASH (%u->%u)", oldsize, newsize);
- for (unsigned i = 0; i < oldsize; i++, currcell++) {
+ for (unsigned i = 0; i < oldsize; i++) {
+ xbt_dictelm_t* currcell = &newtable[i];
if (*currcell == nullptr) /* empty cell */
continue;
xbt_dictelm_t *twincell = currcell + oldsize;
xbt_dictelm_t *pprev = currcell;
xbt_dictelm_t bucklet = *currcell;
- for (; bucklet != nullptr; bucklet = *pprev) {
+ while (bucklet != nullptr) {
/* Since we use "& size" instead of "%size" and since the size was doubled, each bucklet of this cell must either:
- stay in cell i (ie, currcell)
- go to the cell i+oldsize (ie, twincell) */
} else {
pprev = &bucklet->next;
}
+ bucklet = *pprev;
}
if (*currcell == nullptr) /* everything moved */
* @param key_len the size of the @a key
* @return the data that we are looking for
*
- * Search the given @a key. Throws std::out_of_range when not found.
+ * Search the given @a key. Returns nullptr when not found.
*/
-void* xbt_dict_get_ext(const_xbt_dict_t dict, const char* key, int key_len)
-{
- unsigned int hash_code = xbt_str_hash_ext(key, key_len);
- const s_xbt_dictelm* current = dict->table[hash_code & dict->table_size];
-
- while (current != nullptr && (hash_code != current->hash_code || key_len != current->key_len
- || memcmp(key, current->key, key_len))) {
- current = current->next;
- }
-
- if (current == nullptr)
- throw std::out_of_range(simgrid::xbt::string_printf("key %.*s not found", key_len, key));
-
- return current->content;
-}
-
-/** @brief like xbt_dict_get_ext(), but returning nullptr when not found */
void* xbt_dict_get_or_null_ext(const_xbt_dict_t dict, const char* key, int key_len)
{
unsigned int hash_code = xbt_str_hash_ext(key, key_len);
return current->content;
}
-/**
- * @brief retrieve the key associated to that object. Warning, that's a linear search
- *
- * Returns nullptr if the object cannot be found
- */
-char* xbt_dict_get_key(const_xbt_dict_t dict, const void* data)
-{
- for (int i = 0; i <= dict->table_size; i++) {
- const s_xbt_dictelm* current = dict->table[i];
- while (current != nullptr) {
- if (current->content == data)
- return current->key;
- current = current->next;
- }
- }
- return nullptr;
-}
-
/**
* @brief Retrieve data from the dict (null-terminated key)
*
* @param key the key to find data
* @return the data that we are looking for
*
- * Search the given @a key. Throws std::out_of_range when not found.
- * Check xbt_dict_get_or_null() for a version returning nullptr without exception when not found.
- */
-void* xbt_dict_get(const_xbt_dict_t dict, const char* key)
-{
- return xbt_dict_get_elm(dict, key)->content;
-}
-
-/**
- * @brief Retrieve element from the dict (null-terminated key)
- *
- * @param dict the dealer of data
- * @param key the key to find data
- * @return the s_xbt_dictelm_t that we are looking for
- *
- * Search the given @a key. Throws std::out_of_range when not found.
- * Check xbt_dict_get_or_null() for a version returning nullptr without exception when not found.
- */
-xbt_dictelm_t xbt_dict_get_elm(const_xbt_dict_t dict, const char* key)
-{
- xbt_dictelm_t current = xbt_dict_get_elm_or_null(dict, key);
-
- if (current == nullptr)
- throw std::out_of_range(simgrid::xbt::string_printf("key %s not found", key));
-
- return current;
-}
-
-/**
- * @brief like xbt_dict_get(), but returning nullptr when not found
+ * Search the given @a key. Returns nullptr when not found.
*/
void* xbt_dict_get_or_null(const_xbt_dict_t dict, const char* key)
{
}
/**
- * @brief like xbt_dict_get_elm(), but returning nullptr when not found
+ * @brief Retrieve element from the dict (null-terminated key)
+ *
+ * @param dict the dealer of data
+ * @param key the key to find data
+ * @return the s_xbt_dictelm_t that we are looking for
+ *
+ * Search the given @a key. Returns nullptr when not found.
*/
xbt_dictelm_t xbt_dict_get_elm_or_null(const_xbt_dict_t dict, const char* key)
{
dict->count--;
}
-/**
- * @brief Remove data from the dict (null-terminated key)
- *
- * @param dict the dict
- * @param key the key of the data to be removed
- *
- * Remove the entry associated with the given @a key
- */
-void xbt_dict_remove(xbt_dict_t dict, const char *key)
-{
- xbt_dict_remove_ext(dict, key, strlen(key));
-}
-
-/** @brief Remove all data from the dict */
-void xbt_dict_reset(xbt_dict_t dict)
-{
- if (dict->count == 0)
- return;
-
- for (int i = 0; i <= dict->table_size; i++) {
- xbt_dictelm_t previous = nullptr;
- xbt_dictelm_t current = dict->table[i];
- while (current != nullptr) {
- previous = current;
- current = current->next;
- xbt_dictelm_free(dict, previous);
- }
- dict->table[i] = nullptr;
- }
-
- dict->count = 0;
- dict->fill = 0;
-}
-
/**
* @brief Return the number of elements in the dict.
* @param dict a dictionary
