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

Make directory operations methods on Directory #11945

Draft
wants to merge 14 commits into
base: master
Choose a base branch
from
Draft

Make directory operations methods on Directory #11945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
788bfc2
Move `dir_probe` to `Directory::dir_probe`
JosiahWI Jan 7, 2025
f8e2fb4
Move `dir_insert` to `Directory::insert`
JosiahWI Jan 7, 2025
96a2eb9
Move `dir_overwrite` to `Directory::overwrite`
JosiahWI Jan 7, 2025
1ea17ac
Move `dir_delete` to `Directory::remove`
JosiahWI Jan 7, 2025
16ff654
Move `dir_free_entry` to `Directory::free_entry`
JosiahWI Jan 7, 2025
781bf3d
Move `check_dir` to `Directory::check`
JosiahWI Jan 7, 2025
c6fe1a1
Move `dir_clean_vol` to `Directory::cleanup`
JosiahWI Jan 7, 2025
7195933
Move `dir_clear_range` to `Directory::clear_range`
JosiahWI Jan 7, 2025
365383b
Move `dir_entries_used` to Directory struct
JosiahWI Jan 8, 2025
15c6adf
Move `dir_bucket_length` to Directory struct
JosiahWI Jan 8, 2025
3806653
Move `dir_freelist_length` to Directory struct
JosiahWI Jan 8, 2025
d45f825
Move `dir_clean_segment` to Directory struct
JosiahWI Jan 8, 2025
e56b9b8
Use `Directory` instead of `Stripe` where possible
JosiahWI Jan 8, 2025
3695b7a
Remove unused `Stripe` parameters
JosiahWI Jan 8, 2025
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
6 changes: 3 additions & 3 deletions src/iocore/cache/Cache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ Cache::open_read(Continuation *cont, const CacheKey *key, CacheFragType type, co
CacheVC *c = nullptr;
{
CACHE_TRY_LOCK(lock, stripe->mutex, mutex->thread_holding);
if (!lock.is_locked() || (od = stripe->open_read(key)) || dir_probe(key, stripe, &result, &last_collision)) {
if (!lock.is_locked() || (od = stripe->open_read(key)) || stripe->directory.probe(key, stripe, &result, &last_collision)) {
c = new_CacheVC(cont);
SET_CONTINUATION_HANDLER(c, &CacheVC::openReadStartHead);
c->vio.op = VIO::READ;
Expand Down Expand Up @@ -548,7 +548,7 @@ Cache::open_read(Continuation *cont, const CacheKey *key, CacheHTTPHdr *request,

{
CACHE_TRY_LOCK(lock, stripe->mutex, mutex->thread_holding);
if (!lock.is_locked() || (od = stripe->open_read(key)) || dir_probe(key, stripe, &result, &last_collision)) {
if (!lock.is_locked() || (od = stripe->open_read(key)) || stripe->directory.probe(key, stripe, &result, &last_collision)) {
c = new_CacheVC(cont);
c->first_key = c->key = c->earliest_key = *key;
c->stripe = stripe;
Expand Down Expand Up @@ -691,7 +691,7 @@ Cache::open_write(Continuation *cont, const CacheKey *key, CacheHTTPInfo *info,
if (c->od->has_multiple_writers()) {
goto Lmiss;
}
if (!dir_probe(key, c->stripe, &c->dir, &c->last_collision)) {
if (!c->stripe->directory.probe(key, c->stripe, &c->dir, &c->last_collision)) {
if (c->f.update) {
// fail update because vector has been GC'd
// This situation can also arise in openWriteStartDone
Expand Down
Loading