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

Merged unlink() ipc/rpc + RPC Register cleanup

parent 6878a8b5

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 −2
Original line number Diff line number Diff line
@@ -34,6 +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_unlink_in_t, ((hg_const_string_t) (path)))



#endif //IFS_IPC_TYPES_HPP

ifs/include/preload/margo_ipc.hpp

+0 −2
Original line number Diff line number Diff line
@@ -16,6 +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_unlink(const string& path, const hg_id_t ipc_unlink_id);



#endif //IFS_MARGO_IPC_HPP

ifs/include/preload/rpc/ld_rpc_metadentry.hpp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ int rpc_send_open(const hg_id_t ipc_open_id, const hg_id_t rpc_open_id, const st 
int

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

ifs/include/rpc/rpc_defs.hpp

+1 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ DECLARE_MARGO_RPC_HANDLER(rpc_srv_open) 


DECLARE_MARGO_RPC_HANDLER(rpc_srv_stat)



DECLARE_MARGO_RPC_HANDLER(rpc_srv_remove_node)

DECLARE_MARGO_RPC_HANDLER(rpc_srv_unlink)



DECLARE_MARGO_RPC_HANDLER(rpc_srv_update_metadentry)
@@ -31,10 +31,6 @@ DECLARE_MARGO_RPC_HANDLER(rpc_srv_read_data) 


DECLARE_MARGO_RPC_HANDLER(rpc_srv_write_data)



// IPCs



DECLARE_MARGO_RPC_HANDLER(ipc_srv_unlink)





/** OLD BELOW

// mdata ops