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

os/bluestore: make BufferSpace smaller

Browse Source 
Saves 24 bytes!

BufferSpace  104 -> 80 bytes
SharedBlob   216 -> 192 bytes

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-10-04 18:14:16 -04:00
parent 7c5b77a6f8
commit 02f457177a
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/os/bluestore/BlueStore.h
View File

@ -207,7 +207,23 @@ public:
map<uint64_t,std::unique_ptr<Buffer>> buffer_map; map<uint64_t,std::unique_ptr<Buffer>> buffer_map;
Cache *cache; Cache *cache;
map<uint64_t, state_list_t> writing_map;
// we use a list here instead of std::map because it uses less memory and
// we expect this to be very small (very few IOs in flight to the same
// Blob at the same time).
list<pair<uint64_t,state_list_t>> writing_map;
list<pair<uint64_t,state_list_t>>::iterator get_writing_map(uint64_t seq) {
for (auto p = writing_map.begin(); p != writing_map.end(); ++p) {
if (p->first == seq) {
return p;
}
}
writing_map.push_back(make_pair(seq, state_list_t()));
auto p = writing_map.end();
--p;
return p;
}
BufferSpace(Cache *c) : cache(c) { BufferSpace(Cache *c) : cache(c) {
if (cache) { if (cache) {
@ -226,7 +242,7 @@ public:
cache->_audit("_add_buffer start"); cache->_audit("_add_buffer start");
buffer_map[b->offset].reset(b); buffer_map[b->offset].reset(b);
if (b->is_writing()) { if (b->is_writing()) {
writing_map[b->seq].push_back(*b); get_writing_map(b->seq)->second.push_back(*b);
} else { } else {
cache->_add_buffer(b, level, near); cache->_add_buffer(b, level, near);
} }
@ -239,11 +255,12 @@ public:
cache->_audit("_rm_buffer start"); cache->_audit("_rm_buffer start");
if (p->second->is_writing()) { if (p->second->is_writing()) {
uint64_t seq = (*p->second.get()).seq; uint64_t seq = (*p->second.get()).seq;
auto it = writing_map.find(seq); auto it = get_writing_map(seq);
assert(it != writing_map.end()); assert(!it->second.empty());
it->second.erase(it->second.iterator_to(*p->second)); it->second.erase(it->second.iterator_to(*p->second));
if (it->second.empty()) if (it->second.empty()) {
writing_map.erase(it); writing_map.erase(it);
}
} else { } else {
cache->_rm_buffer(p->second.get()); cache->_rm_buffer(p->second.get());
} }