diff --git a/bench/bench-glib.c b/bench/bench-glib.c index 6302c8f1..5e8bbd7d 100644 --- a/bench/bench-glib.c +++ b/bench/bench-glib.c @@ -106,6 +106,7 @@ static void test_rbtree(size_t n) *p = rand_get(); g_tree_insert(tree, p, NULL); } + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { unsigned long key = rand_get(); @@ -143,6 +144,7 @@ test_dict(unsigned long n) *value = rand_get(); g_hash_table_insert(dict, key, value ); } + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { unsigned long key = rand_get(); @@ -186,6 +188,7 @@ test_dict_big(unsigned long n) sprintf(*value, "%u", rand_get()); g_hash_table_insert(dict, key, value ); } + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { char_array_t s1; diff --git a/bench/bench-klib.c b/bench/bench-klib.c index f242620a..897d4698 100644 --- a/bench/bench-klib.c +++ b/bench/bench-klib.c @@ -115,6 +115,7 @@ static void test_rbtree(size_t n) kb_putp(kTree, tree, &j); } + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { unsigned long j = 0; @@ -143,6 +144,7 @@ test_dict(unsigned long n) khiter_t k = kh_put(iun, dict, rand_get(), &ret); kh_value(dict, k) = rand_get(); } + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { khiter_t k = kh_get(iun, dict, rand_get()); @@ -185,6 +187,7 @@ test_dict_big(unsigned long n) khiter_t k = kh_put(iub, dict, s1, &ret); char_set(&kh_value(dict, k), s2); } + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { char_array_t s1; diff --git a/bench/bench-libdynamic.c b/bench/bench-libdynamic.c index 9ada80b2..2dead409 100644 --- a/bench/bench-libdynamic.c +++ b/bench/bench-libdynamic.c @@ -106,6 +106,7 @@ test_dict(unsigned long n) for (size_t i = 0; i < n; i++) { map_insert(&dict, (map_element[]) {{.key = rand_get(), .value = rand_get()}}, hash_func, equal_func, set_func, NULL); } + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { map_element *p = map_at(&dict, (map_element[]){{.key = rand_get()}}, hash_func, equal_func); @@ -163,6 +164,7 @@ test_dict_big(unsigned long n) sprintf(el.value, "%u", rand_get()); map_insert(&dict, &el, char_hash, char_equal, char_set, NULL); } + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { big_map_element el; diff --git a/bench/bench-mlib.c b/bench/bench-mlib.c index 260bb548..4f0385e0 100644 --- a/bench/bench-mlib.c +++ b/bench/bench-mlib.c @@ -116,7 +116,7 @@ static void test_rbtree(size_t n) for (size_t i = 0; i < n; i++) { rbtree_ulong_push(tree, rand_get()); } - + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { unsigned long *p = rbtree_ulong_get(tree, rand_get()); @@ -149,7 +149,7 @@ test_dict(unsigned long n) for (size_t i = 0; i < n; i++) { dict_ulong_set_at(dict, rand_get(), rand_get() ); } - + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { unsigned long *p = dict_ulong_get(dict, rand_get()); @@ -172,7 +172,7 @@ static void char_set (char_array_t a, const char_array_t b) { strcpy(a, b); } static bool char_equal_p (const char_array_t a, const char_array_t b) { return strcmp(a,b)==0; } static size_t char_hash(const char_array_t a) { return m_core_hash (a, strlen(a)); } -// NOTE: Can't set OPLIST as a macro! +// NOTE: Can't use the name OPLIST as a macro! #define CHAR_OPLIST (INIT(char_init), INIT_SET(char_set), SET(char_set), CLEAR(char_init), HASH(char_hash), EQUAL(char_equal_p)) #ifdef USE_MEMPOOL @@ -195,6 +195,7 @@ test_dict_big(unsigned long n) sprintf(s2, "%u", rand_get()); dict_char_set_at(dict, s1, s2); } + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { char_array_t s1; diff --git a/bench/bench-qt.cpp b/bench/bench-qt.cpp index 331ebc86..8a14a87e 100644 --- a/bench/bench-qt.cpp +++ b/bench/bench-qt.cpp @@ -95,7 +95,7 @@ static void test_rbtree(size_t n) for (size_t i = 0; i < n; i++) { tree[rand_get()] = QHashDummyValue(); } - + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { QMap::iterator it = tree.find(rand_get()); @@ -116,7 +116,7 @@ test_dict1(unsigned long n) for (size_t i = 0; i < n; i++) { dict[rand_get()] = rand_get(); } - + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { QMap::iterator it = dict.find(rand_get()); @@ -137,7 +137,7 @@ test_dict2(unsigned long n) for (size_t i = 0; i < n; i++) { dict[rand_get()] = rand_get(); } - + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { QHash::iterator it = dict.find(rand_get()); @@ -175,7 +175,7 @@ test_dict_big(unsigned long n) sprintf(s2.a, "%u", rand_get()); dict[s1] = s2; } - + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { char_array_s s1; diff --git a/bench/bench-stl.cpp b/bench/bench-stl.cpp index b68d405f..b936aaf2 100644 --- a/bench/bench-stl.cpp +++ b/bench/bench-stl.cpp @@ -94,7 +94,7 @@ static void test_rbtree(size_t n) for (size_t i = 0; i < n; i++) { tree.insert(rand_get()); } - + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { set::iterator it = tree.find(rand_get()); @@ -115,7 +115,7 @@ test_dict1(unsigned long n) for (size_t i = 0; i < n; i++) { dict[rand_get()] = rand_get(); } - + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { map::iterator it = dict.find(rand_get()); @@ -136,7 +136,7 @@ test_dict2(unsigned long n) for (size_t i = 0; i < n; i++) { dict[rand_get()] = rand_get(); } - + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { unordered_map::iterator it = dict.find(rand_get()); @@ -178,7 +178,7 @@ test_dict_big(unsigned long n) sprintf(s2.a, "%u", rand_get()); dict[s1] = s2; } - + rand_init(); unsigned int s = 0; for (size_t i = 0; i < n; i++) { char_array_s s1;