move space maps to their own sub directory

This commit is contained in:
Joe Thornber 2013-01-10 21:36:38 +00:00
parent 6a4facf03b
commit 326fd3408b
15 changed files with 31 additions and 29 deletions

View File

@ -33,9 +33,9 @@ SOURCE=\
persistent-data/hex_dump.cc \
persistent-data/lock_tracker.cc \
persistent-data/space_map.cc \
persistent-data/space_map_disk.cc \
persistent-data/space_map_recursive.cc \
persistent-data/space_map_careful_alloc.cc \
persistent-data/space-maps/disk.cc \
persistent-data/space-maps/recursive.cc \
persistent-data/space-maps/careful_alloc.cc \
persistent-data/transaction_manager.cc \
thin-provisioning/human_readable_format.cc \
thin-provisioning/metadata.cc \

View File

@ -16,7 +16,7 @@
// with thin-provisioning-tools. If not, see
// <http://www.gnu.org/licenses/>.
#include "persistent-data/space_map_careful_alloc.h"
#include "persistent-data/space-maps/careful_alloc.h"
#include <set>

View File

@ -19,7 +19,7 @@
#ifndef SPACE_MAP_CAREFUL_ALLOC_H
#define SPACE_MAP_CAREFUL_ALLOC_H
#include "space_map.h"
#include "persistent-data/space_map.h"
//----------------------------------------------------------------

View File

@ -19,7 +19,7 @@
#ifndef CORE_MAP_H
#define CORE_MAP_H
#include "space_map.h"
#include "persistent-data/space_map.h"
//----------------------------------------------------------------

View File

@ -16,15 +16,15 @@
// with thin-provisioning-tools. If not, see
// <http://www.gnu.org/licenses/>.
#include "space_map_disk.h"
#include "disk.h"
#include "disk_structures.h"
#include "recursive.h"
#include "careful_alloc.h"
#include "checksum.h"
#include "endian_utils.h"
#include "math_utils.h"
#include "space_map_disk_structures.h"
#include "space_map_recursive.h"
#include "space_map_careful_alloc.h"
#include "transaction_manager.h"
#include "persistent-data/checksum.h"
#include "persistent-data/endian_utils.h"
#include "persistent-data/math_utils.h"
#include "persistent-data/transaction_manager.h"
using namespace boost;
using namespace persistent_data;

View File

@ -19,8 +19,9 @@
#ifndef SPACE_MAP_DISK_H
#define SPACE_MAP_DISK_H
#include "btree_checker.h"
#include "space_map.h"
// FIXME: why is btree_checker needed?
#include "persistent-data/btree_checker.h"
#include "persistent-data/space_map.h"
//----------------------------------------------------------------

View File

@ -16,7 +16,7 @@
// with thin-provisioning-tools. If not, see
// <http://www.gnu.org/licenses/>.
#include "persistent-data/space_map_recursive.h"
#include "persistent-data/space-maps/recursive.h"
using namespace persistent_data;

View File

@ -19,7 +19,7 @@
#ifndef SPACE_MAP_RECURSIVE_H
#define SPACE_MAP_RECURSIVE_H
#include "space_map.h"
#include "persistent-data/space_map.h"
//----------------------------------------------------------------

View File

@ -19,8 +19,8 @@
#include "thin-provisioning/metadata.h"
#include "persistent-data/math_utils.h"
#include "persistent-data/space_map_core.h"
#include "persistent-data/space_map_disk.h"
#include "persistent-data/space-maps/core.h"
#include "persistent-data/space-maps/disk.h"
#include <linux/fs.h>
#include <sys/ioctl.h>

View File

@ -22,10 +22,11 @@
#include "persistent-data/block.h"
#include "persistent-data/btree.h"
#include "persistent-data/endian_utils.h"
#include "thin-provisioning/metadata_disk_structures.h"
#include "persistent-data/space_map_disk.h"
#include "persistent-data/space-maps/disk.h"
#include "persistent-data/transaction_manager.h"
#include "thin-provisioning/metadata_disk_structures.h"
//----------------------------------------------------------------
namespace thin_provisioning {

View File

@ -17,7 +17,7 @@
// <http://www.gnu.org/licenses/>.
#include "persistent-data/transaction_manager.h"
#include "persistent-data/space_map_core.h"
#include "persistent-data/space-maps/core.h"
#include "persistent-data/btree.h"
#define BOOST_TEST_MODULE BTreeTests

View File

@ -16,7 +16,7 @@
// with thin-provisioning-tools. If not, see
// <http://www.gnu.org/licenses/>.
#include "persistent-data/space_map_disk.h"
#include "persistent-data/space-maps/disk.h"
#define BOOST_TEST_MODULE EndianTests
#include <boost/test/included/unit_test.hpp>

View File

@ -16,10 +16,10 @@
// with thin-provisioning-tools. If not, see
// <http://www.gnu.org/licenses/>.
#include "persistent-data/space_map_disk.h"
#include "persistent-data/space_map_core.h"
#include "persistent-data/space_map_careful_alloc.h"
#include "persistent-data/space_map_recursive.h"
#include "persistent-data/space-maps/disk.h"
#include "persistent-data/space-maps/core.h"
#include "persistent-data/space-maps/careful_alloc.h"
#include "persistent-data/space-maps/recursive.h"
#define BOOST_TEST_MODULE SpaceMapDiskTests
#include <boost/test/included/unit_test.hpp>

View File

@ -17,7 +17,7 @@
// <http://www.gnu.org/licenses/>.
#include "persistent-data/transaction_manager.h"
#include "persistent-data/space_map_core.h"
#include "persistent-data/space-maps/core.h"
#define BOOST_TEST_MODULE TransactionManagerTests
#include <boost/test/included/unit_test.hpp>