X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/bc691c290cd062a5c929b94d32b92f18ef5d235b..ea9e469b934dd81706ec3f727156b9057e4cf2bb:/process.cpp diff --git a/process.cpp b/process.cpp index 0f53576..a0447de 100644 --- a/process.cpp +++ b/process.cpp @@ -11,6 +11,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc); #include "misc.h" #include "options.h" +#include "tracing.h" #include "process.h" @@ -35,7 +36,7 @@ process::process(int argc, char* argv[]) comp = 0.0; - prev_load_broadcast = -1; // force sending of load on first send() + prev_load_broadcast = -1; // force sending of load on first send_all() expected_load = load; total_load_running += load; total_load_init += load; @@ -63,6 +64,17 @@ process::process(int argc, char* argv[]) process::~process() { total_load_exit += load; + if (opt::bookkeeping) { + INFO4("Final load after %d:%d iterations: %g ; expected: %g", + lb_iter, comp_iter, load, expected_load); + } else { + INFO2("Final load after %d iterations: %g", + lb_iter, load); + if (lb_iter != comp_iter) + WARN2("lb_iter (%d) and comp_iter (%d) differ!", + lb_iter, comp_iter); + } + VERB1("Total computation for this process: %g", comp); } int process::run() @@ -72,18 +84,13 @@ int process::run() VERB0("Starting..."); comp_iter = lb_iter = 0; while (true) { - if (opt::min_iter_duration) { + double ld = lb_load(); + if (ld > 0.0) { double now = MSG_get_clock(); - if (now < next_iter_after_date){ - double delay = next_iter_after_date - now; - DEBUG1("sleeping for %g s", delay); - MSG_process_sleep(delay); - } + if (now < next_iter_after_date) + MSG_process_sleep(next_iter_after_date - now); next_iter_after_date = MSG_get_clock() + opt::min_iter_duration; - } - double ld = lb_load(); - if (ld > 0.0) { ++lb_iter; if (opt::log_rate && lb_iter % opt::log_rate == 0) { @@ -102,7 +109,7 @@ int process::run() lb_load() = ld; // send load information, and load (data) if any - send(); + send_all(); if (load > 0.0) { ++comp_iter; compute(); @@ -165,16 +172,6 @@ int process::run() */ VERB0("Done."); - if (opt::bookkeeping) { - INFO4("Final load after %d:%d iterations: %g ; expected: %g", - lb_iter, comp_iter, load, expected_load); - } else { - INFO2("Final load after %d iterations: %g", - lb_iter, load); - if (lb_iter != comp_iter) - WARN2("lb_iter (%d) and comp_iter (%d) differ!", - lb_iter, comp_iter); - } return 0; } @@ -201,6 +198,7 @@ void process::compute() if (load > 0.0) { double flops = opt::comp_cost(load); m_task_t task = MSG_task_create("computation", flops, 0.0, NULL); + TRACE_msg_set_task_category(task, TRACE_CAT_COMP); DEBUG2("compute %g flop%s", flops, ESSE(flops)); MSG_task_execute(task); comp += flops; @@ -250,7 +248,7 @@ void process::send1_bookkeeping(neighbor& nb) comm.send(nb.get_data_mbox(), new message(message::LOAD, load_to_send)); } -void process::send() +void process::send_all() { using std::tr1::bind; using std::tr1::placeholders::_1;