X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/9ec598fc7b8d73ed8e9822aed084ad1e1b2918b6..f2c30ea366a1f0ef91e94000f89b16a763c0dccd:/process.cpp diff --git a/process.cpp b/process.cpp index 0afbf29..d3d9226 100644 --- a/process.cpp +++ b/process.cpp @@ -33,6 +33,8 @@ process::process(int argc, char* argv[]) rev_neigh.insert(std::make_pair(host, ptr)); } + comp = 0.0; + prev_load_broadcast = -1; // force sending of load on first send() expected_load = load; total_load_running += load; @@ -80,39 +82,40 @@ int process::run() next_iter_after_date = MSG_get_clock() + opt::min_iter_duration; } - if (load > 0.0) { - ++comp_iter; - if (opt::log_rate && comp_iter % opt::log_rate == 0) { + double ld = lb_load(); + if (ld > 0.0) { + ++lb_iter; + + if (opt::log_rate && lb_iter % opt::log_rate == 0) { if (opt::bookkeeping) INFO4("(%u:%u) current load: %g ; expected: %g", - comp_iter, lb_iter, load, expected_load); + lb_iter, comp_iter, load, expected_load); else INFO2("(%u) current load: %g", - comp_iter, load); + lb_iter, load); } - double ld = lb_load(); ld -= load_balance(ld); - lb_load() = ld; print_loads(true, xbt_log_priority_debug); + } + lb_load() = ld; - send(); + // send load information, and load (data) if any + send(); + if (load > 0.0) { + ++comp_iter; compute(); - - } else { - // send load information, and load when bookkeeping - send(); } - if (opt::comp_maxiter && comp_iter >= opt::comp_maxiter) { - VERB2("Reached comp_maxiter: %d/%d", comp_iter, opt::comp_maxiter); - break; - } if (opt::lb_maxiter && lb_iter >= opt::lb_maxiter) { VERB2("Reached lb_maxiter: %d/%d", lb_iter, opt::lb_maxiter); break; } + if (opt::comp_maxiter && comp_iter >= opt::comp_maxiter) { + VERB2("Reached comp_maxiter: %d/%d", comp_iter, opt::comp_maxiter); + break; + } if (opt::time_limit && MSG_get_clock() >= opt::time_limit) { VERB2("Reached time limit: %g/%g", MSG_get_clock(), opt::time_limit); break; @@ -156,13 +159,13 @@ int process::run() VERB0("Done."); if (opt::bookkeeping) { INFO4("Final load after %d:%d iterations: %g ; expected: %g", - comp_iter, lb_iter, load, expected_load); + lb_iter, comp_iter, load, expected_load); } else { INFO2("Final load after %d iterations: %g", - comp_iter, load); - if (comp_iter != lb_iter) - WARN2("comp_iter (%d) and lb_iter (%d) differ!", - comp_iter, lb_iter); + lb_iter, load); + if (lb_iter != comp_iter) + WARN2("lb_iter (%d) and comp_iter (%d) differ!", + lb_iter, comp_iter); } return 0; } @@ -188,10 +191,11 @@ double process::load_balance(double /*my_load*/) void process::compute() { if (load > 0.0) { - double duration = opt::comp_cost(load); - m_task_t task = MSG_task_create("computation", duration, 0.0, NULL); - DEBUG2("compute %g flop%s", duration, ESSE(duration)); + double flops = opt::comp_cost(load); + m_task_t task = MSG_task_create("computation", flops, 0.0, NULL); + DEBUG2("compute %g flop%s", flops, ESSE(flops)); MSG_task_execute(task); + comp += flops; MSG_task_destroy(task); } else { DEBUG0("nothing to compute !");