Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix HyperClockCache Rollback bug in #10801 #10843

Closed
wants to merge 3 commits into from
Closed

Fix HyperClockCache Rollback bug in #10801 #10843

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acd74af
Fix HyperClockCache Rollback buug in #10801
pdillinger Oct 21, 2022
e8c286c
Merge remote-tracking branch 'origin/main' into hyperclock_rollback_fix
pdillinger Oct 21, 2022
1f03f0f
Alternate fix
pdillinger Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions cache/clock_cache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -919,11 +919,13 @@ void ClockHandleTable::Evict(size_t requested_charge, size_t* freed_charge,
uint64_t{ClockHandle::kStateConstruction}
<< ClockHandle::kStateShift,
std::memory_order_acquire)) {
// Took ownership
const UniqueId64x2& hashed_key = h.hashed_key;
// Took ownership.
// Save info about h to minimize dependences between atomic updates
// (e.g. fully relaxed Rollback after h released by marking empty)
const UniqueId64x2 h_hashed_key = h.hashed_key;
size_t h_total_charge = h.total_charge;
// TODO? Delay freeing?
h.FreeData();
*freed_charge += h.total_charge;
#ifndef NDEBUG
// Mark slot as empty, with assertion
meta = h.meta.exchange(0, std::memory_order_release);
Expand All @@ -934,7 +936,8 @@ void ClockHandleTable::Evict(size_t requested_charge, size_t* freed_charge,
h.meta.store(0, std::memory_order_release);
#endif
*freed_count += 1;
Rollback(hashed_key, &h);
*freed_charge += h_total_charge;
Rollback(h_hashed_key, &h);
}
}

Expand Down