Verified Commit 28e1ece9 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Rename `request` class to `parallel_request`

parent b5aa7e42

src/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ target_sources( 
          worker/worker.hpp

          env.hpp

          mpioxx.hpp

          request.cpp

          request.hpp

          parallel_request.cpp

          parallel_request.hpp

          request_manager.cpp

          request_manager.hpp

          shared_mutex.hpp

src/master.cpp

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include "net/request.hpp"

#include "proto/rpc/response.hpp"

#include "proto/mpi/message.hpp"

#include "request.hpp"

#include "parallel_request.hpp"



using namespace std::literals;

namespace mpi = boost::mpi;

src/request.cpp→src/parallel_request.cpp

+11 −5
Original line number Diff line number Diff line
@@ -23,20 +23,26 @@ 
 *****************************************************************************/



#include "cargo.hpp"

#include "request.hpp"

#include "parallel_request.hpp"



namespace cargo {



request::request(std::uint64_t tid, std::size_t nworkers)

    : m_tid(tid), m_nworkers(nworkers) {}

parallel_request::parallel_request(std::uint64_t tid, std::size_t nfiles,

                                   std::size_t nworkers)

    : m_tid(tid), m_nfiles(nfiles), m_nworkers(nworkers) {}



[[nodiscard]] std::uint64_t

request::tid() const {

parallel_request::tid() const {

    return m_tid;

}



[[nodiscard]] std::size_t

request::nworkers() const {

parallel_request::nfiles() const {

    return m_nfiles;

}



[[nodiscard]] std::size_t

parallel_request::nworkers() const {

    return m_nworkers;

}

src/request.hpp→src/parallel_request.hpp

+11 −5
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
 * SPDX-License-Identifier: GPL-3.0-or-later

 *****************************************************************************/



#ifndef CARGO_REQUEST_HPP

#define CARGO_REQUEST_HPP

#ifndef CARGO_PARALLEL_REQUEST_HPP

#define CARGO_PARALLEL_REQUEST_HPP



#include <cstdint>

#include <vector>
@@ -32,20 +32,26 @@ namespace cargo { 


class dataset;



class request {

class parallel_request {



public:

    request(std::uint64_t id, std::size_t nworkers);

    parallel_request(std::uint64_t id, std::size_t nfiles,

                     std::size_t nworkers);



    [[nodiscard]] std::uint64_t

    tid() const;



    [[nodiscard]] std::size_t

    nfiles() const;



    [[nodiscard]] std::size_t

    nworkers() const;



private:

    /** Unique identifier for the request */

    std::uint64_t m_tid;

    /** Number of files to be processed by the request */

    std::size_t m_nfiles;

    /** Number of workers to be used for the request */

    std::size_t m_nworkers;

};
@@ -55,4 +61,4 @@ enum class request_status { pending, running, completed, failed }; 


} // namespace cargo



#endif // CARGO_REQUEST_HPP
 
#endif // CARGO_PARALLEL_REQUEST_HPP

src/request_manager.cpp

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#include "cargo.hpp"

#include "cargo/error.hpp"

#include "request.hpp"

#include "parallel_request.hpp"

#include "request_manager.hpp"



#include <utility>
@@ -34,7 +34,7 @@ namespace {} // namespace 


namespace cargo {



tl::expected<request, error_code>

tl::expected<parallel_request, error_code>

request_manager::create(std::size_t nfiles, std::size_t nworkers) {



    std::uint64_t tid = current_tid++;
@@ -53,7 +53,7 @@ request_manager::create(std::size_t nfiles, std::size_t nworkers) { 
        }

    }



    return request{tid, nworkers};

    return parallel_request{tid, nfiles, nworkers};

}



tl::expected<void, error_code>