Commit 387245a3 authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch '12-combine-rpc-and-ipc-client'

parents 04f19d11 18b5533b

ifs/configure.hpp

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
#define RPC_TRIES 3

#define RPC_TIMEOUT 150000

#define RPC_PROTOCOL "bmi+tcp"

//#define MARGODIAG // enables diagnostics of margo (printed after shutting down



// Debug configurations

//#define RPC_TEST //unused

ifs/include/daemon/adafs_daemon.hpp

+1 −5
Original line number Diff line number Diff line
@@ -11,12 +11,8 @@ void init_environment(); 
void destroy_enviroment();



bool init_ipc_server();



bool init_rpc_server();



bool init_rpc_client();



void register_server_ipcs();

void register_server_rpcs();

void register_server_rpcs(margo_instance_id mid);



#endif //IFS_ADAFS_DAEMON_HPP

ifs/include/preload/ipc_types.hpp

+0 −12
Original line number Diff line number Diff line
@@ -34,16 +34,4 @@ MERCURY_GEN_PROC(ipc_config_out_t, ((hg_const_string_t) (mountdir)) 
((hg_uint64_t) (host_id)) \

((hg_uint64_t) (host_size)))





MERCURY_GEN_PROC(ipc_open_in_t, ((hg_const_string_t) (path))

        ((hg_int32_t) (flags)) \

((hg_uint32_t) (mode)))



MERCURY_GEN_PROC(ipc_stat_in_t, ((hg_const_string_t) (path)))



MERCURY_GEN_PROC(ipc_stat_out_t, ((hg_int32_t) (err))

        ((hg_const_string_t) (db_val)))



MERCURY_GEN_PROC(ipc_unlink_in_t, ((hg_const_string_t) (path)))



#endif //IFS_IPC_TYPES_HPP

ifs/include/preload/margo_ipc.hpp

+0 −6
Original line number Diff line number Diff line
@@ -16,10 +16,4 @@ 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);



#endif //IFS_MARGO_IPC_HPP

ifs/include/preload/rpc/ld_rpc_metadentry.hpp

+7 −4
Original line number Diff line number Diff line
@@ -9,15 +9,18 @@ 
#include <rpc/rpc_types.hpp>

#include <iostream>



hg_return margo_create_wrap(const hg_id_t ipc_id, const hg_id_t rpc_id, const std::string& path, hg_handle_t& handle,

                            hg_addr_t& svr_addr);



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);

rpc_send_stat(const hg_id_t ipc_stat_id, const hg_id_t rpc_stat_id, const std::string& path, string& attr);



int rpc_send_remove_node(const hg_id_t rpc_remove_node_id, const size_t recipient, const std::string& path);

int rpc_send_unlink(const hg_id_t ipc_unlink_id, const hg_id_t rpc_unlink_id, const std::string& path);



int rpc_send_update_metadentry(const hg_id_t ipc_update_metadentry_id, const hg_id_t rpc_update_metadentry_id,

                               const string& path, const Metadentry& md, const MetadentryUpdateFlags& md_flags);