A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stop loading surf.h from C files
[simgrid.git]
/
src
/
xbt
/
dict.cpp
diff --git
a/src/xbt/dict.cpp
b/src/xbt/dict.cpp
index
8dadf6b
..
2d2520d
100644
(file)
--- a/
src/xbt/dict.cpp
+++ b/
src/xbt/dict.cpp
@@
-6,8
+6,8
@@
/* 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. */
/* 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"
#include "xbt/dict.h"
#include "xbt/ex.h"
@@
-20,14
+20,6
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict, xbt, "Dictionaries provide the same functionalities as hash tables");
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()");
xbt_dict_t xbt_dict_new()
{
XBT_WARN("Function xbt_dict_new() will soon be dropped. Please switch to xbt_dict_new_homogeneous()");
@@
-72,20
+64,15
@@
xbt_dict_t xbt_dict_new_homogeneous(void_f_pvoid_t free_ctn)
*/
void xbt_dict_free(xbt_dict_t * dict)
{
*/
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) {
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++) {
/* 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;
while (current != nullptr) {
previous = current;
current = current->next;
@@
-116,10
+103,10
@@
static void xbt_dict_rehash(xbt_dict_t dict)
newsize--;
dict->table_size = newsize;
dict->table = currcell;
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++) {
for (unsigned i = 0; i < oldsize; i++, currcell++) {
- if (
!*currcell)
/* empty cell */
+ if (
*currcell == nullptr)
/* empty cell */
continue;
xbt_dictelm_t *twincell = currcell + oldsize;
continue;
xbt_dictelm_t *twincell = currcell + oldsize;
@@
-132,7
+119,7
@@
static void xbt_dict_rehash(xbt_dict_t dict)
if ((bucklet->hash_code & newsize) != i) { /* Move to b */
*pprev = bucklet->next;
bucklet->next = *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;
} else {
dict->fill++;
*twincell = bucklet;
} else {
@@
-140,7
+127,7
@@
static void xbt_dict_rehash(xbt_dict_t dict)
}
}
}
}
- if (
!*currcell)
/* everything moved */
+ if (
*currcell == nullptr)
/* everything moved */
dict->fill--;
}
}
dict->fill--;
}
}
@@
-444,11
+431,10
@@
int xbt_dict_is_empty(xbt_dict_t dict)
*/
void xbt_dict_dump(xbt_dict_t dict, void_f_pvoid_t output)
{
*/
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) {
xbt_dictelm_t element;
printf("Dict %p:\n", dict);
if (dict != nullptr) {
- for (i = 0; i < dict->table_size; i++) {
+ for (i
nt i
= 0; i < dict->table_size; i++) {
element = dict->table[i];
if (element) {
printf("[\n");
element = dict->table[i];
if (element) {
printf("[\n");
@@
-568,11
+554,11
@@
void xbt_dict_postexit()
}
#ifdef SIMGRID_TEST
}
#ifdef SIMGRID_TEST
-#include
<time.h>
+#include
"src/internal_config.h"
#include "xbt.h"
#include "xbt/ex.h"
#include "xbt.h"
#include "xbt/ex.h"
+#include <ctime>
#include <xbt/ex.hpp>
#include <xbt/ex.hpp>
-#include "src/internal_config.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dict);
@@
-636,7
+622,6
@@
static void debugged_remove(xbt_dict_t head, const char* key)
{
xbt_test_add("Remove '%s'", key);
xbt_dict_remove(head, 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)
}
static void traverse(xbt_dict_t head)
@@
-652,7
+637,7
@@
static void traverse(xbt_dict_t head)
} else {
xbt_test_log("Seen #%d: %s", ++i, key);
}
} else {
xbt_test_log("Seen #%d: %s", ++i, key);
}
- xbt_test_assert(
not data || not 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);
}
}
}
}
@@
-764,8
+749,7
@@
XBT_TEST_UNIT("basic", test_dict_basic, "Basic usage: change, retrieve and trave
/* RETRIEVE */
xbt_test_add("Search 123");
char* data = (char*)xbt_dict_get(head, "123");
/* RETRIEVE */
xbt_test_add("Search 123");
char* data = (char*)xbt_dict_get(head, "123");
- xbt_test_assert(data);
- xbt_test_assert(not strcmp("123", data));
+ 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");
search_not_found(head, "Can't be found");
search_not_found(head, "123 Can't be found");
@@
-781,8
+765,6
@@
XBT_TEST_UNIT("basic", test_dict_basic, "Basic usage: change, retrieve and trave
xbt_test_add("Traverse the resulting dictionary");
traverse(head);
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);
xbt_test_add("Free the dictionary twice");
xbt_dict_free(&head);
xbt_dict_free(&head);
@@
-878,7
+860,7
@@
XBT_TEST_UNIT("nulldata", test_dict_nulldata, "nullptr data management")
xbt_test_log("Seen: %s", key);
}
xbt_test_log("Seen: %s", key);
}
- if (
not strcmp(key, "null")
)
+ if (
key && strcmp(key, "null") == 0
)
found = 1;
}
xbt_test_assert(found, "the key 'null', associated to nullptr is not found");
found = 1;
}
xbt_test_assert(found, "the key 'null', associated to nullptr is not found");
@@
-910,7
+892,6
@@
XBT_TEST_UNIT("crash", test_dict_crash, "Crash test")
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);
xbt_dict_t head = xbt_dict_new_homogeneous(free);
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);
xbt_dict_t head = xbt_dict_new_homogeneous(free);
- /* if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); */
for (int j = 0; j < 1000; j++) {
char* data = nullptr;
char* key = (char*)xbt_malloc(SIZEOFKEY);
for (int j = 0; j < 1000; j++) {
char* data = nullptr;
char* key = (char*)xbt_malloc(SIZEOFKEY);
@@
-919,7
+900,6
@@
XBT_TEST_UNIT("crash", test_dict_crash, "Crash test")
for (int k = 0; k < SIZEOFKEY - 1; k++)
key[k] = rand() % ('z' - 'a') + 'a';
key[SIZEOFKEY - 1] = '\0';
for (int k = 0; k < SIZEOFKEY - 1; k++)
key[k] = rand() % ('z' - 'a') + 'a';
key[SIZEOFKEY - 1] = '\0';
- /* printf("[%d %s]\n",j,key); */
data = (char*) xbt_dict_get_or_null(head, key);
} while (data != nullptr);
data = (char*) xbt_dict_get_or_null(head, key);
} while (data != nullptr);
@@
-929,7
+909,6
@@
XBT_TEST_UNIT("crash", test_dict_crash, "Crash test")
count(head, j + 1);
}
count(head, j + 1);
}
- /* xbt_dict_dump(head,(void (*)(void*))&printf); */
traverse(head);
xbt_dict_free(&head);
xbt_dict_free(&head);
traverse(head);
xbt_dict_free(&head);
xbt_dict_free(&head);
@@
-938,13
+917,11
@@
XBT_TEST_UNIT("crash", test_dict_crash, "Crash test")
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++) {
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);
xbt_dict_set(head, key, key, nullptr);
}
char* key = (char*)xbt_malloc(10);
snprintf(key,10, "%d", j);
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)");
xbt_test_log("There is %d elements", countelems(head));
xbt_test_add("Count the elements (retrieving the key and data for each)");
xbt_test_log("There is %d elements", countelems(head));
@@
-952,7
+929,6
@@
XBT_TEST_UNIT("crash", test_dict_crash, "Crash test")
xbt_test_add("Search my %d elements 20 times", NB_ELM);
char* key = (char*)xbt_malloc(10);
for (int i = 0; i < 20; i++) {
xbt_test_add("Search my %d elements 20 times", NB_ELM);
char* key = (char*)xbt_malloc(10);
for (int i = 0; i < 20; i++) {
- /* if (i%10) printf("."); else printf("%d",i/10); fflush(stdout); */
for (int j = 0; j < NB_ELM; j++) {
snprintf(key,10, "%d", j);
void* data = xbt_dict_get(head, key);
for (int j = 0; j < NB_ELM; j++) {
snprintf(key,10, "%d", j);
void* data = xbt_dict_get(head, key);
@@
-966,7
+942,6
@@
XBT_TEST_UNIT("crash", test_dict_crash, "Crash test")
xbt_test_add("Remove my %d elements", NB_ELM);
key = (char*) xbt_malloc(10);
for (int j = 0; j < NB_ELM; j++) {
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);
}
snprintf(key,10, "%d", j);
xbt_dict_remove(head, key);
}