/* Simple speed tests for a hash of strings using hsearch */
#include <ccan/htable/htable_type.h>
#include <ccan/htable/htable.c>
-#include <ccan/str_talloc/str_talloc.h>
-#include <ccan/grab_file/grab_file.h>
-#include <ccan/talloc/talloc.h>
+#include <ccan/tal/str/str.h>
+#include <ccan/tal/grab_file/grab_file.h>
+#include <ccan/tal/tal.h>
#include <ccan/hash/hash.h>
#include <ccan/time/time.h>
#include <stdio.h>
#include <search.h>
/* Nanoseconds per operation */
-static size_t normalize(const struct timeval *start,
- const struct timeval *stop,
+static size_t normalize(const struct timespec *start,
+ const struct timespec *stop,
unsigned int num)
{
- struct timeval diff;
-
- timersub(stop, start, &diff);
-
- /* Floating point is more accurate here. */
- return (double)(diff.tv_sec * 1000000 + diff.tv_usec)
- / num * 1000;
+ return time_to_nsec(time_divide(time_sub(*stop, *start), num));
}
int main(int argc, char *argv[])
{
size_t i, j, num;
- struct timeval start, stop;
+ struct timespec start, stop;
char **w;
ENTRY *words, *misswords;
- w = strsplit(NULL, grab_file(NULL,
- argv[1] ? argv[1] : "/usr/share/dict/words",
- NULL), "\n");
- num = talloc_array_length(w) - 1;
+ w = tal_strsplit(NULL, grab_file(NULL,
+ argv[1] ? argv[1] : "/usr/share/dict/words"), "\n", STR_NO_EMPTY);
+ num = tal_count(w) - 1;
printf("%zu words\n", num);
hcreate(num+num/3);
- words = talloc_array(w, ENTRY, num);
+ words = tal_arr(w, ENTRY, num);
for (i = 0; i < num; i++) {
words[i].key = w[i];
words[i].data = words[i].key;
}
/* Append and prepend last char for miss testing. */
- misswords = talloc_array(w, ENTRY, num);
+ misswords = tal_arr(w, ENTRY, num);
for (i = 0; i < num; i++) {
char lastc;
if (strlen(w[i]))
lastc = w[i][strlen(w[i])-1];
else
lastc = 'z';
- misswords[i].key = talloc_asprintf(misswords, "%c%s%c%c",
- lastc, w[i],
- lastc, lastc);
+ misswords[i].key = tal_fmt(misswords, "%c%s%c%c",
+ lastc, w[i], lastc, lastc);
}
printf("#01: Initial insert: ");
#include <ccan/htable/htable_type.h>
#include <ccan/htable/htable.c>
#include <ccan/hash/hash.h>
+#include <ccan/time/time.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include <unistd.h>
-#include <sys/time.h>
static size_t hashcount;
struct object {
}
/* Nanoseconds per operation */
-static size_t normalize(const struct timeval *start,
- const struct timeval *stop,
+static size_t normalize(const struct timespec *start,
+ const struct timespec *stop,
unsigned int num)
{
- struct timeval diff;
-
- timersub(stop, start, &diff);
-
- /* Floating point is more accurate here. */
- return (double)(diff.tv_sec * 1000000 + diff.tv_usec)
- / num * 1000;
+ return time_to_nsec(time_divide(time_sub(*stop, *start), num));
}
static size_t worst_run(struct htable *ht, size_t *deleted)
{
struct object *objs;
size_t i, j, num, deleted;
- struct timeval start, stop;
+ struct timespec start, stop;
struct htable_obj ht;
bool make_dumb = false;
printf("Initial insert: ");
fflush(stdout);
- gettimeofday(&start, NULL);
+ start = time_now();
for (i = 0; i < num; i++)
htable_obj_add(&ht, objs[i].self);
- gettimeofday(&stop, NULL);
+ stop = time_now();
printf(" %zu ns\n", normalize(&start, &stop, num));
printf("Details: hash size %u, mask bits %u, perfect %.0f%%\n",
1U << ht.raw.bits, popcount(ht.raw.common_mask),
printf("Initial lookup (match): ");
fflush(stdout);
- gettimeofday(&start, NULL);
+ start = time_now();
for (i = 0; i < num; i++)
if (htable_obj_get(&ht, &i)->self != objs[i].self)
abort();
- gettimeofday(&stop, NULL);
+ stop = time_now();
printf(" %zu ns\n", normalize(&start, &stop, num));
printf("Initial lookup (miss): ");
fflush(stdout);
- gettimeofday(&start, NULL);
+ start = time_now();
for (i = 0; i < num; i++) {
unsigned int n = i + num;
if (htable_obj_get(&ht, &n))
abort();
}
- gettimeofday(&stop, NULL);
+ stop = time_now();
printf(" %zu ns\n", normalize(&start, &stop, num));
/* Lookups in order are very cache-friendly for judy; try random */
printf("Initial lookup (random): ");
fflush(stdout);
- gettimeofday(&start, NULL);
+ start = time_now();
for (i = 0, j = 0; i < num; i++, j = (j + 10007) % num)
if (htable_obj_get(&ht, &j)->self != &objs[j])
abort();
- gettimeofday(&stop, NULL);
+ stop = time_now();
printf(" %zu ns\n", normalize(&start, &stop, num));
hashcount = 0;
printf("Initial delete all: ");
fflush(stdout);
- gettimeofday(&start, NULL);
+ start = time_now();
for (i = 0; i < num; i++)
if (!htable_obj_del(&ht, objs[i].self))
abort();
- gettimeofday(&stop, NULL);
+ stop = time_now();
printf(" %zu ns\n", normalize(&start, &stop, num));
printf("Details: rehashes %zu\n", hashcount);
printf("Initial re-inserting: ");
fflush(stdout);
- gettimeofday(&start, NULL);
+ start = time_now();
for (i = 0; i < num; i++)
htable_obj_add(&ht, objs[i].self);
- gettimeofday(&stop, NULL);
+ stop = time_now();
printf(" %zu ns\n", normalize(&start, &stop, num));
hashcount = 0;
printf("Deleting first half: ");
fflush(stdout);
- gettimeofday(&start, NULL);
+ start = time_now();
for (i = 0; i < num; i+=2)
if (!htable_obj_del(&ht, objs[i].self))
abort();
- gettimeofday(&stop, NULL);
+ stop = time_now();
printf(" %zu ns\n", normalize(&start, &stop, num));
printf("Details: rehashes %zu, delete markers %zu\n",
for (i = 0; i < num; i+=2)
objs[i].key = num+i;
- gettimeofday(&start, NULL);
+ start = time_now();
for (i = 0; i < num; i+=2)
htable_obj_add(&ht, objs[i].self);
- gettimeofday(&stop, NULL);
+ stop = time_now();
printf(" %zu ns\n", normalize(&start, &stop, num));
printf("Details: delete markers %zu, perfect %.0f%%\n",
printf("Lookup after half-change (match): ");
fflush(stdout);
- gettimeofday(&start, NULL);
+ start = time_now();
for (i = 1; i < num; i+=2)
if (htable_obj_get(&ht, &i)->self != objs[i].self)
abort();
if (htable_obj_get(&ht, &n)->self != objs[i].self)
abort();
}
- gettimeofday(&stop, NULL);
+ stop = time_now();
printf(" %zu ns\n", normalize(&start, &stop, num));
printf("Lookup after half-change (miss): ");
fflush(stdout);
- gettimeofday(&start, NULL);
+ start = time_now();
for (i = 0; i < num; i++) {
unsigned int n = i + num * 2;
if (htable_obj_get(&ht, &n))
abort();
}
- gettimeofday(&stop, NULL);
+ stop = time_now();
printf(" %zu ns\n", normalize(&start, &stop, num));
/* Hashtables with delete markers can fill with markers over time.
: "fifth");
fflush(stdout);
}
- gettimeofday(&start, NULL);
+ start = time_now();
for (j = 0; j < num; j++) {
if (!htable_obj_del(&ht, &objs[j]))
abort();
if (!htable_obj_add(&ht, &objs[j]))
abort();
}
- gettimeofday(&stop, NULL);
+ stop = time_now();
if (i != 0)
printf(" %zu ns\n", normalize(&start, &stop, num));
}
printf("Lookup after churn & spread (match): ");
fflush(stdout);
- gettimeofday(&start, NULL);
+ start = time_now();
for (i = 0; i < num; i++) {
unsigned int n = num * 5 + i * 9;
if (htable_obj_get(&ht, &n)->self != objs[i].self)
abort();
}
- gettimeofday(&stop, NULL);
+ stop = time_now();
printf(" %zu ns\n", normalize(&start, &stop, num));
printf("Lookup after churn & spread (miss): ");
fflush(stdout);
- gettimeofday(&start, NULL);
+ start = time_now();
for (i = 0; i < num; i++) {
unsigned int n = num * (5 + 9) + i * 9;
if (htable_obj_get(&ht, &n))
abort();
}
- gettimeofday(&stop, NULL);
+ stop = time_now();
printf(" %zu ns\n", normalize(&start, &stop, num));
printf("Lookup after churn & spread (random): ");
fflush(stdout);
- gettimeofday(&start, NULL);
+ start = time_now();
for (i = 0, j = 0; i < num; i++, j = (j + 10007) % num) {
unsigned int n = num * 5 + j * 9;
if (htable_obj_get(&ht, &n)->self != &objs[j])
abort();
}
- gettimeofday(&stop, NULL);
+ stop = time_now();
printf(" %zu ns\n", normalize(&start, &stop, num));
hashcount = 0;
printf("Deleting half after churn & spread: ");
fflush(stdout);
- gettimeofday(&start, NULL);
+ start = time_now();
for (i = 0; i < num; i+=2)
if (!htable_obj_del(&ht, objs[i].self))
abort();
- gettimeofday(&stop, NULL);
+ stop = time_now();
printf(" %zu ns\n", normalize(&start, &stop, num));
printf("Adding (a different) half after churn & spread: ");
for (i = 0; i < num; i+=2)
objs[i].key = num*6+i*9;
- gettimeofday(&start, NULL);
+ start = time_now();
for (i = 0; i < num; i+=2)
htable_obj_add(&ht, objs[i].self);
- gettimeofday(&stop, NULL);
+ stop = time_now();
printf(" %zu ns\n", normalize(&start, &stop, num));
printf("Details: delete markers %zu, perfect %.0f%%\n",
/* Simple speed tests for a hash of strings. */
#include <ccan/htable/htable_type.h>
#include <ccan/htable/htable.c>
-#include <ccan/str_talloc/str_talloc.h>
-#include <ccan/grab_file/grab_file.h>
-#include <ccan/talloc/talloc.h>
+#include <ccan/tal/str/str.h>
+#include <ccan/tal/grab_file/grab_file.h>
+#include <ccan/tal/tal.h>
#include <ccan/hash/hash.h>
#include <ccan/time/time.h>
#include <stdio.h>
HTABLE_DEFINE_TYPE(char, strkey, hash_str, cmp, htable_str);
/* Nanoseconds per operation */
-static size_t normalize(const struct timeval *start,
- const struct timeval *stop,
+static size_t normalize(const struct timespec *start,
+ const struct timespec *stop,
unsigned int num)
{
- struct timeval diff;
-
- timersub(stop, start, &diff);
-
- /* Floating point is more accurate here. */
- return (double)(diff.tv_sec * 1000000 + diff.tv_usec)
- / num * 1000;
+ return time_to_nsec(time_divide(time_sub(*stop, *start), num));
}
int main(int argc, char *argv[])
{
size_t i, j, num;
- struct timeval start, stop;
+ struct timespec start, stop;
struct htable_str ht;
char **words, **misswords;
- words = strsplit(NULL, grab_file(NULL,
- argv[1] ? argv[1] : "/usr/share/dict/words",
- NULL), "\n");
+ words = tal_strsplit(NULL, grab_file(NULL,
+ argv[1] ? argv[1] : "/usr/share/dict/words"), "\n",
+ STR_NO_EMPTY);
htable_str_init(&ht);
- num = talloc_array_length(words) - 1;
+ num = tal_count(words) - 1;
/* Note that on my system, num is just > 98304, where we double! */
printf("%zu words\n", num);
/* Append and prepend last char for miss testing. */
- misswords = talloc_array(words, char *, num);
+ misswords = tal_arr(words, char *, num);
for (i = 0; i < num; i++) {
char lastc;
if (strlen(words[i]))
lastc = words[i][strlen(words[i])-1];
else
lastc = 'z';
- misswords[i] = talloc_asprintf(misswords, "%c%s%c%c",
- lastc, words[i], lastc, lastc);
+ misswords[i] = tal_fmt(misswords, "%c%s%c%c",
+ lastc, words[i], lastc, lastc);
}
printf("#01: Initial insert: ");