Commit d08641df authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch 'daemon_cleanup_includes' into 'master' 



Daemon cleanup includes

See merge request zdvresearch_bsc/adafs!54

Signed-off-by: default avatarMarc Vef <vef@uni-mainz.de>
parents 6cf7db27 43adc37c

ifs/include/daemon/adafs_daemon.hpp

+0 −13
Original line number Diff line number Diff line
@@ -4,21 +4,10 @@ 


// std libs

#include <string>

#include <iostream>

#include <cstdint>

#include <cerrno>

#include <unordered_map>

#include <thread>

#include <map>



// adafs config

#include <global/configure.hpp>

#include <global/global_defs.hpp>

// boost libs

#include <boost/filesystem.hpp>

#include <boost/filesystem/fstream.hpp>

#include <boost/program_options.hpp>

#include <boost/tokenizer.hpp>

// third party libs

#include <extern/spdlog/spdlog.h>

#include <extern/spdlog/fmt/fmt.h>
@@ -40,8 +29,6 @@ extern "C" { 
#include <daemon/classes/fs_data.hpp>

#include <daemon/classes/rpc_data.hpp>



namespace bfs = boost::filesystem;



#define INVALID_INODE static_cast<ino_t>(0)

#define ADAFS_DATA (static_cast<FsData*>(FsData::getInstance()))

#define RPC_DATA (static_cast<RPCData*>(RPCData::getInstance()))

ifs/include/daemon/classes/fs_data.hpp

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 


#include <daemon/adafs_daemon.hpp>



#include <unordered_map>

#include <functional> //std::hash



class FsData {

ifs/src/daemon/adafs_daemon.cpp

+9 −1
Original line number Diff line number Diff line
@@ -6,12 +6,20 @@ 
#include <daemon/db/db_util.hpp>

#include <daemon/adafs_ops/metadentry.hpp>



#include <boost/filesystem.hpp>

#include <boost/program_options.hpp>

#include <boost/tokenizer.hpp>



#include <iostream>

#include <fstream>

#include <csignal>



#include <condition_variable>

#include <global/global_func.hpp>



using namespace std;

namespace po = boost::program_options;

namespace bfs = boost::filesystem;



static condition_variable shutdown_please;

static mutex mtx;

ifs/src/daemon/adafs_ops/data.cpp

+2 −0
Original line number Diff line number Diff line 


#include <daemon/adafs_ops/data.hpp>

#include <boost/filesystem.hpp>



namespace bfs = boost::filesystem;

using namespace std;



std::string path_to_fspath(const std::string& path) {