Skip to content

Cleanup: Get rid of dead code from Cache #9621

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

Merged
masaori335 merged 1 commit into from
Apr 24, 2023
Merged

Cleanup: Get rid of dead code from Cache #9621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion iocore/cache/CacheDir.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
// Globals

ClassAllocator<OpenDirEntry> openDirEntryAllocator("openDirEntry");
Dir empty_dir;

// OpenDir

Expand Down
22 changes: 0 additions & 22 deletions iocore/cache/P_CacheDir.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ struct CacheVC;
#define OPEN_DIR_BUCKETS 256

struct EvacuationBlock;
using DirInfo = uint32_t;

// Cache Directory

Expand Down Expand Up @@ -143,23 +142,6 @@ struct Dir {
#endif
};

// INTERNAL: do not access these members directly, use the
// accessors below (e.g. dir_offset, dir_set_offset)
struct FreeDir {
#if DO_NOT_REMOVE_THIS
// THE BIT-FIELD INTERPRETATION OF THIS STRUCT WHICH HAS TO
// USE MACROS TO PREVENT UNALIGNED LOADS
unsigned int offset : 24; // 0: empty
unsigned int reserved : 8;
unsigned int prev : 16; // (2)
unsigned int next : 16; // (3)
unsigned int offset_high : 16; // 0: empty
#else
uint16_t w[5];
FreeDir() { dir_clear(this); }
#endif
};

#define dir_offset(_e) \
((int64_t)(((uint64_t)(_e)->w[0]) | (((uint64_t)((_e)->w[1] & 0xFF)) << 16) | (((uint64_t)(_e)->w[4]) << 24)))
#define dir_set_offset(_e, _o) \
Expand Down Expand Up @@ -296,10 +278,6 @@ int dir_segment_accounted(int s, Vol *d, int offby = 0, int *free = nullptr, int
uint64_t dir_entries_used(Vol *d);
void sync_cache_dir_on_shutdown();

// Global Data

extern Dir empty_dir;

// Inline Functions

#define dir_in_seg(_s, _i) ((Dir *)(((char *)(_s)) + (SIZEOF_DIR * (_i))))
Expand Down