emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move array_t to gmock

Browse Source
This commit is contained in:
Joe Thornber
2013-03-22 13:42:20 +00:00
parent 50bab1c90a
commit f9bf18adf6
8 changed files with 98 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
persistent-data/data-structures/array.h
View File

@ -45,11 +45,11 @@ namespace persistent_data {
virtual void prepare(buffer<> &b, block_address location) const {
array_block_disk *data = reinterpret_cast<array_block_disk *>(&b);
data->blocknr = to_disk<base::__le64, uint64_t>(location);
data->blocknr = to_disk<base::le64, uint64_t>(location);
crc32c sum(ARRAY_CSUM_XOR);
sum.append(&data->max_entries, MD_BLOCK_SIZE - sizeof(uint32_t));
data->csum = to_disk<base::__le32>(sum.get_sum());
data->csum = to_disk<base::le32>(sum.get_sum());
}
};
@ -109,7 +109,7 @@ namespace persistent_data {
friend class block_ref_counter;
struct block_traits {
typedef base::__le64 disk_type;
typedef base::le64 disk_type;
typedef block_address value_type;
typedef block_ref_counter ref_counter;
@ -118,7 +118,7 @@ namespace persistent_data {
}
static void pack(value_type const &value, disk_type &disk) {
disk = base::to_disk<base::__le64>(value);
disk = base::to_disk<base::le64>(value);
}
};

18
persistent-data/data-structures/array_block.h
View File

@ -25,11 +25,11 @@
namespace persistent_data {
struct array_block_disk {
base::__le32 csum;
base::__le32 max_entries;
base::__le32 nr_entries;
base::__le32 value_size;
base::__le64 blocknr;
base::le32 csum;
base::le32 max_entries;
base::le32 nr_entries;
base::le32 value_size;
base::le64 blocknr;
} __attribute__((packed));
// RefType should be either a read_ref or write_ref from block_manager
@ -58,9 +58,9 @@ namespace persistent_data {
void setup_empty() {
using namespace base;
struct array_block_disk *header = get_header();
header->max_entries = to_disk<__le32>(calc_max_entries());
header->nr_entries = to_disk<__le32>(static_cast<uint32_t>(0));
header->value_size = to_disk<__le32>(static_cast<uint32_t>(sizeof(disk_type)));
header->max_entries = to_disk<le32>(calc_max_entries());
header->nr_entries = to_disk<le32>(static_cast<uint32_t>(0));
header->value_size = to_disk<le32>(static_cast<uint32_t>(sizeof(disk_type)));
}
uint32_t max_entries() const {
@ -142,7 +142,7 @@ namespace persistent_data {
void set_nr_entries(uint32_t nr) {
using namespace base;
array_block_disk *h = get_header();
h->nr_entries = to_disk<__le32>(nr);
h->nr_entries = to_disk<le32>(nr);
}
void grow_(uint32_t nr, value_type const &default_value) {

20
persistent-data/data-structures/btree.h
View File

@ -31,7 +31,7 @@
namespace persistent_data {
struct uint64_traits {
typedef base::__le64 disk_type;
typedef base::le64 disk_type;
typedef uint64_t value_type;
typedef no_op_ref_counter<uint64_t> ref_counter;
@ -40,7 +40,7 @@ namespace persistent_data {
}
static void pack(value_type const &value, disk_type &disk) {
disk = base::to_disk<base::__le64>(value);
disk = base::to_disk<base::le64>(value);
}
};
@ -59,19 +59,19 @@ namespace persistent_data {
};
struct node_header {
__le32 csum;
__le32 flags;
__le64 blocknr; /* which block this node is supposed to live in */
le32 csum;
le32 flags;
le64 blocknr; /* which block this node is supposed to live in */
__le32 nr_entries;
__le32 max_entries;
__le32 value_size;
__le32 padding;
le32 nr_entries;
le32 max_entries;
le32 value_size;
le32 padding;
} __attribute__((packed));
struct disk_node {
struct node_header header;
__le64 keys[0];
le64 keys[0];
} __attribute__((packed));
enum node_type {

14
persistent-data/data-structures/btree.tcc
View File

@ -48,11 +48,11 @@ namespace {
virtual void prepare(buffer<> &b, block_address location) const {
disk_node *data = reinterpret_cast<disk_node *>(&b);
node_header *n = &data->header;
n->blocknr = to_disk<base::__le64, uint64_t>(location);
n->blocknr = to_disk<base::le64, uint64_t>(location);
crc32c sum(BTREE_CSUM_XOR);
sum.append(&n->flags, MD_BLOCK_SIZE - sizeof(uint32_t));
n->csum = to_disk<base::__le32>(sum.get_sum());
n->csum = to_disk<base::le32>(sum.get_sum());
}
};
@ -138,7 +138,7 @@ node_ref<ValueTraits>::set_type(node_type t)
flags = LEAF_NODE;
break;
}
raw_->header.flags = to_disk<__le32>(flags);
raw_->header.flags = to_disk<le32>(flags);
}
template <typename ValueTraits>
@ -152,7 +152,7 @@ template <typename ValueTraits>
void
node_ref<ValueTraits>::set_nr_entries(unsigned n)
{
raw_->header.nr_entries = to_disk<__le32>(n);
raw_->header.nr_entries = to_disk<le32>(n);
}
template <typename ValueTraits>
@ -166,7 +166,7 @@ template <typename ValueTraits>
void
node_ref<ValueTraits>::set_max_entries(unsigned n)
{
raw_->header.max_entries = to_disk<__le32>(n);
raw_->header.max_entries = to_disk<le32>(n);
}
template <typename ValueTraits>
@ -187,7 +187,7 @@ template <typename ValueTraits>
void
node_ref<ValueTraits>::set_value_size(size_t s)
{
raw_->header.value_size = to_disk<__le32>(static_cast<uint32_t>(s));
raw_->header.value_size = to_disk<le32>(static_cast<uint32_t>(s));
}
template <typename ValueTraits>
@ -203,7 +203,7 @@ template <typename ValueTraits>
void
node_ref<ValueTraits>::set_key(unsigned i, uint64_t k)
{
raw_->keys[i] = to_disk<__le64>(k);
raw_->keys[i] = to_disk<le64>(k);
}
template <typename ValueTraits>