summaryrefslogtreecommitdiff
path: root/src/tc-map.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2022-10-24 21:03:43 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2022-10-24 21:03:43 +0200
commitaab49e5a013c53ae812a143fe41add74e0677a61 (patch)
treef0c6e1ba7db9991f2bd38c9169f9921bfe5e61d8 /src/tc-map.c
parentdf5167db909a88fb8e16dd20b37442495a6ac059 (diff)
parent532d4a24e2013262dfa41fd85c06a9715c99abf7 (diff)
Update upstream source from tag 'upstream/4.7'
Update to upstream version '4.7' with Debian dir d3e11463c915e5c39507206197eb3acd42bb8f5f
Diffstat (limited to 'src/tc-map.c')
-rw-r--r--src/tc-map.c47
1 files changed, 25 insertions, 22 deletions
diff --git a/src/tc-map.c b/src/tc-map.c
index 8a22259..ce55688 100644
--- a/src/tc-map.c
+++ b/src/tc-map.c
@@ -25,6 +25,7 @@
#include <sys/time.h>
#include "internal.h"
#include "map_int.h"
+#pragma GCC diagnostic ignored "-Wunused-const-variable"
union HXpoly {
struct HXmap *map;
@@ -60,12 +61,14 @@ static void tmap_printf(const char *fmt, ...)
va_end(args);
}
-static void tmap_time(struct timeval *tv)
+static void tmap_time(struct timespec *tv)
{
#ifdef HAVE_SYS_RESOURCE_H
struct rusage r;
- if (getrusage(RUSAGE_SELF, &r) == 0)
- *tv = r.ru_utime;
+ if (getrusage(RUSAGE_SELF, &r) == 0) {
+ tv->tv_sec = r.ru_utime.tv_sec;
+ tv->tv_nsec = r.ru_utime.tv_usec * 1000;
+ }
#else
memset(tv, 0, sizeof(*tv));
#endif
@@ -134,7 +137,7 @@ static void tmap_flush(struct HXmap *map, bool verbose)
static void tmap_add_speed(struct HXmap *map)
{
- struct timeval start, stop, delta;
+ struct timespec start, stop, delta;
unsigned int threshold;
tmap_printf("MAP test 1: Timing add operation\n");
@@ -143,20 +146,20 @@ static void tmap_add_speed(struct HXmap *map)
do {
tmap_add_rand(map, 1);
tmap_time(&stop);
- HX_timeval_sub(&delta, &stop, &start);
+ HX_timespec_sub(&delta, &stop, &start);
} while (!(delta.tv_sec >= 1 || map->items >= 1000000));
- tmap_printf("%u elements in " HX_TIMEVAL_FMT
+ tmap_printf("%u elements in " HX_TIMESPEC_FMT
" (plus time measurement overhead)\n",
- map->items, HX_TIMEVAL_EXP(&delta));
+ map->items, HX_TIMESPEC_EXP(&delta));
threshold = map->items;
tmap_flush(map, false);
tmap_time(&start);
tmap_add_rand(map, threshold);
tmap_time(&stop);
- HX_timeval_sub(&delta, &stop, &start);
- tmap_printf("%u elements in " HX_TIMEVAL_FMT " (w/o overhead)\n",
- map->items, HX_TIMEVAL_EXP(&delta));
+ HX_timespec_sub(&delta, &stop, &start);
+ tmap_printf("%u elements in " HX_TIMESPEC_FMT " (w/o overhead)\n",
+ map->items, HX_TIMESPEC_EXP(&delta));
tmap_ipop();
}
@@ -167,7 +170,7 @@ static bool tmap_each_fn(const struct HXmap_node *node, void *arg)
static void tmap_trav_speed(struct HXmap *map)
{
- struct timeval start, stop, delta, delta2;
+ struct timespec start, stop, delta, delta2;
const struct HXmap_node *node;
struct HXmap_trav *iter;
@@ -178,17 +181,17 @@ static void tmap_trav_speed(struct HXmap *map)
while ((node = HXmap_traverse(iter)) != NULL)
;
tmap_time(&stop);
- HX_timeval_sub(&delta, &stop, &start);
+ HX_timespec_sub(&delta, &stop, &start);
HXmap_travfree(iter);
- tmap_printf("Open traversal of %u nodes: " HX_TIMEVAL_FMT "s\n",
- map->items, HX_TIMEVAL_EXP(&delta));
+ tmap_printf("Open traversal of %u nodes: " HX_TIMESPEC_FMT "s\n",
+ map->items, HX_TIMESPEC_EXP(&delta));
tmap_time(&start);
HXmap_qfe(map, tmap_each_fn, NULL);
tmap_time(&stop);
- HX_timeval_sub(&delta, &stop, &start);
- tmap_printf("QFE traversal of %u nodes: " HX_TIMEVAL_FMT "s\n",
- map->items, HX_TIMEVAL_EXP(&delta));
+ HX_timespec_sub(&delta, &stop, &start);
+ tmap_printf("QFE traversal of %u nodes: " HX_TIMESPEC_FMT "s\n",
+ map->items, HX_TIMESPEC_EXP(&delta));
tmap_ipop();
tmap_printf("MAP test 2a: Timing lookup\n");
@@ -198,14 +201,14 @@ static void tmap_trav_speed(struct HXmap *map)
while ((node = HXmap_traverse(iter)) != NULL)
HXmap_find(map, node->key);
tmap_time(&stop);
- HX_timeval_sub(&delta2, &stop, &start);
+ HX_timespec_sub(&delta2, &stop, &start);
HXmap_travfree(iter);
/* delta2 includes traversal time */
start = delta;
stop = delta2;
- HX_timeval_sub(&delta, &stop, &start);
- tmap_printf("Lookup of %u nodes: " HX_TIMEVAL_FMT "s\n",
- map->items, HX_TIMEVAL_EXP(&delta));
+ HX_timespec_sub(&delta, &stop, &start);
+ tmap_printf("Lookup of %u nodes: " HX_TIMESPEC_FMT "s\n",
+ map->items, HX_TIMESPEC_EXP(&delta));
tmap_ipop();
}
@@ -222,7 +225,7 @@ static void tmap_flat(const struct HXmap *map)
abort();
}
for (i = 0; i < map->items; ++i)
- tmap_printf("%u. %s -> %s\n", i, nodes[i].key, nodes[i].data);
+ tmap_printf("%u. %s -> %s\n", i, nodes[i].skey, nodes[i].sdata);
tmap_ipop();
free(nodes);
}