Commit 0044d3aa authored by Marc Vef's avatar Marc Vef
Browse files

Merged open() ipc/rpc

parent 04f19d11

ifs/include/preload/margo_ipc.hpp

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ void send_minimal_ipc(const hg_id_t minimal_id); 


bool ipc_send_get_fs_config(const hg_id_t ipc_get_config_id);



int ipc_send_open(const string& path, int flags, const mode_t mode, const hg_id_t ipc_open_id);



int ipc_send_stat(const string& path, std::string& attr, const hg_id_t ipc_stat_id);



int ipc_send_unlink(const string& path, const hg_id_t ipc_unlink_id);

ifs/include/preload/rpc/ld_rpc_metadentry.hpp

+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 


void send_minimal_rpc(const hg_id_t minimal_id);



int rpc_send_create_node(const hg_id_t rpc_create_node_id, const size_t recipient, const std::string& path,

                         const mode_t mode);

int rpc_send_open(const hg_id_t ipc_open_id, const hg_id_t rpc_open_id, const std::string& path, const mode_t mode,

                  const int flags);



int

rpc_send_get_attr(const hg_id_t rpc_get_attr_id, const size_t recipient, const std::string& path, std::string& attr);

ifs/include/rpc/rpc_defs.hpp

+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ DECLARE_MARGO_RPC_HANDLER(rpc_minimal) 


DECLARE_MARGO_RPC_HANDLER(ipc_srv_fs_config)



DECLARE_MARGO_RPC_HANDLER(rpc_srv_create_node)

DECLARE_MARGO_RPC_HANDLER(rpc_srv_open)



DECLARE_MARGO_RPC_HANDLER(rpc_srv_attr)
@@ -32,7 +32,6 @@ DECLARE_MARGO_RPC_HANDLER(rpc_srv_read_data) 
DECLARE_MARGO_RPC_HANDLER(rpc_srv_write_data)



// IPCs

DECLARE_MARGO_RPC_HANDLER(ipc_srv_open)



DECLARE_MARGO_RPC_HANDLER(ipc_srv_stat)

ifs/include/rpc/rpc_types.hpp

+2 −1
Original line number Diff line number Diff line
@@ -19,8 +19,9 @@ MERCURY_GEN_PROC(rpc_minimal_out_t, ((int32_t) (output))) 
MERCURY_GEN_PROC(rpc_err_out_t, ((hg_int32_t) (err)))



// Metadentry

MERCURY_GEN_PROC(rpc_create_node_in_t,

MERCURY_GEN_PROC(rpc_open_in_t,

                 ((hg_const_string_t) (path))\

((hg_int32_t) (flags)) \

((uint32_t) (mode)))



MERCURY_GEN_PROC(rpc_get_attr_in_t, ((hg_const_string_t) (path)))

ifs/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ int main(int argc, const char* argv[]) { 
    ADAFS_DATA->spdlogger()->flush_on(spdlog::level::info);

#if defined(LOG_TRACE)

    spdlog::set_level(spdlog::level::trace);

//    ADAFS_DATA->spdlogger()->flush_on(spdlog::level::trace);

    ADAFS_DATA->spdlogger()->flush_on(spdlog::level::trace);

#elif defined(LOG_DEBUG)

    spdlog::set_level(spdlog::level::debug);

//    ADAFS_DATA->spdlogger()->flush_on(spdlog::level::debug);