X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Ftest-hmap.c;h=dd79dc95f06fcbce7ad8d7dd18355a00b01fd2c3;hb=5de43a606c949dbb74272d5b09627ddd5f64b06b;hp=cf6ee1c9399a6b065ad74b7da18aefca4fa2d4ec;hpb=34e63086edddcae06d7c1a4fa84fec0861e50758;p=sliver-openvswitch.git diff --git a/tests/test-hmap.c b/tests/test-hmap.c index cf6ee1c93..dd79dc95f 100644 --- a/tests/test-hmap.c +++ b/tests/test-hmap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ #include "hmap.h" #include #include "hash.h" +#include "random.h" #include "util.h" #undef NDEBUG @@ -56,7 +57,7 @@ check_hmap(struct hmap *hmap, const int values[], size_t n, hmap_values = xmalloc(sizeof *sort_values * n); i = 0; - HMAP_FOR_EACH (e, struct element, node, hmap) { + HMAP_FOR_EACH (e, node, hmap) { assert(i < n); hmap_values[i++] = e->value; } @@ -77,8 +78,7 @@ check_hmap(struct hmap *hmap, const int values[], size_t n, for (i = 0; i < n; i++) { size_t count = 0; - HMAP_FOR_EACH_WITH_HASH (e, struct element, node, - hash(values[i]), hmap) { + HMAP_FOR_EACH_WITH_HASH (e, node, hash(values[i]), hmap) { count += e->value == values[i]; } assert(count == 1); @@ -109,7 +109,7 @@ static void shuffle(int *p, size_t n) { for (; n > 1; n--, p++) { - int *q = &p[rand() % n]; + int *q = &p[random_range(n)]; int tmp = *p; *p = *q; *q = tmp; @@ -124,8 +124,8 @@ print_hmap(const char *name, struct hmap *hmap) struct element *e; printf("%s:", name); - HMAP_FOR_EACH (e, struct element, node, hmap) { - printf(" %d(%zu)", e->value, e->node.hash & hmap->mask); + HMAP_FOR_EACH (e, node, hmap) { + printf(" %d(%"PRIuSIZE")", e->value, e->node.hash & hmap->mask); } printf("\n"); } @@ -157,7 +157,7 @@ good_hash(int value) } static size_t -constant_hash(int value UNUSED) +constant_hash(int value OVS_UNUSED) { return 123; } @@ -242,7 +242,7 @@ test_hmap_for_each_safe(hash_func *hash) i = 0; n_remaining = n; - HMAP_FOR_EACH_SAFE (e, next, struct element, node, &hmap) { + HMAP_FOR_EACH_SAFE (e, next, node, &hmap) { assert(i < n); if (pattern & (1ul << e->value)) { size_t j;