GGLinnk/bees
1
0
Fork 0
mirror of https://github.com/Zygo/bees.git synced 2025-05-18 05:45:45 +02:00
Code Packages

crucible: get rid of DefaultBool, just use C++11 initializer syntax

Browse Source 
Signed-off-by: Zygo Blaxell <bees@furryterror.org>
This commit is contained in:
Zygo Blaxell 2017-01-09 23:23:32 -05:00
parent 1b261b1ba7
commit fa8607bae0
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/crucible/bool.h
View File

@ -1,13 +0,0 @@
#ifndef CRUCIBLE_BOOL_H
#define CRUCIBLE_BOOL_H
namespace crucible {
struct DefaultBool {
bool m_b;
DefaultBool(bool init = false) : m_b(init) {}
operator bool() const { return m_b; }
bool &operator=(const bool &that) { return m_b = that; }
};
}
#endif // CRUCIBLE_BOOL_H

21
src/bees.h
View File

@ -1,7 +1,6 @@
#ifndef BEES_H #ifndef BEES_H
#define BEES_H #define BEES_H
#include "crucible/bool.h"
#include "crucible/cache.h" #include "crucible/cache.h"
#include "crucible/chatter.h" #include "crucible/chatter.h"
#include "crucible/error.h" #include "crucible/error.h"
@ -487,7 +486,7 @@ class BeesCrawl {
mutex m_mutex; mutex m_mutex;
set<BeesFileRange> m_extents; set<BeesFileRange> m_extents;
DefaultBool m_deferred; bool m_deferred = false;
mutex m_state_mutex; mutex m_state_mutex;
BeesCrawlState m_state; BeesCrawlState m_state;
@ -512,7 +511,7 @@ class BeesRoots {
map<uint64_t, shared_ptr<BeesCrawl>> m_root_crawl_map; map<uint64_t, shared_ptr<BeesCrawl>> m_root_crawl_map;
mutex m_mutex; mutex m_mutex;
condition_variable m_condvar; condition_variable m_condvar;
DefaultBool m_crawl_dirty; bool m_crawl_dirty = false;
Timer m_crawl_timer; Timer m_crawl_timer;
BeesThread m_crawl_thread; BeesThread m_crawl_thread;
BeesThread m_writeback_thread; BeesThread m_writeback_thread;
@ -568,7 +567,7 @@ class BeesBlockData {
mutable BeesAddress m_addr; mutable BeesAddress m_addr;
mutable Blob m_data; mutable Blob m_data;
mutable BeesHash m_hash; mutable BeesHash m_hash;
mutable DefaultBool m_hash_done; mutable bool m_hash_done = false;
public: public:
// Constructor with the immutable fields // Constructor with the immutable fields
@ -672,7 +671,7 @@ public:
struct BeesResolveAddrResult { struct BeesResolveAddrResult {
BeesResolveAddrResult(); BeesResolveAddrResult();
vector<BtrfsInodeOffsetRoot> m_biors; vector<BtrfsInodeOffsetRoot> m_biors;
DefaultBool m_is_toxic; bool m_is_toxic = false;
bool is_toxic() const { return m_is_toxic; } bool is_toxic() const { return m_is_toxic; }
}; };
@ -750,22 +749,22 @@ class BeesResolver {
unsigned m_bior_count; unsigned m_bior_count;
// We found matching data, so we can dedup // We found matching data, so we can dedup
DefaultBool m_found_data; bool m_found_data = false;
// We found matching data, so we *did* dedup // We found matching data, so we *did* dedup
DefaultBool m_found_dup; bool m_found_dup = false;
// We found matching hash, so the hash table is still correct // We found matching hash, so the hash table is still correct
DefaultBool m_found_hash; bool m_found_hash = false;
// We found matching physical address, so the hash table isn't totally wrong // We found matching physical address, so the hash table isn't totally wrong
DefaultBool m_found_addr; bool m_found_addr = false;
// We found matching physical address, but data did not match // We found matching physical address, but data did not match
DefaultBool m_wrong_data; bool m_wrong_data = false;
// The whole thing is a placebo to avoid crippling btrfs performance bugs // The whole thing is a placebo to avoid crippling btrfs performance bugs
DefaultBool m_is_toxic; bool m_is_toxic = false;
BeesFileRange chase_extent_ref(const BtrfsInodeOffsetRoot &bior, BeesBlockData &needle_bbd); BeesFileRange chase_extent_ref(const BtrfsInodeOffsetRoot &bior, BeesBlockData &needle_bbd);
BeesBlockData adjust_offset(const BeesFileRange &haystack, const BeesBlockData &needle); BeesBlockData adjust_offset(const BeesFileRange &haystack, const BeesBlockData &needle);