X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/138e6f86566611611b1115c957cae0a1c6a85a4b..f67e9f5d0e553ae935bd6cad29df46f1565173bf:/src/xbt/dict.cpp

diff --git a/src/xbt/dict.cpp b/src/xbt/dict.cpp
index f922c79137..7a295c5b72 100644
--- a/src/xbt/dict.cpp
+++ b/src/xbt/dict.cpp
@@ -1,51 +1,36 @@
 /* dict - a generic dictionary, variation over hash table                   */
 
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2019. 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 <string.h>
-#include <stdio.h>
 #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 "src/xbt_modinter.h"
 #include "xbt/str.h"
-#include "dict_private.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(void)
-{
-  xbt_dict_t dict = xbt_dict_new_homogeneous(NULL);
-  dict->homogeneous = 0;
+#include <cstdio>
+#include <cstring>
 
-  return dict;
-}
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt, "Dictionaries provide the same functionalities as hash tables");
 
 /**
- * \brief Constructor
- * \param free_ctn function to call with (\a data as argument) when \a data is removed from the dictionary
- * \return pointer to the destination
- * \see xbt_dict_new(), xbt_dict_free()
+ * @brief Constructor
+ * @param free_ctn function to call with (@a data as argument) when @a data is removed from the dictionary
+ * @return pointer to the destination
+ * @see xbt_dict_free()
  *
  * Creates and initialize a new dictionary with a default hashtable size.
  * The dictionary is homogeneous: each element share the same free function.
  */
 xbt_dict_t xbt_dict_new_homogeneous(void_f_pvoid_t free_ctn)
 {
-  if (dict_elm_mallocator == NULL)
+  if (dict_elm_mallocator == nullptr)
     xbt_dict_preinit();
 
   xbt_dict_t dict;
@@ -56,34 +41,28 @@ xbt_dict_t xbt_dict_new_homogeneous(void_f_pvoid_t free_ctn)
   dict->table = xbt_new0(xbt_dictelm_t, dict->table_size + 1);
   dict->count = 0;
   dict->fill = 0;
-  dict->homogeneous = 1;
 
   return dict;
 }
 
 /**
- * \brief Destructor
- * \param dict the dictionary to be freed
+ * @brief Destructor
+ * @param dict the dictionary to be freed
  *
  * Frees a dictionary with all the data
  */
 void xbt_dict_free(xbt_dict_t * dict)
 {
-  int i;
-  xbt_dictelm_t current, previous;
-  int table_size;
-  xbt_dictelm_t *table;
-
-  //  if ( *dict )  xbt_dict_dump_sizes(*dict);
-
-  if (dict != NULL && *dict != NULL) {
-    table_size = (*dict)->table_size;
-    table = (*dict)->table;
+  if (dict != nullptr && *dict != nullptr) {
+    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 (i = 0; (*dict)->count && i <= table_size; i++) {
-      current = table[i];
-      while (current != NULL) {
+    for (int i = 0; (*dict)->count && i <= table_size; i++) {
+      xbt_dictelm_t current = table[i];
+      xbt_dictelm_t previous;
+
+      while (current != nullptr) {
         previous = current;
         current = current->next;
         xbt_dictelm_free(*dict, previous);
@@ -92,14 +71,14 @@ void xbt_dict_free(xbt_dict_t * dict)
     }
     xbt_free(table);
     xbt_free(*dict);
-    *dict = NULL;
+    *dict = nullptr;
   }
 }
 
 /** Returns the amount of elements in the dict */
 unsigned int xbt_dict_size(xbt_dict_t dict)
 {
-  return (dict ? (unsigned int) dict->count : (unsigned int) 0);
+  return (dict != nullptr ? static_cast<unsigned int>(dict->count) : static_cast<unsigned int>(0));
 }
 
 /* Expend the size of the dict */
@@ -107,74 +86,74 @@ static void xbt_dict_rehash(xbt_dict_t dict)
 {
   const unsigned oldsize = dict->table_size + 1;
   unsigned newsize = oldsize * 2;
-  xbt_dictelm_t *currcell;
-  xbt_dictelm_t *twincell;
-  xbt_dictelm_t bucklet;
-  xbt_dictelm_t *pprev;
 
-  currcell = (xbt_dictelm_t *) xbt_realloc((char *) dict->table, newsize * sizeof(xbt_dictelm_t));
+  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 */
-  dict->table_size = --newsize;
+  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;
-    twincell = currcell + oldsize;
-    for (pprev = currcell, bucklet = *currcell; bucklet; bucklet = *pprev) {
+
+    xbt_dictelm_t *twincell = currcell + oldsize;
+    xbt_dictelm_t *pprev = currcell;
+    xbt_dictelm_t bucklet = *currcell;
+    for (; bucklet != nullptr; bucklet = *pprev) {
       /* 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) */
       if ((bucklet->hash_code & newsize) != i) {        /* Move to b */
         *pprev = bucklet->next;
         bucklet->next = *twincell;
-        if (!*twincell)
+        if (*twincell == nullptr)
           dict->fill++;
         *twincell = bucklet;
-        continue;
       } else {
         pprev = &bucklet->next;
       }
     }
 
-    if (!*currcell)             /* everything moved */
+    if (*currcell == nullptr) /* everything moved */
       dict->fill--;
   }
 }
 
 /**
- * \brief Add data to the dict (arbitrary key)
- * \param dict the container
- * \param key the key to set the new data
- * \param key_len the size of the \a key
- * \param data the data to add in the dict
- * \param free_ctn function to call with (\a data as argument) when \a data is removed from the dictionary. This param
- *        will only be considered when the dict was instantiated with xbt_dict_new() and not xbt_dict_new_homogeneous()
+ * @brief Add data to the dict (arbitrary key)
+ * @param dict the container
+ * @param key the key to set the new data
+ * @param key_len the size of the @a key
+ * @param data the data to add in the dict
+ * @param free_ctn unused parameter (kept for compatibility)
  *
- * Set the \a data in the structure under the \a key, which can be any kind of data, as long as its length is provided
- * in \a key_len.
+ * Set the @a data in the structure under the @a key, which can be any kind of data, as long as its length is provided
+ * in @a key_len.
  */
-void xbt_dict_set_ext(xbt_dict_t dict, const char *key, int key_len, void *data, void_f_pvoid_t free_ctn)
+void xbt_dict_set_ext(xbt_dict_t dict, const char* key, int key_len, void* data,
+                      XBT_ATTRIB_UNUSED void_f_pvoid_t free_ctn)
 {
   unsigned int hash_code = xbt_str_hash_ext(key, key_len);
 
-  xbt_dictelm_t current, previous = NULL;
+  xbt_dictelm_t current;
+  xbt_dictelm_t previous = nullptr;
 
   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];
-  while (current != NULL && (hash_code != current->hash_code || key_len != current->key_len
+  while (current != nullptr && (hash_code != current->hash_code || key_len != current->key_len
           || memcmp(key, current->key, key_len))) {
     previous = current;
     current = current->next;
   }
 
-  if (current == NULL) {
+  if (current == nullptr) {
     /* this key doesn't exist yet */
-    current = xbt_dictelm_new(dict, key, key_len, hash_code, data, free_ctn);
+    current = xbt_dictelm_new(key, key_len, hash_code, data);
     dict->count++;
-    if (previous == NULL) {
+    if (previous == nullptr) {
       dict->table[hash_code & dict->table_size] = current;
       dict->fill++;
       if ((dict->fill * 100) / (dict->table_size + 1) > MAX_FILL_PERCENT)
@@ -186,20 +165,19 @@ void xbt_dict_set_ext(xbt_dict_t dict, const char *key, int key_len, void *data,
     XBT_CDEBUG(xbt_dict, "Replace %.*s by %.*s under key %.*s",
                key_len, (char *) current->content, key_len, (char *) data, key_len, (char *) key);
     /* there is already an element with the same key: overwrite it */
-    xbt_dictelm_set_data(dict, current, data, free_ctn);
+    xbt_dictelm_set_data(dict, current, data);
   }
 }
 
 /**
- * \brief Add data to the dict (null-terminated key)
+ * @brief Add data to the dict (null-terminated key)
  *
- * \param dict the dict
- * \param key the key to set the new data
- * \param data the data to add in the dict
- * \param free_ctn function to call with (\a data as argument) when \a data is removed from the dictionary. This param
- *        will only be considered when the dict was instantiated with xbt_dict_new() and not xbt_dict_new_homogeneous()
+ * @param dict the dict
+ * @param key the key to set the new data
+ * @param data the data to add in the dict
+ * @param free_ctn unused parameter (kept for compatibility)
  *
- * set the \a data in the structure under the \a key, which is anull terminated string.
+ * set the @a data in the structure under the @a key, which is anull terminated string.
  */
 void xbt_dict_set(xbt_dict_t dict, const char *key, void *data, void_f_pvoid_t free_ctn)
 {
@@ -207,44 +185,44 @@ void xbt_dict_set(xbt_dict_t dict, const char *key, void *data, void_f_pvoid_t f
 }
 
 /**
- * \brief Retrieve data from the dict (arbitrary key)
+ * @brief Retrieve data from the dict (arbitrary key)
  *
- * \param dict the dealer of data
- * \param key the key to find data
- * \param key_len the size of the \a key
- * \return the data that we are looking for
+ * @param dict the dealer of data
+ * @param key the key to find data
+ * @param key_len the size of the @a key
+ * @return the data that we are looking for
  *
- * Search the given \a key. Throws not_found_error when not found.
+ * Search the given @a key. Throws not_found_error when not found.
  */
 void *xbt_dict_get_ext(xbt_dict_t dict, const char *key, int key_len)
 {
   unsigned int hash_code = xbt_str_hash_ext(key, key_len);
   xbt_dictelm_t current = dict->table[hash_code & dict->table_size];
 
-  while (current != NULL && (hash_code != current->hash_code || key_len != current->key_len
+  while (current != nullptr && (hash_code != current->hash_code || key_len != current->key_len
           || memcmp(key, current->key, key_len))) {
     current = current->next;
   }
 
-  if (current == NULL)
+  if (current == nullptr)
     THROWF(not_found_error, 0, "key %.*s not found", key_len, key);
 
   return current->content;
 }
 
-/** @brief like xbt_dict_get_ext(), but returning NULL when not found */
+/** @brief like xbt_dict_get_ext(), but returning nullptr when not found */
 void *xbt_dict_get_or_null_ext(xbt_dict_t dict, const char *key, int key_len)
 {
   unsigned int hash_code = xbt_str_hash_ext(key, key_len);
   xbt_dictelm_t current = dict->table[hash_code & dict->table_size];
 
-  while (current != NULL && (hash_code != current->hash_code || key_len != current->key_len
+  while (current != nullptr && (hash_code != current->hash_code || key_len != current->key_len
           || memcmp(key, current->key, key_len))) {
     current = current->next;
   }
 
-  if (current == NULL)
-    return NULL;
+  if (current == nullptr)
+    return nullptr;
 
   return current->content;
 }
@@ -252,36 +230,30 @@ void *xbt_dict_get_or_null_ext(xbt_dict_t dict, const char *key, int key_len)
 /**
  * @brief retrieve the key associated to that object. Warning, that's a linear search
  *
- * Returns NULL if the object cannot be found
+ * Returns nullptr if the object cannot be found
  */
 char *xbt_dict_get_key(xbt_dict_t dict, const void *data)
 {
   for (int i = 0; i <= dict->table_size; i++) {
     xbt_dictelm_t current = dict->table[i];
-    while (current != NULL) {
+    while (current != nullptr) {
       if (current->content == data)
         return current->key;
       current = current->next;
     }
   }
-  return NULL;
-}
-
-/** @brief retrieve the key associated to that xbt_dictelm_t. */
-char *xbt_dict_get_elm_key(xbt_dictelm_t elm)
-{
-  return elm->key;
+  return nullptr;
 }
 
 /**
- * \brief Retrieve data from the dict (null-terminated key)
+ * @brief Retrieve data from the dict (null-terminated key)
  *
- * \param dict the dealer of data
- * \param key the key to find data
- * \return the data that we are looking for
+ * @param dict the dealer of data
+ * @param key the key to find data
+ * @return the data that we are looking for
  *
- * Search the given \a key. Throws not_found_error when not found.
- * Check xbt_dict_get_or_null() for a version returning NULL without exception when not found.
+ * Search the given @a key. Throws not_found_error when not found.
+ * Check xbt_dict_get_or_null() for a version returning nullptr without exception when not found.
  */
 void *xbt_dict_get(xbt_dict_t dict, const char *key)
 {
@@ -289,82 +261,83 @@ void *xbt_dict_get(xbt_dict_t dict, const char *key)
 }
 
 /**
- * \brief Retrieve element from the dict (null-terminated key)
+ * @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
+ * @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 not_found_error when not found.
- * Check xbt_dict_get_or_null() for a version returning NULL without exception when not found.
+ * Search the given @a key. Throws not_found_error 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(xbt_dict_t dict, const char *key)
 {
   xbt_dictelm_t current = xbt_dict_get_elm_or_null(dict, key);
 
-  if (current == NULL)
+  if (current == nullptr)
     THROWF(not_found_error, 0, "key %s not found", key);
 
   return current;
 }
 
 /**
- * \brief like xbt_dict_get(), but returning NULL when not found
+ * @brief like xbt_dict_get(), but returning nullptr when not found
  */
 void *xbt_dict_get_or_null(xbt_dict_t dict, const char *key)
 {
   xbt_dictelm_t current = xbt_dict_get_elm_or_null(dict, key);
 
-  if (current == NULL)
-    return NULL;
+  if (current == nullptr)
+    return nullptr;
 
   return current->content;
 }
 
 /**
- * \brief like xbt_dict_get_elm(), but returning NULL when not found
+ * @brief like xbt_dict_get_elm(), but returning nullptr when not found
  */
 xbt_dictelm_t xbt_dict_get_elm_or_null(xbt_dict_t dict, const char *key)
 {
   unsigned int hash_code = xbt_str_hash(key);
   xbt_dictelm_t current = dict->table[hash_code & dict->table_size];
 
-  while (current != NULL && (hash_code != current->hash_code || strcmp(key, current->key)))
+  while (current != nullptr && (hash_code != current->hash_code || strcmp(key, current->key)))
     current = current->next;
   return current;
 }
 
 /**
- * \brief Remove data from the dict (arbitrary key)
+ * @brief Remove data from the dict (arbitrary key)
  *
- * \param dict the trash can
- * \param key the key of the data to be removed
- * \param key_len the size of the \a key
+ * @param dict the trash can
+ * @param key the key of the data to be removed
+ * @param key_len the size of the @a key
  *
- * Remove the entry associated with the given \a key (throws not_found)
+ * Remove the entry associated with the given @a key (throws not_found)
  */
 void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, int key_len)
 {
   unsigned int hash_code = xbt_str_hash_ext(key, key_len);
-  xbt_dictelm_t previous = NULL;
+  xbt_dictelm_t previous = nullptr;
   xbt_dictelm_t current = dict->table[hash_code & dict->table_size];
 
-  while (current != NULL && (hash_code != current->hash_code || key_len != current->key_len
+  while (current != nullptr && (hash_code != current->hash_code || key_len != current->key_len
           || strncmp(key, current->key, key_len))) {
     previous = current;         /* save the previous node */
     current = current->next;
   }
 
-  if (current == NULL)
+  if (current == nullptr)
     THROWF(not_found_error, 0, "key %.*s not found", key_len, key);
-
-  if (previous != NULL) {
-    previous->next = current->next;
-  } else {
-    dict->table[hash_code & dict->table_size] = current->next;
+  else {
+    if (previous != nullptr) {
+      previous->next = current->next;
+    } else {
+      dict->table[hash_code & dict->table_size] = current->next;
+    }
   }
 
-  if (!dict->table[hash_code & dict->table_size])
+  if (not dict->table[hash_code & dict->table_size])
     dict->fill--;
 
   xbt_dictelm_free(dict, current);
@@ -372,12 +345,12 @@ void xbt_dict_remove_ext(xbt_dict_t dict, const char *key, int key_len)
 }
 
 /**
- * \brief Remove data from the dict (null-terminated key)
+ * @brief Remove data from the dict (null-terminated key)
  *
- * \param dict the dict
- * \param key the key of the data to be removed
+ * @param dict the dict
+ * @param key the key of the data to be removed
  *
- * Remove the entry associated with the given \a key
+ * Remove the entry associated with the given @a key
  */
 void xbt_dict_remove(xbt_dict_t dict, const char *key)
 {
@@ -391,14 +364,14 @@ void xbt_dict_reset(xbt_dict_t dict)
     return;
 
   for (int i = 0; i <= dict->table_size; i++) {
-    xbt_dictelm_t previous = NULL;
+    xbt_dictelm_t previous = nullptr;
     xbt_dictelm_t current = dict->table[i];
-    while (current != NULL) {
+    while (current != nullptr) {
       previous = current;
       current = current->next;
       xbt_dictelm_free(dict, previous);
     }
-    dict->table[i] = NULL;
+    dict->table[i] = nullptr;
   }
 
   dict->count = 0;
@@ -406,50 +379,43 @@ void xbt_dict_reset(xbt_dict_t dict)
 }
 
 /**
- * \brief Return the number of elements in the dict.
- * \param dict a dictionary
+ * @brief Return the number of elements in the dict.
+ * @param dict a dictionary
  */
 int xbt_dict_length(xbt_dict_t dict)
 {
   return dict->count;
 }
 
-/** @brief function to be used in xbt_dict_dump as long as the stored values are strings */
-void xbt_dict_dump_output_string(void *s)
-{
-  fputs((char*) s, stdout);
-}
-
 /**
- * \brief test if the dict is empty or not
+ * @brief test if the dict is empty or not
  */
 int xbt_dict_is_empty(xbt_dict_t dict)
 {
-  return !dict || (xbt_dict_length(dict) == 0);
+  return not dict || (xbt_dict_length(dict) == 0);
 }
 
 /**
- * \brief Outputs the content of the structure (debugging purpose)
+ * @brief Outputs the content of the structure (debugging purpose)
  *
- * \param dict the exibitionist
- * \param output a function to dump each data in the tree (check @ref xbt_dict_dump_output_string)
+ * @param dict the exibitionist
+ * @param output a function to dump each data in the tree
  *
- * Outputs the content of the structure. (for debugging purpose). \a output is a function to output the data. If NULL,
- * data won't be displayed.
+ * Outputs the content of the structure. (for debugging purpose).
+ * @a output is a function to output the data. If nullptr, data won't be displayed.
  */
 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 != NULL) {
-    for (i = 0; i < dict->table_size; i++) {
+  if (dict != nullptr) {
+    for (int i = 0; i < dict->table_size; i++) {
       element = dict->table[i];
       if (element) {
         printf("[\n");
-        while (element != NULL) {
+        while (element != nullptr) {
           printf(" %s -> '", element->key);
-          if (output != NULL) {
+          if (output != nullptr) {
             output(element->content);
           }
           printf("'\n");
@@ -463,158 +429,73 @@ void xbt_dict_dump(xbt_dict_t dict, void_f_pvoid_t output)
   }
 }
 
-xbt_dynar_t all_sizes = NULL;
-/** @brief shows some debugging info about the bucklet repartition */
-void xbt_dict_dump_sizes(xbt_dict_t dict)
-{
-  unsigned int count;
-  unsigned int size;
-
-  printf("Dict %p: %d bucklets, %d used cells (of %d) ", dict, dict->count, dict->fill, dict->table_size);
-
-  if (!dict) {
-    printf("\n");
-    return;
-  }
-  xbt_dynar_t sizes = xbt_dynar_new(sizeof(int), NULL);
-
-  for (int i = 0; i < dict->table_size; i++) {
-    xbt_dictelm_t element = dict->table[i];
-    size = 0;
-    if (element) {
-      while (element != NULL) {
-        size++;
-        element = element->next;
-      }
-    }
-    if (xbt_dynar_length(sizes) <= size) {
-      int prevsize = 1;
-      xbt_dynar_set(sizes, size, &prevsize);
-    } else {
-      int prevsize;
-      xbt_dynar_get_cpy(sizes, size, &prevsize);
-      prevsize++;
-      xbt_dynar_set(sizes, size, &prevsize);
-    }
-  }
-  if (!all_sizes)
-    all_sizes = xbt_dynar_new(sizeof(int), NULL);
-
-  xbt_dynar_foreach(sizes, count, size) {
-    /* Copy values of this one into all_sizes */
-    int prevcount;
-    if (xbt_dynar_length(all_sizes) <= count) {
-      prevcount = size;
-      xbt_dynar_set(all_sizes, count, &prevcount);
-    } else {
-      xbt_dynar_get_cpy(all_sizes, count, &prevcount);
-      prevcount += size;
-      xbt_dynar_set(all_sizes, count, &prevcount);
-    }
-
-    /* Report current sizes */
-    if (count == 0)
-      continue;
-    if (size == 0)
-      continue;
-    printf("%uelm x %u cells; ", count, size);
-  }
-  printf("\n");
-  xbt_dynar_free(&sizes);
-}
-
 /**
  * Create the dict mallocators.
  * This is an internal XBT function called during the lib initialization.
  * It can be used several times to recreate the mallocator, for example when you switch to MC mode
  */
-void xbt_dict_preinit(void)
+void xbt_dict_preinit()
 {
-  if (dict_elm_mallocator == NULL)
-    dict_elm_mallocator = xbt_mallocator_new(
-      256, dict_elm_mallocator_new_f, dict_elm_mallocator_free_f,
+  if (dict_elm_mallocator == nullptr)
+    dict_elm_mallocator = xbt_mallocator_new(256, dict_elm_mallocator_new_f, dict_elm_mallocator_free_f,
       dict_elm_mallocator_reset_f);
-  if (dict_het_elm_mallocator == NULL)
-    dict_het_elm_mallocator = xbt_mallocator_new(
-      256, dict_het_elm_mallocator_new_f, dict_het_elm_mallocator_free_f,
-      dict_het_elm_mallocator_reset_f);
 }
 
 /**
  * Destroy the dict mallocators.
  * This is an internal XBT function during the lib initialization
  */
-void xbt_dict_postexit(void)
+void xbt_dict_postexit()
 {
-  if (dict_elm_mallocator != NULL) {
+  if (dict_elm_mallocator != nullptr) {
     xbt_mallocator_free(dict_elm_mallocator);
-    dict_elm_mallocator = NULL;
-    xbt_mallocator_free(dict_het_elm_mallocator);
-    dict_het_elm_mallocator = NULL;
-  }
-  if (all_sizes) {
-    unsigned int count;
-    int size;
-    double avg = 0;
-    int total_count = 0;
-    printf("Overall stats:");
-    xbt_dynar_foreach(all_sizes, count, size) {
-      if (count == 0)
-        continue;
-      if (size == 0)
-        continue;
-      printf("%uelm x %d cells; ", count, size);
-      avg += count * size;
-      total_count += size;
-    }
-    printf("; %f elm per cell\n", avg / (double) total_count);
+    dict_elm_mallocator = nullptr;
   }
 }
 
 #ifdef SIMGRID_TEST
-#include <time.h>
+#include "simgrid/Exception.hpp"
+#include "src/internal_config.h"
 #include "xbt.h"
 #include "xbt/ex.h"
-#include "src/internal_config.h"
+#include <ctime>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict);
 
 XBT_TEST_SUITE("dict", "Dict data container");
 
-static void debuged_add_ext(xbt_dict_t head, const char *key, const char *data_to_fill, void_f_pvoid_t free_f)
+static void debugged_add_ext(xbt_dict_t head, const char* key, const char* data_to_fill)
 {
   char *data = xbt_strdup(data_to_fill);
 
   xbt_test_log("Add %s under %s", data_to_fill, key);
 
-  xbt_dict_set(head, key, data, free_f);
+  xbt_dict_set(head, key, data, nullptr);
   if (XBT_LOG_ISENABLED(xbt_dict, xbt_log_priority_debug)) {
-    xbt_dict_dump(head, (void (*)(void *)) &printf);
+    xbt_dict_dump(head, [](void* s) { fputs((char*)s, stdout); });
     fflush(stdout);
   }
 }
 
-static void debuged_add(xbt_dict_t head, const char *key, void_f_pvoid_t free_f)
+static void debugged_add(xbt_dict_t head, const char* key)
 {
-  debuged_add_ext(head, key, key, free_f);
+  debugged_add_ext(head, key, key);
 }
 
-static void fill(xbt_dict_t * head, int homogeneous)
+static xbt_dict_t new_fixture()
 {
-  void_f_pvoid_t free_f = homogeneous ? NULL : &free;
-
   xbt_test_add("Fill in the dictionnary");
 
-  *head = homogeneous ? xbt_dict_new_homogeneous(&free) : xbt_dict_new();
-  debuged_add(*head, "12", free_f);
-  debuged_add(*head, "12a", free_f);
-  debuged_add(*head, "12b", free_f);
-  debuged_add(*head, "123", free_f);
-  debuged_add(*head, "123456", free_f);
-  /* Child becomes child of what to add */
-  debuged_add(*head, "1234", free_f);
-  /* Need of common ancestor */
-  debuged_add(*head, "123457", free_f);
+  xbt_dict_t head = xbt_dict_new_homogeneous(&free);
+  debugged_add(head, "12");
+  debugged_add(head, "12a");
+  debugged_add(head, "12b");
+  debugged_add(head, "123");
+  debugged_add(head, "123456");
+  debugged_add(head, "1234");
+  debugged_add(head, "123457");
+
+  return head;
 }
 
 static void search_ext(xbt_dict_t head, const char *key, const char *data)
@@ -623,12 +504,12 @@ static void search_ext(xbt_dict_t head, const char *key, const char *data)
   char *found = (char*) xbt_dict_get(head, key);
   xbt_test_log("Found %s", found);
   if (data) {
-    xbt_test_assert(found, "data do not match expectations: found NULL while searching for %s", 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 NULL", found);
+    xbt_test_assert(not found, "data do not match expectations: found %s while searching for nullptr", found);
   }
 }
 
@@ -637,27 +518,26 @@ static void search(xbt_dict_t head, const char *key)
   search_ext(head, key, key);
 }
 
-static void debuged_remove(xbt_dict_t head, const char *key)
+static void debugged_remove(xbt_dict_t head, const char* key)
 {
   xbt_test_add("Remove '%s'", key);
   xbt_dict_remove(head, key);
-  /*  xbt_dict_dump(head,(void (*)(void*))&printf); */
 }
 
 static void traverse(xbt_dict_t head)
 {
-  xbt_dict_cursor_t cursor = NULL;
+  xbt_dict_cursor_t cursor = nullptr;
   char *key;
   char *data;
   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(key && data && strcmp(key, data) == 0, "Key(%s) != value(%s). Aborting", key, data);
   }
 }
 
@@ -680,14 +560,13 @@ static void search_not_found(xbt_dict_t head, const char *data)
 
 static void count(xbt_dict_t dict, int length)
 {
+  xbt_test_add("Count elements (expecting %d)", length);
+  xbt_test_assert(xbt_dict_length(dict) == length, "Announced length(%d) != %d.", xbt_dict_length(dict), length);
+
   xbt_dict_cursor_t cursor;
   char *key;
   void *data;
   int effective = 0;
-
-  xbt_test_add("Count elements (expecting %d)", length);
-  xbt_test_assert(xbt_dict_length(dict) == length, "Announced length(%d) != %d.", xbt_dict_length(dict), length);
-
   xbt_dict_foreach(dict, cursor, key, data)
       effective++;
 
@@ -698,7 +577,6 @@ static void count_check_get_key(xbt_dict_t dict, int length)
 {
   xbt_dict_cursor_t cursor;
   char *key;
-  XBT_ATTRIB_UNUSED char *key2;
   void *data;
   int effective = 0;
 
@@ -707,29 +585,23 @@ static void count_check_get_key(xbt_dict_t dict, int length)
 
   xbt_dict_foreach(dict, cursor, key, data) {
     effective++;
-    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);
+    char* key2 = xbt_dict_get_key(dict, data);
+    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_ex_t e;
-xbt_dict_t head = NULL;
-char *data;
-
-static void basic_test(int homogeneous)
+XBT_TEST_UNIT("basic", test_dict_basic, "Basic usage: change, retrieve and traverse homogeneous dicts")
 {
-  void_f_pvoid_t free_f;
-
   xbt_test_add("Traversal the null dictionary");
-  traverse(head);
+  traverse(nullptr);
 
   xbt_test_add("Traversal and search the empty dictionary");
-  head = homogeneous ? xbt_dict_new_homogeneous(&free) : xbt_dict_new();
+  xbt_dict_t head = xbt_dict_new_homogeneous(&free);
   traverse(head);
   try {
-    debuged_remove(head, "12346");
+    debugged_remove(head, "12346");
   }
   catch(xbt_ex& e) {
     if (e.category != not_found_error)
@@ -737,15 +609,13 @@ static void basic_test(int homogeneous)
   }
   xbt_dict_free(&head);
 
-  free_f = homogeneous ? NULL : &free;
-
   xbt_test_add("Traverse the full dictionary");
-  fill(&head, homogeneous);
+  head = new_fixture();
   count_check_get_key(head, 7);
 
-  debuged_add_ext(head, "toto", "tutu", free_f);
+  debugged_add_ext(head, "toto", "tutu");
   search_ext(head, "toto", "tutu");
-  debuged_remove(head, "toto");
+  debugged_remove(head, "toto");
 
   search(head, "12a");
   traverse(head);
@@ -755,22 +625,22 @@ static void basic_test(int homogeneous)
   xbt_dict_free(&head);
 
   /* CHANGING */
-  fill(&head, homogeneous);
+  head = new_fixture();
   count_check_get_key(head, 7);
   xbt_test_add("Change 123 to 'Changed 123'");
-  xbt_dict_set(head, "123", xbt_strdup("Changed 123"), free_f);
+  xbt_dict_set(head, "123", xbt_strdup("Changed 123"), nullptr);
   count_check_get_key(head, 7);
 
   xbt_test_add("Change 123 back to '123'");
-  xbt_dict_set(head, "123", xbt_strdup("123"), free_f);
+  xbt_dict_set(head, "123", xbt_strdup("123"), nullptr);
   count_check_get_key(head, 7);
 
   xbt_test_add("Change 12a to 'Dummy 12a'");
-  xbt_dict_set(head, "12a", xbt_strdup("Dummy 12a"), free_f);
+  xbt_dict_set(head, "12a", xbt_strdup("Dummy 12a"), nullptr);
   count_check_get_key(head, 7);
 
   xbt_test_add("Change 12a to '12a'");
-  xbt_dict_set(head, "12a", xbt_strdup("12a"), free_f);
+  xbt_dict_set(head, "12a", xbt_strdup("12a"), nullptr);
   count_check_get_key(head, 7);
 
   xbt_test_add("Traverse the resulting dictionary");
@@ -778,9 +648,8 @@ static void basic_test(int homogeneous)
 
   /* RETRIEVE */
   xbt_test_add("Search 123");
-  data = (char*) xbt_dict_get(head, "123");
-  xbt_test_assert(data);
-  xbt_test_assert(!strcmp("123", data));
+  char* data = (char*)xbt_dict_get(head, "123");
+  xbt_test_assert(data && strcmp("123", data) == 0);
 
   search_not_found(head, "Can't be found");
   search_not_found(head, "123 Can't be found");
@@ -796,8 +665,6 @@ static void basic_test(int homogeneous)
   xbt_test_add("Traverse the resulting dictionary");
   traverse(head);
 
-  /*  xbt_dict_dump(head,(void (*)(void*))&printf); */
-
   xbt_test_add("Free the dictionary twice");
   xbt_dict_free(&head);
   xbt_dict_free(&head);
@@ -806,23 +673,13 @@ static void basic_test(int homogeneous)
   traverse(head);
 }
 
-XBT_TEST_UNIT("basic_heterogeneous", test_dict_basic_heterogeneous, "Basic usage: change, retrieve, traverse: heterogeneous dict")
-{
-  basic_test(0);
-}
-
-XBT_TEST_UNIT("basic_homogeneous", test_dict_basic_homogeneous, "Basic usage: change, retrieve, traverse: homogeneous dict")
-{
-  basic_test(1);
-}
-
-static void remove_test(int homogeneous)
+XBT_TEST_UNIT("remove_homogeneous", test_dict_remove, "Removing some values from homogeneous dicts")
 {
-  fill(&head, homogeneous);
+  xbt_dict_t head = new_fixture();
   count(head, 7);
   xbt_test_add("Remove non existing data");
   try {
-    debuged_remove(head, "Does not exist");
+    debugged_remove(head, "Does not exist");
   }
   catch(xbt_ex& e) {
     if (e.category != not_found_error)
@@ -833,35 +690,35 @@ static void remove_test(int homogeneous)
   xbt_dict_free(&head);
 
   xbt_test_add("Remove each data manually (traversing the resulting dictionary each time)");
-  fill(&head, homogeneous);
-  debuged_remove(head, "12a");
+  head = new_fixture();
+  debugged_remove(head, "12a");
   traverse(head);
   count(head, 6);
-  debuged_remove(head, "12b");
+  debugged_remove(head, "12b");
   traverse(head);
   count(head, 5);
-  debuged_remove(head, "12");
+  debugged_remove(head, "12");
   traverse(head);
   count(head, 4);
-  debuged_remove(head, "123456");
+  debugged_remove(head, "123456");
   traverse(head);
   count(head, 3);
   try {
-    debuged_remove(head, "12346");
+    debugged_remove(head, "12346");
   }
   catch(xbt_ex& e) {
     if (e.category != not_found_error)
       xbt_test_exception(e);
     traverse(head);
   }
-  debuged_remove(head, "1234");
+  debugged_remove(head, "1234");
   traverse(head);
-  debuged_remove(head, "123457");
+  debugged_remove(head, "123457");
   traverse(head);
-  debuged_remove(head, "123");
+  debugged_remove(head, "123");
   traverse(head);
   try {
-    debuged_remove(head, "12346");
+    debugged_remove(head, "12346");
   }
   catch(xbt_ex& e) {
     if (e.category != not_found_error)
@@ -871,7 +728,7 @@ static void remove_test(int homogeneous)
 
   xbt_test_add("Free dict, create new fresh one, and then reset the dict");
   xbt_dict_free(&head);
-  fill(&head, homogeneous);
+  head = new_fixture();
   xbt_dict_reset(head);
   count(head, 0);
   traverse(head);
@@ -881,41 +738,32 @@ static void remove_test(int homogeneous)
   xbt_dict_free(&head);
 }
 
-XBT_TEST_UNIT("remove_heterogeneous", test_dict_remove_heterogeneous, "Removing some values: heterogeneous dict")
+XBT_TEST_UNIT("nulldata", test_dict_nulldata, "nullptr data management")
 {
-  remove_test(0);
-}
+  xbt_dict_t head = new_fixture();
 
-XBT_TEST_UNIT("remove_homogeneous", test_dict_remove_homogeneous, "Removing some values: homogeneous dict")
-{
-  remove_test(1);
-}
-
-XBT_TEST_UNIT("nulldata", test_dict_nulldata, "NULL data management")
-{
-  fill(&head, 1);
-
-  xbt_test_add("Store NULL under 'null'");
-  xbt_dict_set(head, "null", NULL, NULL);
-  search_ext(head, "null", NULL);
+  xbt_test_add("Store nullptr under 'null'");
+  xbt_dict_set(head, "null", nullptr, nullptr);
+  search_ext(head, "null", nullptr);
 
   xbt_test_add("Check whether I see it while traversing...");
   {
-    xbt_dict_cursor_t cursor = NULL;
+    xbt_dict_cursor_t cursor = nullptr;
     char *key;
     int found = 0;
+    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 (key && strcmp(key, "null") == 0)
         found = 1;
     }
-    xbt_test_assert(found, "the key 'null', associated to NULL is not found");
+    xbt_test_assert(found, "the key 'null', associated to nullptr is not found");
   }
   xbt_dict_free(&head);
 }
@@ -937,99 +785,85 @@ static int countelems(xbt_dict_t head)
 
 XBT_TEST_UNIT("crash", test_dict_crash, "Crash test")
 {
-  xbt_dict_t head = NULL;
-  int i, j, k;
-  char *key;
+  srand((unsigned int) time(nullptr));
 
-  srand((unsigned int) time(NULL));
-
-  for (i = 0; i < 10; i++) {
+  for (int i = 0; i < 10; i++) {
     xbt_test_add("CRASH test number %d (%d to go)", i + 1, 10 - i - 1);
     xbt_test_log("Fill the struct, count its elems and frees the structure");
     xbt_test_log("using 1000 elements with %d chars long randomized keys.", SIZEOFKEY);
-    head = xbt_dict_new();
-    /* if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); */
-    for (j = 0; j < 1000; j++) {
-      char *data = NULL;
-      key = (char*) xbt_malloc(SIZEOFKEY);
+    xbt_dict_t head = xbt_dict_new_homogeneous(free);
+    for (int j = 0; j < 1000; j++) {
+      char* data = nullptr;
+      char* key  = (char*)xbt_malloc(SIZEOFKEY);
 
       do {
-        for (k = 0; k < SIZEOFKEY - 1; k++)
+        for (int k         = 0; k < SIZEOFKEY - 1; k++)
           key[k] = rand() % ('z' - 'a') + 'a';
-        key[k] = '\0';
-        /*      printf("[%d %s]\n",j,key); */
+        key[SIZEOFKEY - 1] = '\0';
         data = (char*) xbt_dict_get_or_null(head, key);
-      } while (data != NULL);
+      } while (data != nullptr);
 
-      xbt_dict_set(head, key, key, &free);
+      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_dump(head,(void (*)(void*))&printf); */
     traverse(head);
     xbt_dict_free(&head);
     xbt_dict_free(&head);
   }
 
-  head = xbt_dict_new();
+  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 (j = 0; j < NB_ELM; j++) {
-    /* if (!(j%1000)) { printf("."); fflush(stdout); } */
-    key = (char*) xbt_malloc(10);
+  for (int j = 0; j < NB_ELM; j++) {
+    char* key = (char*)xbt_malloc(10);
 
     snprintf(key,10, "%d", j);
-    xbt_dict_set(head, key, key, &free);
+    xbt_dict_set(head, key, key, nullptr);
   }
-  /*xbt_dict_dump(head,(void (*)(void*))&printf); */
 
   xbt_test_add("Count the elements (retrieving the key and data for each)");
-  i = countelems(head);
-  xbt_test_log("There is %d elements", i);
+  xbt_test_log("There is %d elements", countelems(head));
 
   xbt_test_add("Search my %d elements 20 times", NB_ELM);
-  key = (char*) xbt_malloc(10);
-  for (i = 0; i < 20; i++) {
-    void *data;
-    /* if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); */
-    for (j = 0; j < NB_ELM; j++) {
+  char* key = (char*)xbt_malloc(10);
+  for (int i = 0; i < 20; i++) {
+    for (int j = 0; j < NB_ELM; j++) {
       snprintf(key,10, "%d", j);
-      data = xbt_dict_get(head, key);
-      xbt_test_assert(!strcmp(key, (char *) data), "with get, key=%s != data=%s", key, (char *) data);
+      void* data = xbt_dict_get(head, key);
+      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 (j = 0; j < NB_ELM; j++) {
-    /* if (!(j%10000)) printf("."); fflush(stdout); */
+  for (int j = 0; j < NB_ELM; j++) {
     snprintf(key,10, "%d", j);
     xbt_dict_remove(head, key);
   }
   free(key);
 
-  xbt_test_add("Free the structure (twice)");
+  xbt_test_add("Free the object (twice)");
   xbt_dict_free(&head);
   xbt_dict_free(&head);
 }
 
 XBT_TEST_UNIT("ext", test_dict_int, "Test dictionnary with int keys")
 {
-  xbt_dict_t dict = xbt_dict_new();
+  xbt_dict_t dict = xbt_dict_new_homogeneous(nullptr);
   int count = 500;
 
   xbt_test_add("Insert elements");
-  int i;
-  for (i = 0; i < count; ++i)
-    xbt_dict_set_ext(dict, (char*) &i, sizeof(i), (void*) (intptr_t) i, NULL);
+  for (int i = 0; i < count; ++i)
+    xbt_dict_set_ext(dict, (char*) &i, sizeof(i), (void*) (intptr_t) i, nullptr);
   xbt_test_assert(xbt_dict_size(dict) == (unsigned) count, "Bad number of elements in the dictionnary");
 
   xbt_test_add("Check elements");
-  for (i = 0; i < count; ++i) {
+  for (int i = 0; i < count; ++i) {
     int res = (int) (intptr_t) xbt_dict_get_ext(dict, (char*) &i, sizeof(i));
     xbt_test_assert(xbt_dict_size(dict) == (unsigned) count, "Unexpected value at index %i, expected %i but was %i", i, i, res);
   }