Commit 6878a8b5 authored by Marc Vef's avatar Marc Vef
Browse files

Merged stat() ipc/rpc

parent 0044d3aa

ifs/configure.hpp

+2 −2
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 
// To enabled logging with info level

#define LOG_INFO

//#define LOG_DEBUG

//#define LOG_TRACE

#define LOG_TRACE

#define LOG_DAEMON_PATH "/tmp/adafs_daemon.log"



// Enable logging for daemon

#define LOG_PRELOAD_INFO

//#define LOG_PRELOAD_DEBUG

//#define LOG_PRELOAD_TRACE

#define LOG_PRELOAD_TRACE

#define LOG_PRELOAD_PATH "/tmp/adafs_preload.log"



// If ACM time should be considered

ifs/include/preload/ipc_types.hpp

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

+4 −1
Original line number Diff line number Diff line
@@ -9,13 +9,16 @@ 
#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_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);

ifs/include/rpc/rpc_defs.hpp

+1 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ DECLARE_MARGO_RPC_HANDLER(ipc_srv_fs_config) 


DECLARE_MARGO_RPC_HANDLER(rpc_srv_open)



DECLARE_MARGO_RPC_HANDLER(rpc_srv_attr)

DECLARE_MARGO_RPC_HANDLER(rpc_srv_stat)



DECLARE_MARGO_RPC_HANDLER(rpc_srv_remove_node)
@@ -33,8 +33,6 @@ DECLARE_MARGO_RPC_HANDLER(rpc_srv_write_data) 


// IPCs



DECLARE_MARGO_RPC_HANDLER(ipc_srv_stat)



DECLARE_MARGO_RPC_HANDLER(ipc_srv_unlink)