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

get rid of all "ipc" leftovers 

Since now there is only one margo instance there is no more difference
between RPC and IPC.

All the "ipc" occurence in the code have been removed in favor of "rpc"
parent e4381611

ifs/include/daemon/classes/rpc_data.hpp

+0 −5
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ private: 


    // Margo IDs. They can also be used to retrieve the Mercury classes and contexts that were created at init time

    margo_instance_id server_rpc_mid_;

    margo_instance_id server_ipc_mid_;



    // Argobots I/O pools and execution streams

    ABT_pool io_pool_;
@@ -35,10 +34,6 @@ public: 


    void server_rpc_mid(margo_instance* server_rpc_mid);



    margo_instance* server_ipc_mid();



    void server_ipc_mid(margo_instance* server_ipc_mid);



    ABT_pool io_pool() const;



    void io_pool(ABT_pool io_pool);

ifs/include/daemon/handler/rpc_defs.hpp

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ extern "C" { 


/* visible API for RPC operations */



DECLARE_MARGO_RPC_HANDLER(ipc_srv_fs_config)

DECLARE_MARGO_RPC_HANDLER(rpc_srv_fs_config)



DECLARE_MARGO_RPC_HANDLER(rpc_srv_mk_node)

ifs/include/global/configure.hpp

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
 * The value is directly mapped to created Argobots xstreams, controlled in a single pool with ABT_snoozer scheduler

 */

#define DAEMON_IO_XSTREAMS 8

// Number of threads used for RPC and IPC handlers at the daemon

// Number of threads used for RPC handlers at the daemon

#define DAEMON_RPC_HANDLER_XSTREAMS 8

#define RPC_PORT 4433

#define RPC_TRIES 3

ifs/include/global/global_defs.hpp

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


// These constexpr set the RPC's identity and which handler the receiver end should use

namespace hg_tag {

    constexpr auto fs_config = "ipc_srv_fs_config";

    constexpr auto fs_config = "rpc_srv_fs_config";

    constexpr auto create = "rpc_srv_mk_node";

    constexpr auto access = "rpc_srv_access";

    constexpr auto stat = "rpc_srv_stat";

ifs/include/global/rpc/rpc_types.hpp

+2 −4
Original line number Diff line number Diff line
@@ -97,11 +97,9 @@ 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(rpc_config_in_t, ((hg_int32_t) (dummy))) // XXX remove that.



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

MERCURY_GEN_PROC(rpc_config_out_t, ((hg_const_string_t) (mountdir))

        ((hg_const_string_t) (rootdir)) \

((hg_bool_t) (atime_state)) \

((hg_bool_t) (mtime_state)) \