ck_ht: Remove remnants of MPMC implementation from write-side probe.

ck_pring
Samy Al Bahra 11 years ago
parent fa9f3540fe
commit 84943b5787

@ -217,14 +217,7 @@ ck_ht_map_probe_wr(struct ck_ht_map *map,
size_t offset, i, j; size_t offset, i, j;
uint64_t probes = 0; uint64_t probes = 0;
#ifndef CK_HT_PP
uint64_t d = 0;
uint64_t d_prime = 0;
retry:
#endif
offset = h.value & map->mask; offset = h.value & map->mask;
for (i = 0; i < map->probe_limit; i++) { for (i = 0; i < map->probe_limit; i++) {
/* /*
* Probe on a complete cache line first. Scan forward and wrap around to * Probe on a complete cache line first. Scan forward and wrap around to
@ -277,17 +270,6 @@ retry:
#else #else
if (cursor->hash != h.value) if (cursor->hash != h.value)
continue; continue;
if (probe_limit == NULL) {
d_prime = ck_pr_load_64(&map->deletions);
/*
* It is possible that the slot was
* replaced, initiate a re-probe.
*/
if (d != d_prime)
goto retry;
}
#endif #endif
pointer = ck_ht_entry_key(cursor); pointer = ck_ht_entry_key(cursor);

Loading…
Cancel
Save