Commit 8d3e3622 authored by Ramon Nou's avatar Ramon Nou Committed by Ramon Nou
Browse files

Some basic changes

parent ff90c01e

src/master.cpp

+8 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ master_server::master_server(std::string name, std::string address, 
              [this]() { ftio_scheduling_ult(); }))



{

    m_block_size = block_size;



    const char* REGEX_env = std::getenv(cargo::env::REGEX);

    if(REGEX_env != nullptr) {
@@ -512,6 +513,8 @@ master_server::transfer_datasets(const network::request& req, 


    std::vector<cargo::dataset> v_s_new;

    std::vector<cargo::dataset> v_d_new;

    // We ask for the size of the input files.

    std::vector<ssize_t> v_size_new;



    for(auto i = 0u; i < sources.size(); ++i) {
@@ -568,11 +571,16 @@ master_server::transfer_datasets(const network::request& req, 


                LOGGER_DEBUG("Expanded file {} -> {}", s_new.path(),

                             d_new.path());

                fs->stat(s_new.path(), &buf);

                v_size_new.push_back(buf.st_size);

                v_s_new.push_back(s_new);

                v_d_new.push_back(d_new);

            }



        } else {

            // We do not create any optimization for single files

            fs->stat(s.path(), &buf);

            v_size_new.push_back(buf.st_size);

            v_s_new.push_back(s);

            v_d_new.push_back(d);

        }

src/master.hpp

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ private: 
    std::uint64_t m_ftio_tid = 0;

    // FTIO enabled flag, we need to call ftio once.

    bool m_ftio = false;



    ssize_t m_block_size = 0;



    pending_transfer m_pending_transfer;