Verified Commit 113834fe authored by Marc Vef's avatar Marc Vef
Browse files

reformat code

parent 4955e1d2

include/proxy/util.hpp

+4 −2
Original line number Diff line number Diff line
@@ -32,9 +32,11 @@ remove_proxy_pid_file(); 
bool

check_for_hosts_file(const std::string& hostfile);



std::vector<std::pair<std::string, std::string>> read_hosts_file(const std::string& hostfile);

std::vector<std::pair<std::string, std::string>>

read_hosts_file(const std::string& hostfile);



void connect_to_hosts(const std::vector<std::pair<std::string, std::string>>& hosts);

void

connect_to_hosts(const std::vector<std::pair<std::string, std::string>>& hosts);



} // namespace util

} // namespace gkfs

src/client/rpc/forward_data_proxy.cpp

+1 −1
Original line number Diff line number Diff line
@@ -168,4 +168,4 @@ forward_read_proxy(const string& path, void* buf, const off64_t offset, 
    return error ? -1 : out_size;

}



} // namespace gkfs
 
 No newline at end of file
 
} // namespace gkfs::rpc
 
 No newline at end of file

src/client/rpc/rpc_types.cpp

+10 −5
Original line number Diff line number Diff line
@@ -39,11 +39,15 @@ hermes::detail::register_user_request_types(uint32_t provider_id) { 
        (void) registered_requests().add<gkfs::rpc::fs_config>(provider_id);

        (void) registered_requests().add<gkfs::rpc::create>(provider_id);

        (void) registered_requests().add<gkfs::rpc::stat>(provider_id);

        (void) registered_requests().add<gkfs::rpc::remove_metadata>(provider_id);

        (void) registered_requests().add<gkfs::rpc::remove_metadata>(

                provider_id);

        (void) registered_requests().add<gkfs::rpc::decr_size>(provider_id);

        (void) registered_requests().add<gkfs::rpc::update_metadentry>(provider_id);

        (void) registered_requests().add<gkfs::rpc::get_metadentry_size>(provider_id);

        (void) registered_requests().add<gkfs::rpc::update_metadentry_size>(provider_id);

        (void) registered_requests().add<gkfs::rpc::update_metadentry>(

                provider_id);

        (void) registered_requests().add<gkfs::rpc::get_metadentry_size>(

                provider_id);

        (void) registered_requests().add<gkfs::rpc::update_metadentry_size>(

                provider_id);



#ifdef HAS_SYMLINKS

        (void) registered_requests().add<gkfs::rpc::mk_symlink>(provider_id);
@@ -54,7 +58,8 @@ hermes::detail::register_user_request_types(uint32_t provider_id) { 
        (void) registered_requests().add<gkfs::rpc::trunc_data>(provider_id);

        (void) registered_requests().add<gkfs::rpc::get_dirents>(provider_id);

        (void) registered_requests().add<gkfs::rpc::chunk_stat>(provider_id);

        (void) registered_requests().add<gkfs::rpc::get_dirents_extended>(provider_id);

        (void) registered_requests().add<gkfs::rpc::get_dirents_extended>(

                provider_id);

    } else {

        (void) registered_requests().add<gkfs::rpc::write_data_proxy>(

                provider_id);

src/daemon/classes/rpc_data.cpp

+1 −1
Original line number Diff line number Diff line
@@ -94,4 +94,4 @@ RPCData::self_proxy_addr_str(const std::string& proxy_addr_str) { 
    self_proxy_addr_str_ = proxy_addr_str;

}



} // namespace gkfs
 
 No newline at end of file
 
} // namespace gkfs::daemon
 
 No newline at end of file

src/daemon/daemon.cpp

+4 −4
Original line number Diff line number Diff line
@@ -210,8 +210,8 @@ init_proxy_rpc_server() { 
    if(gkfs::rpc::protocol::ofi_psm2 == GKFS_DATA->proxy_rpc_protocol())

        hg_options.na_init_info.progress_mode = NA_NO_BLOCK;

    // Start Margo (this will also initialize Argobots and Mercury internally)

    auto mid = margo_init_opt(GKFS_DATA->bind_proxy_addr().c_str(), MARGO_SERVER_MODE,

                              &hg_options, HG_TRUE,

    auto mid = margo_init_opt(GKFS_DATA->bind_proxy_addr().c_str(),

                              MARGO_SERVER_MODE, &hg_options, HG_TRUE,

                              gkfs::config::rpc::proxy_handler_xstreams);

    if(mid == MARGO_INSTANCE_NULL) {

        throw runtime_error("Failed to initialize the Margo proxy RPC server");