RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-06 08:20:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12569 from liewegas/wip-bluestore-raw-unused

Browse Source 
os/bluestore/bluestore_types: drop std::bitset for blob unused

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Varada Kari <varada.kari@sandisk.com>
This commit is contained in:
Sage Weil 2016-12-27 16:37:15 -06:00 committed by GitHub
commit c67a23592d
2 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/os/bluestore/bluestore_types.cc
View File

@ -410,7 +410,7 @@ void bluestore_blob_t::dump(Formatter *f) const
for (unsigned i = 0; i < n; ++i)
f->dump_unsigned("csum", get_csum_item(i));
f->close_section();
f->dump_unsigned("unused", unused.to_ullong());
f->dump_unsigned("unused", unused);
}
void bluestore_blob_t::generate_test_instances(list<bluestore_blob_t*>& ls)
@ -448,7 +448,7 @@ ostream& operator<<(ostream& out, const bluestore_blob_t& o)
<< "/0x" << std::hex << (1ull << o.csum_chunk_order) << std::dec;
}
if (o.has_unused())
out << " unused=0x" << std::hex << o.unused.to_ullong() << std::dec;
out << " unused=0x" << std::hex << o.unused << std::dec;
out << ")";
return out;
}

46
src/os/bluestore/bluestore_types.h
View File

@ -284,15 +284,13 @@ struct bluestore_blob_t {
uint32_t compressed_length = 0; ///< compressed length if any
uint32_t flags = 0; ///< FLAG_*
uint16_t unused = 0; ///< portion that has never been written to (bitmap)
uint8_t csum_type = Checksummer::CSUM_NONE; ///< CSUM_*
uint8_t csum_chunk_order = 0; ///< csum block size is 1<<block_order bytes
bufferptr csum_data; ///< opaque vector of csum data
typedef uint16_t unused_uint_t;
typedef std::bitset<sizeof(unused_uint_t) * 8> unused_t;
unused_t unused; ///< portion that has never been written to
bluestore_blob_t(uint32_t f = 0) : flags(f) {}
DENC_HELPERS;
@ -325,7 +323,7 @@ struct bluestore_blob_t {
csum_data.length());
}
if (has_unused()) {
denc(unused_uint_t(unused.to_ullong()), p);
denc(unused, p);
}
}
@ -345,9 +343,7 @@ struct bluestore_blob_t {
csum_data = p.get_ptr(len);
}
if (has_unused()) {
unused_uint_t val;
denc(val, p);
unused = unused_t(val);
denc(unused, p);
}
}
@ -455,14 +451,13 @@ struct bluestore_blob_t {
return false;
}
uint64_t blob_len = get_logical_length();
assert((blob_len % unused.size()) == 0);
assert((blob_len % (sizeof(unused)*8)) == 0);
assert(offset + length <= blob_len);
uint64_t chunk_size = blob_len / unused.size();
uint64_t chunk_size = blob_len / (sizeof(unused)*8);
uint64_t start = offset / chunk_size;
uint64_t end = ROUND_UP_TO(offset + length, chunk_size) / chunk_size;
assert(end <= unused.size());
auto i = start;
while (i < end && unused[i]) {
while (i < end && (unused & (1u << i))) {
i++;
}
return i >= end;
@ -471,14 +466,13 @@ struct bluestore_blob_t {
/// mark a range that has never been used
void add_unused(uint64_t offset, uint64_t length) {
uint64_t blob_len = get_logical_length();
assert((blob_len % unused.size()) == 0);
assert((blob_len % (sizeof(unused)*8)) == 0);
assert(offset + length <= blob_len);
uint64_t chunk_size = blob_len / unused.size();
uint64_t chunk_size = blob_len / (sizeof(unused)*8);
uint64_t start = ROUND_UP_TO(offset, chunk_size) / chunk_size;
uint64_t end = (offset + length) / chunk_size;
assert(end <= unused.size());
for (auto i = start; i < end; ++i) {
unused[i] = 1;
unused |= (1u << i);
}
if (start != end) {
set_flag(FLAG_HAS_UNUSED);
@ -489,16 +483,15 @@ struct bluestore_blob_t {
void mark_used(uint64_t offset, uint64_t length) {
if (has_unused()) {
uint64_t blob_len = get_logical_length();
assert((blob_len % unused.size()) == 0);
assert((blob_len % (sizeof(unused)*8)) == 0);
assert(offset + length <= blob_len);
uint64_t chunk_size = blob_len / unused.size();
uint64_t chunk_size = blob_len / (sizeof(unused)*8);
uint64_t start = offset / chunk_size;
uint64_t end = ROUND_UP_TO(offset + length, chunk_size) / chunk_size;
assert(end <= unused.size());
for (auto i = start; i < end; ++i) {
unused[i] = 0;
unused &= ~(1u << i);
}
if (unused.none()) {
if (unused == 0) {
clear_flag(FLAG_HAS_UNUSED);
}
}
@ -664,11 +657,6 @@ struct bluestore_onode_t {
uint64_t nid = 0; ///< numeric id (locally unique)
uint64_t size = 0; ///< object size
map<string, bufferptr> attrs; ///< attrs
uint8_t flags = 0;
enum {
FLAG_OMAP = 1,
};
struct shard_info {
uint32_t offset = 0; ///< logical offset for start of shard
@ -685,6 +673,12 @@ struct bluestore_onode_t {
uint32_t expected_write_size = 0;
uint32_t alloc_hint_flags = 0;
uint8_t flags = 0;
enum {
FLAG_OMAP = 1,
};
string get_flags_string() const {
string s;
if (flags & FLAG_OMAP) {