Unverified Commit a15a8701 authored by Tommaso Tocci's avatar Tommaso Tocci
Browse files

rpc refactoring: merge ipc_types into rpc_types

parent ec5cf17f

ifs/include/global/rpc/ipc_types.hpp

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 


#ifndef IFS_IPC_TYPES_HPP

#define IFS_IPC_TYPES_HPP



extern "C" {

#include <mercury.h>

#include <mercury_types.h>

#include <mercury_proc_string.h>

#include <margo.h>

}



MERCURY_GEN_PROC(ipc_err_out_t, ((hg_int32_t) (err))) // generic return type



MERCURY_GEN_PROC(ipc_config_in_t, ((hg_int32_t) (dummy))) // XXX remove that.



MERCURY_GEN_PROC(ipc_config_out_t, ((hg_const_string_t) (mountdir))

        ((hg_const_string_t) (rootdir)) \

((hg_bool_t) (atime_state)) \

((hg_bool_t) (mtime_state)) \

((hg_bool_t) (ctime_state)) \

((hg_bool_t) (uid_state)) \

((hg_bool_t) (gid_state)) \

((hg_bool_t) (link_cnt_state)) \

((hg_bool_t) (blocks_state)) \

((hg_uint32_t) (uid)) \

((hg_uint32_t) (gid)) \

((hg_const_string_t) (hosts_raw)) \

((hg_uint64_t) (host_id)) \

((hg_uint64_t) (host_size)))



#endif //IFS_IPC_TYPES_HPP

ifs/include/global/rpc/rpc_types.hpp

+19 −0
Original line number Diff line number Diff line
@@ -100,4 +100,23 @@ MERCURY_GEN_PROC(rpc_get_dirents_out_t, 
        ((hg_size_t) (dirents_size))

)



MERCURY_GEN_PROC(ipc_err_out_t, ((hg_int32_t) (err))) // generic return type



MERCURY_GEN_PROC(ipc_config_in_t, ((hg_int32_t) (dummy))) // XXX remove that.



MERCURY_GEN_PROC(ipc_config_out_t, ((hg_const_string_t) (mountdir))

        ((hg_const_string_t) (rootdir)) \

((hg_bool_t) (atime_state)) \

((hg_bool_t) (mtime_state)) \

((hg_bool_t) (ctime_state)) \

((hg_bool_t) (uid_state)) \

((hg_bool_t) (gid_state)) \

((hg_bool_t) (link_cnt_state)) \

((hg_bool_t) (blocks_state)) \

((hg_uint32_t) (uid)) \

((hg_uint32_t) (gid)) \

((hg_const_string_t) (hosts_raw)) \

((hg_uint64_t) (host_id)) \

((hg_uint64_t) (host_size)))



#endif //LFS_RPC_TYPES_HPP

ifs/include/preload/rpc/ld_rpc_management.hpp

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



#include <preload/preload.hpp>

#include <global/rpc/ipc_types.hpp>

#include <global/rpc/rpc_types.hpp>



using namespace std;

ifs/src/daemon/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ set(DAEMON_HEADERS 
    ../../include/global/configure.hpp

    ../../include/global/global_defs.hpp

    ../../include/global/global_func.hpp

    ../../include/global/rpc/ipc_types.hpp

    ../../include/global/rpc/rpc_types.hpp

    ../../include/global/rpc/rpc_utils.hpp

    ../../include/global/path_util.hpp

ifs/src/daemon/adafs_daemon.cpp

+0 −1
Original line number Diff line number Diff line 


#include <daemon/adafs_daemon.hpp>

#include <global/log_util.hpp>

#include <global/rpc/ipc_types.hpp>

#include <global/rpc/rpc_types.hpp>

#include <global/rpc/rpc_utils.hpp>

#include <global/rpc/distributor.hpp>