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

ifs: Unified RPC protocol

parent 34197e5f

ifs/main.hpp

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ extern "C" { 


namespace bfs = boost::filesystem;



#define RPC_PROTOCOL "bmi+tcp"

#define ADAFS_ROOT_INODE static_cast<ino_t>(1)

#define INVALID_INODE static_cast<ino_t>(0)

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

ifs/src/classes/rpc_data.cpp

+2 −2
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 


#include <classes/rpc_data.hpp>



using namespace std;



// Utility functions



bool RPCData::get_addr_by_hostid(const uint64_t hostid, hg_addr_t& svr_addr) {



    if (address_cache_.tryGet(hostid, svr_addr)) {
@@ -17,7 +17,7 @@ bool RPCData::get_addr_by_hostid(const uint64_t hostid, hg_addr_t& svr_addr) { 
        ADAFS_DATA->spdlogger()->debug("not found in lrucache");

        // not found, manual lookup and add address mapping to LRU cache

#ifndef RPC_TEST

        auto hostname = "bmi+tcp://" + ADAFS_DATA->hosts().at(hostid) + ":" +

        auto hostname = RPC_PROTOCOL + "://"s + ADAFS_DATA->hosts().at(hostid) + ":"s +

                        ADAFS_DATA->rpc_port(); // convert hostid to hostname and port

#else

        auto hostname = "bmi+tcp://127.0.0.1:" +

ifs/src/daemon/adafs_daemon.cpp

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ void destroy_argobots() { 
}



bool init_rpc_server() {

    auto protocol_port = "bmi+tcp://localhost:" + to_string(RPCPORT);

    auto protocol_port = RPC_PROTOCOL + "://localhost:"s + to_string(RPCPORT);

    hg_addr_t addr_self;

    hg_size_t addr_self_cstring_sz = 128;

    char addr_self_cstring[128];
@@ -311,7 +311,7 @@ void register_server_ipcs() { 
}



bool init_rpc_client() {

    auto protocol_port = "bmi+tcp"s;

    string protocol_port = RPC_PROTOCOL;

    ADAFS_DATA->spdlogger()->info("Initializing Mercury client ...");

    /* MERCURY PART */

    // Init Mercury layer (must be finalized when finished)