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

Adding gkfs::daemon namespace, cleanup

parent 15cee453

include/daemon/classes/fs_data.hpp

+8 −5
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ 


#include <daemon/daemon.hpp>



#include <unordered_map>

#include <map>

#include <functional> //std::hash



/* Forward declarations */

namespace gkfs {

namespace metadata {
@@ -26,12 +30,8 @@ class MetadataDB; 
namespace data {

class ChunkStorage;

}

}





#include <unordered_map>

#include <map>

#include <functional> //std::hash

namespace daemon {



class FsData {
@@ -129,4 +129,7 @@ public: 


};



} // namespace daemon

} // namespace gkfs



#endif //LFS_FS_DATA_H

include/daemon/classes/rpc_data.hpp

+6 −1
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 


#include <daemon/daemon.hpp>



namespace gkfs {

namespace daemon {



class RPCData {



private:
@@ -59,7 +62,9 @@ public: 


    void self_addr_str(const std::string& addr_str);





};



} // namespace daemon

} // namespace gkfs



#endif //LFS_RPC_DATA_HPP

include/daemon/daemon.hpp

+2 −12
Original line number Diff line number Diff line
@@ -30,17 +30,7 @@ extern "C" { 
#include <daemon/classes/fs_data.hpp>

#include <daemon/classes/rpc_data.hpp>



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

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



void init_environment();



void destroy_enviroment();



void init_io_tasklet_pool();



void init_rpc_server(const std::string& protocol);



void register_server_rpcs(margo_instance_id mid);

#define GKFS_DATA (static_cast<gkfs::daemon::FsData*>(gkfs::daemon::FsData::getInstance()))

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



#endif // GKFS_DAEMON_DAEMON_HPP

src/daemon/classes/fs_data.cpp

+5 −1
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 


#include <spdlog/spdlog.h>



namespace gkfs {

namespace daemon {



// getter/setter



const std::shared_ptr<spdlog::logger>& FsData::spdlogger() const {
@@ -125,7 +128,8 @@ void FsData::blocks_state(bool blocks_state) { 
    FsData::blocks_state_ = blocks_state;

}





} // namespace daemon

} // namespace gkfs

src/daemon/classes/rpc_data.cpp

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


using namespace std;



namespace gkfs {

namespace daemon {



// Getter/Setter



margo_instance* RPCData::server_rpc_mid() {
@@ -49,3 +52,6 @@ const std::string& RPCData::self_addr_str() const { 
void RPCData::self_addr_str(const std::string& addr_str) {

    self_addr_str_ = addr_str;

}



} // namespace daemon

} // namespace gkfs
 
 No newline at end of file