A
lgorithmique
N
umérique
D
istribuée
Private GIT Repository
projects
/
loba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Typo.
[loba.git]
/
process.cpp
diff --git
a/process.cpp
b/process.cpp
index eeb5d8c0052ba166f56a20512053e6d4c62c88db..f997d99efc7c1127520e535e7e75e61ea1bd14d0 100644
(file)
--- a/
process.cpp
+++ b/
process.cpp
@@
-82,22
+82,22
@@
process::~process()
{
delete compute_thread;
total_load_exit += real_load;
+ if (opt::log_rate < 0)
+ return;
if (opt::bookkeeping) {
XBT_INFO("Final load after %d:%d iterations: %g ; expected: %g",
lb_iter, comp_iter, real_load, expected_load);
} else {
- XBT_INFO("Final load after %d iterations: %g",
- lb_iter, real_load);
- if (lb_iter != comp_iter)
- XBT_WARN("lb_iter (%d) and comp_iter (%d) differ!",
- lb_iter, comp_iter);
+ XBT_INFO("Final load after %d:%d iterations: %g",
+ lb_iter, comp_iter, real_load);
}
XBT_VERB("Total computation for this process: %g", comp);
}
int process::run()
{
- XBT_INFO("Initial load: %g", real_load);
+ if (opt::log_rate >= 0)
+ XBT_INFO("Initial load: %g", real_load);
XBT_VERB("Starting...");
compute_thread->start();
load_balance_loop();
@@
-132,6
+132,7
@@
void process::load_balance_loop()
// send
std::for_each(neigh.begin(), neigh.end(),
bind(&process::ctrl_send, this, _1));
+ prev_load_broadcast = get_load();
sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
ctrl_receive(0.0);
@@
-188,6
+189,11
@@
void process::compute_loop()
}
XBT_VERB("Going to finalize for %s...", __func__);
+ // last send, for not losing load scheduled to be sent
+ std::for_each(neigh.begin(), neigh.end(),
+ bind(&process::data_send, this, _1));
+ finalizing = true;
+ total_load_running -= real_load;
XBT_DEBUG("send DATA_CLOSE to %zu neighbor%s",
neigh.size(), ESSE(neigh.size()));
std::for_each(neigh.begin(), neigh.end(),
@@
-231,7
+237,6
@@
bool process::still_running()
opt::load_ratio_threshold) {
// fixme: this check should be implemented with a distributed
// algorithm, and not a shared global variable!
- // fixme: should this chunk be moved before call to receive() ?
XBT_VERB("No more load to balance in system.");
last_status = false;
}
@@
-310,6
+315,7
@@
void process::data_send(neighbor& nb)
} else {
load_to_send = nb.get_to_send();
nb.set_to_send(0.0);
+ // do not update real_load here
}
if (load_to_send > 0.0)
comm.data_send(nb.get_data_mbox(),