Commit 7b87f504 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

s/network_endpoint/network_service/

parent 8f80746f

src/io/transferors/local-path-to-remote-resource.cpp

+12 −12
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ namespace norns { 
namespace io {



local_path_to_remote_resource_transferor::local_path_to_remote_resource_transferor(

        std::shared_ptr<hermes::async_engine> network_endpoint) :

    m_network_endpoint(network_endpoint) { }

        std::shared_ptr<hermes::async_engine> network_service) :

    m_network_service(network_service) { }



bool 

local_path_to_remote_resource_transferor::validate(
@@ -197,7 +197,7 @@ local_path_to_remote_resource_transferor::transfer( 
    LOGGER_DEBUG("[{}] start_transfer: {} -> {}", 

                 task_info->id(), d_src.canonical_path(), d_dst.to_string());



    hermes::endpoint endp = m_network_endpoint->lookup(d_dst.address());

    hermes::endpoint endp = m_network_service->lookup(d_dst.address());



    try {

        hermes::mapped_buffer input_buffer(input_path.string(),
@@ -214,13 +214,13 @@ local_path_to_remote_resource_transferor::transfer( 
        };



        auto local_buffers = 

            m_network_endpoint->expose(bufvec, hermes::access_mode::read_only);

            m_network_service->expose(bufvec, hermes::access_mode::read_only);



        auto resp = 

            m_network_endpoint->post<rpc::push_resource>(

            m_network_service->post<rpc::push_resource>(

                endp, 

                rpc::push_resource::input{

                    m_network_endpoint->self_address(),

                    m_network_service->self_address(),

                    d_src.parent()->nsid(),

                    d_dst.parent()->nsid(), 

                    // XXX this resource_type should not be needed, but we
@@ -351,7 +351,7 @@ local_path_to_remote_resource_transferor::accept_transfer( 
    };



    hermes::exposed_memory local_buffers =

        m_network_endpoint->expose(bufseq, hermes::access_mode::write_only);

        m_network_service->expose(bufseq, hermes::access_mode::write_only);



    LOGGER_DEBUG("pulling remote data into {}", tempfile->path());
@@ -409,7 +409,7 @@ local_path_to_remote_resource_transferor::accept_transfer( 


respond:

        if(req.requires_response()) {

            m_network_endpoint->respond<rpc::push_resource>(

            m_network_service->respond<rpc::push_resource>(

                    std::move(req), out);

        }

    };
@@ -419,7 +419,7 @@ respond: 
//                        std::chrono::steady_clock::now().time_since_epoch())

//                        .count());



    m_network_endpoint->async_pull(remote_buffers,

    m_network_service->async_pull(remote_buffers,

                                  local_buffers,

                                  std::move(req),

                                  completion_callback);

src/io/transferors/local-path-to-remote-resource.hpp

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ namespace io { 
struct local_path_to_remote_resource_transferor : public transferor {



    local_path_to_remote_resource_transferor(

            std::shared_ptr<hermes::async_engine> network_endpoint);

            std::shared_ptr<hermes::async_engine> network_service);



    bool 

    validate(const std::shared_ptr<data::resource_info>& src_info,
@@ -81,7 +81,7 @@ struct local_path_to_remote_resource_transferor : public transferor { 
    to_string() const override final;



private:

    std::shared_ptr<hermes::async_engine> m_network_endpoint;

    std::shared_ptr<hermes::async_engine> m_network_service;



};

src/io/transferors/memory-to-remote-resource.cpp

+6 −6
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ namespace io { 


memory_region_to_remote_resource_transferor::

    memory_region_to_remote_resource_transferor(

        std::shared_ptr<hermes::async_engine> network_endpoint) :

    m_network_endpoint(network_endpoint) {}

        std::shared_ptr<hermes::async_engine> network_service) :

    m_network_service(network_service) {}



bool 

memory_region_to_remote_resource_transferor::validate(
@@ -175,14 +175,14 @@ memory_region_to_remote_resource_transferor::transfer( 


    try {



        hermes::endpoint endp = m_network_endpoint->lookup(d_dst.address());

        hermes::endpoint endp = m_network_service->lookup(d_dst.address());



        std::vector<hermes::mutable_buffer> bufvec{

            hermes::mutable_buffer{output_buffer->data(), output_buffer->size()}

        };



        auto local_buffers = 

            m_network_endpoint->expose(bufvec, hermes::access_mode::read_only);

            m_network_service->expose(bufvec, hermes::access_mode::read_only);



//        LOGGER_CRITICAL("push_resource RPC posted: {}",

//                        std::chrono::duration_cast<std::chrono::nanoseconds>(
@@ -190,10 +190,10 @@ memory_region_to_remote_resource_transferor::transfer( 
//                            .count());



        auto resp = 

            m_network_endpoint->post<rpc::push_resource>(

            m_network_service->post<rpc::push_resource>(

                endp, 

                rpc::push_resource::input{

                    m_network_endpoint->self_address(),

                    m_network_service->self_address(),

                    d_src.parent()->nsid(),

                    d_dst.parent()->nsid(), 

                    // XXX this resource_type should not be needed, but we

src/io/transferors/memory-to-remote-resource.hpp

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ namespace io { 
struct memory_region_to_remote_resource_transferor : public transferor {



    memory_region_to_remote_resource_transferor(

            std::shared_ptr<hermes::async_engine> network_endpoint);

            std::shared_ptr<hermes::async_engine> network_service);



    bool 

    validate(const std::shared_ptr<data::resource_info>& src_info,
@@ -74,7 +74,7 @@ struct memory_region_to_remote_resource_transferor : public transferor { 
    to_string() const override final;



private:

    std::shared_ptr<hermes::async_engine> m_network_endpoint;

    std::shared_ptr<hermes::async_engine> m_network_service;

};



} // namespace io

src/io/transferors/remote-resource-to-local-path.cpp

+14 −14
Original line number Diff line number Diff line
@@ -121,8 +121,8 @@ namespace norns { 
namespace io {



remote_resource_to_local_path_transferor::remote_resource_to_local_path_transferor(

        std::shared_ptr<hermes::async_engine> network_endpoint) :

    m_network_endpoint(network_endpoint) { }

        std::shared_ptr<hermes::async_engine> network_service) :

    m_network_service(network_service) { }



bool

remote_resource_to_local_path_transferor::validate(
@@ -155,13 +155,13 @@ remote_resource_to_local_path_transferor::transfer( 
    LOGGER_DEBUG("[{}] request_transfer: {} -> {}", 

                 task_info->id(), d_src.to_string(), d_dst.canonical_path());



    hermes::endpoint endp = m_network_endpoint->lookup(d_src.address());

    hermes::endpoint endp = m_network_service->lookup(d_src.address());



    auto resp = 

        m_network_endpoint->post<rpc::stat_resource>(

        m_network_service->post<rpc::stat_resource>(

            endp, 

            rpc::stat_resource::input{

                m_network_endpoint->self_address(),

                m_network_service->self_address(),

                d_src.parent()->nsid(),

                static_cast<uint32_t>(data::resource_type::local_posix_path), 

                d_src.name()
@@ -216,10 +216,10 @@ remote_resource_to_local_path_transferor::transfer( 
    };



    hermes::exposed_memory local_buffers =

        m_network_endpoint->expose(bufseq, hermes::access_mode::write_only);

        m_network_service->expose(bufseq, hermes::access_mode::write_only);



    auto resp2 = 

        m_network_endpoint->post<rpc::pull_resource>(

        m_network_service->post<rpc::pull_resource>(

            endp,

            rpc::pull_resource::input{

                d_src.parent()->nsid(),
@@ -231,7 +231,7 @@ remote_resource_to_local_path_transferor::transfer( 
                // XXX this information locally from the resource id

                static_cast<uint32_t>(

                    data::resource_type::local_posix_path),

                m_network_endpoint->self_address(), 

                m_network_service->self_address(), 

                d_dst.parent()->nsid(),

                d_dst.name(), 

                local_buffers
@@ -339,7 +339,7 @@ remote_resource_to_local_path_transferor::accept_transfer( 
    };



    auto local_buffers = 

        m_network_endpoint->expose(bufvec, hermes::access_mode::read_only);

        m_network_service->expose(bufvec, hermes::access_mode::read_only);



    // retrieve remote buffers descriptor

    hermes::exposed_memory remote_buffers = d_dst.buffers();
@@ -376,13 +376,13 @@ remote_resource_to_local_path_transferor::accept_transfer( 
        LOGGER_DEBUG("Push completed");



        if(req.requires_response()) {

            m_network_endpoint->respond<rpc::pull_resource>(

            m_network_service->respond<rpc::pull_resource>(

                    std::move(req), 

                    out);

        }

    };



    m_network_endpoint->async_push(local_buffers, 

    m_network_service->async_push(local_buffers, 

                                  remote_buffers, 

                                  std::move(req),

                                  completion_callback);