Unverified Commit 8eb793a8 authored by Tommaso Tocci's avatar Tommaso Tocci
Browse files

rpc refactoring: remove implicit usage of standard namespace

parent d3610793

ifs/include/preload/rpc/ld_rpc_management.hpp

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
#include <preload/preload.hpp>

#include <global/rpc/rpc_types.hpp>



using namespace std;





void send_minimal_ipc(const hg_id_t minimal_id);

ifs/src/preload/preload.cpp

+3 −3
Original line number Diff line number Diff line
@@ -168,10 +168,10 @@ void log_prog_name() { 
    std::ifstream cmdline("/proc/self/cmdline");

    if (!cmdline.is_open()) {

        CTX->log()->error("Unable to open cmdline file");

        throw runtime_error("Unable to open cmdline file");

        throw std::runtime_error("Unable to open cmdline file");

    }

    if(!getline(cmdline, line)) {

        throw runtime_error("Unable to read cmdline file");

        throw std::runtime_error("Unable to read cmdline file");

    }

    CTX->log()->info("Command to itercept: '{}'", line);

    cmdline.close();
@@ -188,7 +188,7 @@ void init_preload() { 
    init_cwd();

    CTX->log()->debug("Current working directory: '{}'", CTX->cwd());

    if (get_daemon_pid() == -1 || CTX->mountdir().empty()) {

        cerr << "ADA-FS daemon not running or mountdir could not be loaded. Check adafs_preload.log" << endl;

        std::cerr << "ADA-FS daemon not running or mountdir could not be loaded. Check adafs_preload.log" << std::endl;

        CTX->log()->error("{}() Daemon not running or mountdir not set", __func__);

        exit(EXIT_FAILURE);

    } else {

ifs/src/preload/rpc/ld_rpc_management.cpp

+3 −2
Original line number Diff line number Diff line 
#include "preload/rpc/ld_rpc_management.hpp"

#include <global/configure.hpp>

#include <preload/preload_util.hpp>

#include <boost/type_traits/is_pointer.hpp> // see https://github.com/boostorg/tokenizer/issues/9

#include <boost/token_functions.hpp>

#include <boost/tokenizer.hpp>

extern "C" {
@@ -101,10 +102,10 @@ bool ipc_send_get_fs_config() { 
            CTX->fs_conf()->gid = out.gid;

            CTX->fs_conf()->host_id = out.host_id;

            CTX->fs_conf()->host_size = out.host_size;

            CTX->fs_conf()->rpc_port = to_string(RPC_PORT);

            CTX->fs_conf()->rpc_port = std::to_string(RPC_PORT);



            // split comma separated host string and create a hosts map

            string hosts_raw = out.hosts_raw;

            std::string hosts_raw = out.hosts_raw;

            std::map<uint64_t, std::string> hostmap;

            boost::char_separator<char> sep(",");

            boost::tokenizer<boost::char_separator<char>> tok(hosts_raw, sep);