RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-04 02:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9600 from stiopaa1/osdc_objectcacher_moveCwritecommit

Browse Source 
osdc/ObjectCacher.h: move classes to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-06-09 09:41:11 -04:00
commit 0b358dbdb7
2 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/osdc/ObjectCacher.cc
View File

@ -921,6 +921,27 @@ void ObjectCacher::bh_write_adjacencies(BufferHead *bh, ceph::real_time cutoff,
bh_write_scattered(blist);
}
class ObjectCacher::C_WriteCommit : public Context {
ObjectCacher *oc;
int64_t poolid;
sobject_t oid;
vector<pair<loff_t, uint64_t> > ranges;
public:
ceph_tid_t tid;
C_WriteCommit(ObjectCacher *c, int64_t _poolid, sobject_t o, loff_t s,
uint64_t l) :
oc(c), poolid(_poolid), oid(o), tid(0) {
ranges.push_back(make_pair(s, l));
}
C_WriteCommit(ObjectCacher *c, int64_t _poolid, sobject_t o,
vector<pair<loff_t, uint64_t> >& _ranges) :
oc(c), poolid(_poolid), oid(o), tid(0) {
ranges.swap(_ranges);
}
void finish(int r) {
oc->bh_write_commit(poolid, oid, ranges, tid, r);
}
};
void ObjectCacher::bh_write_scattered(list<BufferHead*>& blist)
{
assert(lock.is_locked());
@ -1631,6 +1652,17 @@ int ObjectCacher::writex(OSDWrite *wr, ObjectSet *oset, Context *onfreespace)
return r;
}
class ObjectCacher::C_WaitForWrite : public Context {
public:
C_WaitForWrite(ObjectCacher *oc, uint64_t len, Context *onfinish) :
m_oc(oc), m_len(len), m_onfinish(onfinish) {}
void finish(int r);
private:
ObjectCacher *m_oc;
uint64_t m_len;
Context *m_onfinish;
};
void ObjectCacher::C_WaitForWrite::finish(int r)
{
Mutex::Locker l(m_oc->lock);

34
src/osdc/ObjectCacher.h
View File

@ -592,38 +592,8 @@ class ObjectCacher {
}
};
class C_WriteCommit : public Context {
ObjectCacher *oc;
int64_t poolid;
sobject_t oid;
vector<pair<loff_t, uint64_t> > ranges;
public:
ceph_tid_t tid;
C_WriteCommit(ObjectCacher *c, int64_t _poolid, sobject_t o, loff_t s,
uint64_t l) :
oc(c), poolid(_poolid), oid(o), tid(0) {
ranges.push_back(make_pair(s, l));
}
C_WriteCommit(ObjectCacher *c, int64_t _poolid, sobject_t o,
vector<pair<loff_t, uint64_t> >& _ranges) :
oc(c), poolid(_poolid), oid(o), tid(0) {
ranges.swap(_ranges);
}
void finish(int r) {
oc->bh_write_commit(poolid, oid, ranges, tid, r);
}
};
class C_WaitForWrite : public Context {
public:
C_WaitForWrite(ObjectCacher *oc, uint64_t len, Context *onfinish) :
m_oc(oc), m_len(len), m_onfinish(onfinish) {}
void finish(int r);
private:
ObjectCacher *m_oc;
uint64_t m_len;
Context *m_onfinish;
};
class C_WriteCommit;
class C_WaitForWrite;
void perf_start();
void perf_stop();