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

osdc/ObjectCacher.h: add const to member functions #9652

Merged
merged 1 commit into from Sep 28, 2016
Merged

osdc/ObjectCacher.h: add const to member functions #9652

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/include/lru.h
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@ class LRUObject {
// pin/unpin item in cache
void lru_pin();
void lru_unpin();
bool lru_is_expireable() { return !lru_pinned; }
bool lru_is_expireable() const { return !lru_pinned; }

friend class LRU;
friend class LRUList;
Expand Down
27 changes: 15 additions & 12 deletions src/osdc/ObjectCacher.h
View file
Open in desktop
Expand Up @@ -69,7 +69,7 @@ class ObjectCacher {
: snap(s), bl(b), fadvise_flags(f) {}
};

OSDRead *prepare_read(snapid_t snap, bufferlist *b, int f) {
OSDRead *prepare_read(snapid_t snap, bufferlist *b, int f) const {
return new OSDRead(snap, b, f);
}

Expand All @@ -87,8 +87,11 @@ class ObjectCacher {
journal_tid(_journal_tid) {}
};

OSDWrite *prepare_write(const SnapContext& sc, const bufferlist &b,
ceph::real_time mt, int f, ceph_tid_t journal_tid) {
OSDWrite *prepare_write(const SnapContext& sc,
const bufferlist &b,
ceph::real_time mt,
int f,
ceph_tid_t journal_tid) const {
return new OSDWrite(sc, b, mt, f, journal_tid);
}

Expand Down Expand Up @@ -189,14 +192,14 @@ class ObjectCacher {
void set_dontneed(bool v) {
dontneed = v;
}
bool get_dontneed() {
bool get_dontneed() const {
return dontneed;
}

void set_nocache(bool v) {
nocache = v;
}
bool get_nocache() {
bool get_nocache() const {
return nocache;
}

Expand Down Expand Up @@ -283,7 +286,7 @@ class ObjectCacher {
const object_locator_t& get_oloc() const { return oloc; }
void set_object_locator(object_locator_t& l) { oloc = l; }

bool can_close() {
bool can_close() const {
if (lru_is_expireable()) {
assert(data.empty());
assert(waitfor_commit.empty());
Expand Down Expand Up @@ -459,12 +462,12 @@ class ObjectCacher {

void bh_stat_add(BufferHead *bh);
void bh_stat_sub(BufferHead *bh);
loff_t get_stat_tx() { return stat_tx; }
loff_t get_stat_rx() { return stat_rx; }
loff_t get_stat_dirty() { return stat_dirty; }
loff_t get_stat_dirty_waiting() { return stat_dirty_waiting; }
loff_t get_stat_clean() { return stat_clean; }
loff_t get_stat_zero() { return stat_zero; }
loff_t get_stat_tx() const { return stat_tx; }
loff_t get_stat_rx() const { return stat_rx; }
loff_t get_stat_dirty() const { return stat_dirty; }
loff_t get_stat_dirty_waiting() const { return stat_dirty_waiting; }
loff_t get_stat_clean() const { return stat_clean; }
loff_t get_stat_zero() const { return stat_zero; }

void touch_bh(BufferHead *bh) {
if (bh->is_dirty())
Expand Down