Commit e16f4804 authored by Ramon Nou's avatar Ramon Nou
Browse files

added -T parameter to cargo_ftio

parent 2ecc30b8

cli/ftio.cpp

+6 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ struct ftio_config { 
    float confidence;

    float probability;

    float period;

    int mtime;

    bool run{false};

    bool pause{false};

    bool resume{false};
@@ -65,6 +66,10 @@ parse_command_line(int argc, char* argv[]) { 
            ->option_text("float")

            ->default_val("-1.0");



    app.add_option("-T,--mtime", cfg.mtime, "mtime")

    ->option_text("int")

    ->default_val("1");



    app.add_flag(

            "--run", cfg.run,

            "Trigger stage operation to run now. Has no effect when period is set > 0");
@@ -108,7 +113,7 @@ main(int argc, char* argv[]) { 
            const auto& endpoint = result.value();

            const auto retval =

                    endpoint.call("ftio_int", cfg.confidence, cfg.probability,

                                  cfg.period, cfg.run, cfg.pause, cfg.resume);

                                  cfg.period, cfg.run, cfg.pause, cfg.resume, cfg.mtime);



            if(retval.has_value()) {

src/master.cpp

+4 −3
Original line number Diff line number Diff line
@@ -751,12 +751,13 @@ master_server::transfer_statuses(const network::request& req, 


void

master_server::ftio_int(const network::request& req, float conf, float prob,

                        float period, bool run, bool pause, bool resume) {

                        float period, bool run, bool pause, bool resume, int mtime) {

    using network::get_address;

    using network::rpc_info;

    using proto::generic_response;

    mpi::communicator world;

    const auto rpc = rpc_info::create(RPC_NAME(), get_address(req));

    m_mtime_threshold = mtime;

    if(pause) {

        // send shaping info

        for(int rank = 1; rank < world.size(); ++rank) {
@@ -784,8 +785,8 @@ master_server::ftio_int(const network::request& req, float conf, float prob, 
        m_ftio = true;

    }

    LOGGER_INFO(

            "rpc {:>} body: {{confidence: {}, probability: {}, period: {}, run: {}, pause: {}, resume: {}}}",

            rpc, conf, prob, period, run, pause, resume);

            "rpc {:>} body: {{confidence: {}, probability: {}, period: {}, run: {}, pause: {}, resume: {}, mtime: {}}}",

            rpc, conf, prob, period, run, pause, resume, mtime);



    const auto resp = generic_response{rpc.id(), error_code::success};

src/master.hpp

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ private: 


    void

    ftio_int(const network::request& req, float confidence, float probability,

             float period, bool run, bool pause, bool resume);

             float period, bool run, bool pause, bool resume, int mtime);



private:

    // Dedicated execution stream for the MPI listener ULT