Spin-off syscall-related file operations (#78)

* [file_utils] spin-off syscall-related file operations

1. Eliminate the potential circular dependency between
   persistent-data/block.h and persistent-data/file_utils.h,
   if the former one wants to include the latter.
2. Avoid namespace pollution by removing the "using namespace std"
   declaration in block.tcc.
3. Correct the header hierarchy: base/xml_utils.h now no longer
   depends on the higher-level persistent-data/file_utils.h

* [file_utils] support block files in get_file_length()
This commit is contained in:
Ming-Hung Tsai
2017-04-30 01:51:52 +08:00
committed by Joe Thornber
parent 8f25e1b234
commit b7d418131d
20 changed files with 210 additions and 191 deletions

View File

@ -3,6 +3,7 @@
#include <stdexcept>
using namespace persistent_data;
using namespace std;
//----------------------------------------------------------------
@ -91,7 +92,7 @@ bloom_filter::flush()
}
void
bloom_filter::fill_probes(block_address b, vector<unsigned> &probes) const
bloom_filter::fill_probes(block_address b, std::vector<unsigned> &probes) const
{
uint32_t h1 = hash1(b) & mask_;
uint32_t h2 = hash2(b) & mask_;
@ -105,7 +106,7 @@ bloom_filter::fill_probes(block_address b, vector<unsigned> &probes) const
}
void
bloom_filter::print_debug(ostream &out)
bloom_filter::print_debug(std::ostream &out)
{
print_residency(out);
@ -133,7 +134,7 @@ bloom_filter::print_debug(ostream &out)
}
void
bloom_filter::print_residency(ostream &out)
bloom_filter::print_residency(std::ostream &out)
{
unsigned count = 0;
for (unsigned i = 0; i < bits_.get_nr_bits(); i++)

View File

@ -26,12 +26,12 @@ namespace persistent_data {
void set(uint64_t b);
void flush();
void print_debug(ostream &out);
void print_debug(std::ostream &out);
private:
void print_residency(ostream &out);
void print_residency(std::ostream &out);
void fill_probes(block_address b, vector<unsigned> &probes) const;
void fill_probes(block_address b, std::vector<unsigned> &probes) const;
transaction_manager &tm_;
persistent_data::bitset bits_;

View File

@ -24,6 +24,7 @@
#include "persistent-data/validators.h"
#include <iostream>
#include <sstream>
//----------------------------------------------------------------