/* 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 <string.h>
-#include <stdio.h>
+#include <cstdio>
+#include <cstring>
#include "xbt/dict.h"
#include "xbt/ex.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt, "Dictionaries provide the same functionalities as hash tables");
-/**
- * \brief Constructor
- * \return pointer to the destination
- * \see xbt_dict_new_homogenous(), xbt_dict_free()
- *
- * Creates and initialize a new dictionary with a default hashtable size.
- * The dictionary is heterogeneous: each element can have a different free function.
- */
xbt_dict_t xbt_dict_new()
{
XBT_WARN("Function xbt_dict_new() will soon be dropped. Please switch to xbt_dict_new_homogeneous()");
*/
void xbt_dict_free(xbt_dict_t * dict)
{
- xbt_dictelm_t current;
- xbt_dictelm_t previous;
- int table_size;
- xbt_dictelm_t *table;
-
- // if ( *dict ) xbt_dict_dump_sizes(*dict);
-
if (dict != nullptr && *dict != nullptr) {
- table_size = (*dict)->table_size;
- table = (*dict)->table;
+ int table_size = (*dict)->table_size;
+ xbt_dictelm_t* table = (*dict)->table;
/* Warning: the size of the table is 'table_size+1'...
* This is because table_size is used as a binary mask in xbt_dict_rehash */
for (int i = 0; (*dict)->count && i <= table_size; i++) {
- current = table[i];
+ xbt_dictelm_t current = table[i];
+ xbt_dictelm_t previous;
+
while (current != nullptr) {
previous = current;
current = current->next;
newsize--;
dict->table_size = newsize;
dict->table = currcell;
- XBT_DEBUG("REHASH (%d->%d)", oldsize, newsize);
+ XBT_DEBUG("REHASH (%u->%u)", oldsize, newsize);
for (unsigned i = 0; i < oldsize; i++, currcell++) {
- if (!*currcell) /* empty cell */
+ if (*currcell == nullptr) /* empty cell */
continue;
xbt_dictelm_t *twincell = currcell + oldsize;
if ((bucklet->hash_code & newsize) != i) { /* Move to b */
*pprev = bucklet->next;
bucklet->next = *twincell;
- if (!*twincell)
+ if (*twincell == nullptr)
dict->fill++;
*twincell = bucklet;
} else {
}
}
- if (!*currcell) /* everything moved */
+ if (*currcell == nullptr) /* everything moved */
dict->fill--;
}
}
xbt_dictelm_t current;
xbt_dictelm_t previous = nullptr;
- xbt_assert(!free_ctn, "Cannot set an individual free function in homogeneous dicts.");
+ xbt_assert(not free_ctn, "Cannot set an individual free function in homogeneous dicts.");
XBT_CDEBUG(xbt_dict, "ADD %.*s hash = %u, size = %d, & = %u", key_len, key, hash_code,
dict->table_size, hash_code & dict->table_size);
current = dict->table[hash_code & dict->table_size];
}
}
- if (!dict->table[hash_code & dict->table_size])
+ if (not dict->table[hash_code & dict->table_size])
dict->fill--;
xbt_dictelm_free(dict, current);
*/
int xbt_dict_is_empty(xbt_dict_t dict)
{
- return !dict || (xbt_dict_length(dict) == 0);
+ return not dict || (xbt_dict_length(dict) == 0);
}
/**
*/
void xbt_dict_dump(xbt_dict_t dict, void_f_pvoid_t output)
{
- int i;
xbt_dictelm_t element;
printf("Dict %p:\n", dict);
if (dict != nullptr) {
- for (i = 0; i < dict->table_size; i++) {
+ for (int i = 0; i < dict->table_size; i++) {
element = dict->table[i];
if (element) {
printf("[\n");
printf("Dict %p: %d bucklets, %d used cells (of %d) ", dict, dict->count, dict->fill, dict->table_size);
- if (!dict) {
+ if (not dict) {
printf("\n");
return;
}
xbt_dynar_set(sizes, size, &prevsize);
}
}
- if (!all_sizes)
+ if (not all_sizes)
all_sizes = xbt_dynar_new(sizeof(int), nullptr);
xbt_dynar_foreach(sizes, count, size) {
}
#ifdef SIMGRID_TEST
-#include <time.h>
+#include "src/internal_config.h"
#include "xbt.h"
#include "xbt/ex.h"
+#include <ctime>
#include <xbt/ex.hpp>
-#include "src/internal_config.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict);
debugged_add_ext(head, key, key);
}
-static xbt_dict_t new_fixture(void)
+static xbt_dict_t new_fixture()
{
xbt_test_add("Fill in the dictionnary");
if (data) {
xbt_test_assert(found, "data do not match expectations: found nullptr while searching for %s", data);
if (found)
- xbt_test_assert(!strcmp(data, found), "data do not match expectations: found %s while searching for %s",
- found, data);
+ xbt_test_assert(not strcmp(data, found), "data do not match expectations: found %s while searching for %s", found,
+ data);
} else {
- xbt_test_assert(!found, "data do not match expectations: found %s while searching for nullptr", found);
+ xbt_test_assert(not found, "data do not match expectations: found %s while searching for nullptr", found);
}
}
int i = 0;
xbt_dict_foreach(head, cursor, key, data) {
- if (!key || !data || strcmp(key, data)) {
+ if (not key || not data || strcmp(key, data)) {
xbt_test_log("Seen #%d: %s->%s", ++i, key, data);
} else {
xbt_test_log("Seen #%d: %s", ++i, key);
}
- xbt_test_assert(!data || !strcmp(key, data), "Key(%s) != value(%s). Aborting", key, data);
+ xbt_test_assert(not data || not strcmp(key, data), "Key(%s) != value(%s). Aborting", key, data);
}
}
xbt_dict_foreach(dict, cursor, key, data) {
effective++;
char* key2 = xbt_dict_get_key(dict, data);
- xbt_assert(!strcmp(key, key2), "The data was registered under %s instead of %s as expected", key2, key);
+ xbt_assert(not strcmp(key, key2), "The data was registered under %s instead of %s as expected", key2, key);
}
xbt_test_assert(effective == length, "Effective length(%d) != %d.", effective, length);
xbt_test_add("Search 123");
char* data = (char*)xbt_dict_get(head, "123");
xbt_test_assert(data);
- xbt_test_assert(!strcmp("123", data));
+ xbt_test_assert(not strcmp("123", data));
search_not_found(head, "Can't be found");
search_not_found(head, "123 Can't be found");
char* data;
xbt_dict_foreach(head, cursor, key, data) {
- if (!key || !data || strcmp(key, data)) {
+ if (not key || not data || strcmp(key, data)) {
xbt_test_log("Seen: %s->%s", key, data);
} else {
xbt_test_log("Seen: %s", key);
}
- if (!strcmp(key, "null"))
+ if (not strcmp(key, "null"))
found = 1;
}
xbt_test_assert(found, "the key 'null', associated to nullptr is not found");
xbt_dict_set(head, key, key, nullptr);
data = (char*) xbt_dict_get(head, key);
- xbt_test_assert(!strcmp(key, data), "Retrieved value (%s) != Injected value (%s)", key, data);
+ xbt_test_assert(not strcmp(key, data), "Retrieved value (%s) != Injected value (%s)", key, data);
count(head, j + 1);
}
xbt_dict_t head = xbt_dict_new_homogeneous(&free);
xbt_test_add("Fill %d elements, with keys being the number of element", NB_ELM);
for (int j = 0; j < NB_ELM; j++) {
- /* if (!(j%1000)) { printf("."); fflush(stdout); } */
char* key = (char*)xbt_malloc(10);
snprintf(key,10, "%d", j);
for (int j = 0; j < NB_ELM; j++) {
snprintf(key,10, "%d", j);
void* data = xbt_dict_get(head, key);
- xbt_test_assert(!strcmp(key, (char *) data), "with get, key=%s != data=%s", key, (char *) data);
+ xbt_test_assert(not strcmp(key, (char*)data), "with get, key=%s != data=%s", key, (char*)data);
data = xbt_dict_get_ext(head, key, strlen(key));
- xbt_test_assert(!strcmp(key, (char *) data), "with get_ext, key=%s != data=%s", key, (char *) data);
+ xbt_test_assert(not strcmp(key, (char*)data), "with get_ext, key=%s != data=%s", key, (char*)data);
}
}
free(key);
xbt_test_add("Remove my %d elements", NB_ELM);
key = (char*) xbt_malloc(10);
for (int j = 0; j < NB_ELM; j++) {
- /* if (!(j%10000)) printf("."); fflush(stdout); */
snprintf(key,10, "%d", j);
xbt_dict_remove(head, key);
}