/* We use the number divided by two as the hash (for lots of
collisions), plus set all the higher bits so we can detect if they
don't get masked out. */
/* We use the number divided by two as the hash (for lots of
collisions), plus set all the higher bits so we can detect if they
don't get masked out. */
- ok1(!htable_get(ht, hash(&dne, NULL), objcmp, &dne));
+ ok1(!htable_get(&ht, hash(&dne, NULL), objcmp, &dne));
- add_vals(ht, val, 0, 1);
- ok1(ht->bits == 1);
- ok1(ht->max == 1);
- ok1(ht->common_mask == -1);
+ add_vals(&ht, val, 0, 1);
+ ok1(ht.bits == 1);
+ ok1(ht.max == 1);
+ weight = 0;
+ for (i = 0; i < sizeof(ht.common_mask) * CHAR_BIT; i++) {
+ if (ht.common_mask & ((uintptr_t)1 << i)) {
+ weight++;
+ }
+ }
+ /* Only one bit should be clear. */
+ ok1(weight == i-1);
- add_vals(ht, val, 1, 1);
- ok1(ht->bits == 2);
- ok1(ht->max == 3);
+ add_vals(&ht, val, 1, 1);
+ ok1(ht.bits == 2);
+ ok1(ht.max == 3);
- ok1(ht->common_mask != 0);
- ok1(ht->common_mask != -1);
- ok1(check_mask(ht, val, 2));
+ ok1(ht.common_mask != 0);
+ ok1(ht.common_mask != -1);
+ ok1(check_mask(&ht, val, 2));
- add_vals(ht, val, 2, NUM_VALS - 2);
+ add_vals(&ht, val, 2, NUM_VALS - 2);
- find_vals(ht, val, NUM_VALS);
- ok1(!htable_get(ht, hash(&dne, NULL), objcmp, &dne));
+ find_vals(&ht, val, NUM_VALS);
+ ok1(!htable_get(&ht, hash(&dne, NULL), objcmp, &dne));
- for (p = htable_first(ht,&iter); p; p = htable_next(ht, &iter))
+ for (p = htable_first(&ht,&iter); p; p = htable_next(&ht, &iter))
+ i++;
+ ok1(i == NUM_VALS);
+
+ i = 0;
+ for (p = htable_prev(&ht, &iter); p; p = htable_prev(&ht, &iter))
- del_vals(ht, val, NUM_VALS);
- ok1(!htable_get(ht, hash(&val[0], NULL), objcmp, &val[0]));
+ del_vals(&ht, val, NUM_VALS);
+ ok1(!htable_get(&ht, hash(&val[0], NULL), objcmp, &val[0]));
- htable_add(ht, 0, (void *)~(uintptr_t)&val[NUM_VALS-1]);
- htable_add(ht, hash(&val[NUM_VALS-1], NULL), &val[NUM_VALS-1]);
- ok1(ht->common_mask == 0);
- ok1(ht->common_bits == 0);
+ htable_add(&ht, 0, (void *)~(uintptr_t)&val[NUM_VALS-1]);
+ htable_add(&ht, hash(&val[NUM_VALS-1], NULL), &val[NUM_VALS-1]);
+ ok1(ht.common_mask == 0);
+ ok1(ht.common_bits == 0);
- add_vals(ht, val, 0, NUM_VALS-1);
+ add_vals(&ht, val, 0, NUM_VALS-1);
- find_vals(ht, val, NUM_VALS);
- ok1(!htable_get(ht, hash(&dne, NULL), objcmp, &dne));
-
- htable_free(ht);
+ find_vals(&ht, val, NUM_VALS);
+ ok1(!htable_get(&ht, hash(&dne, NULL), objcmp, &dne));
- ht = htable_new(hash, NULL);
- htable_add(ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1]));
- ok1(ht->perfect_bit);
- perfect_bit = ht->perfect_bit;
- htable_add(ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1]
+ htable_clear(&ht);
+ htable_add(&ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1]));
+ ok1(ht.perfect_bit);
+ perfect_bit = ht.perfect_bit;
+ htable_add(&ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1]
- ok1(ht->perfect_bit == 0);
- htable_del(ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1] | perfect_bit));
+ ok1(ht.perfect_bit == 0);
+ htable_del(&ht, 0, (void *)((uintptr_t)&val[NUM_VALS-1] | perfect_bit));
- add_vals(ht, val, 0, NUM_VALS-1);
+ add_vals(&ht, val, 0, NUM_VALS-1);
+
+ ok1(ht.perfect_bit != 0);
+ htable_clear(&ht);
+
+ ok1(htable_init_sized(&ht, hash, NULL, 1024));
+ ok1(ht.max >= 1024);
+ htable_clear(&ht);