Add missing include.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 8b316787b8ae1d8654e0f941337a64c993573f24..76524fddaec59b27d08c71c2d492a9383e1f15f9 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <algorithm>

-#include <tr1/functional>
+#include <cmath>
+#include <functional>

 #include <iterator>
 #include <numeric>
 #include <stdexcept>
 #include <iterator>
 #include <numeric>
 #include <stdexcept>


@@ -11,6 +12,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc);
 
 #include "misc.h"
 #include "options.h"
 
 #include "misc.h"
 #include "options.h"

+#include "tracing.h"

 
 #include "process.h"
 
 
 #include "process.h"
 


@@ -18,11 +20,33 @@ double process::total_load_init = 0.0;
 double process::total_load_running = 0.0;
 double process::total_load_exit = 0.0;
 
 double process::total_load_running = 0.0;
 double process::total_load_exit = 0.0;
 

+int process::process_counter = 0;
+double process::total_load_average;
+
+namespace {
+
+    void sleep_until_date(double& date, double duration)
+    {
+        double sleep_duration = date - MSG_get_clock();
+        if (sleep_duration > 0.0)
+            MSG_process_sleep(sleep_duration);
+        date = MSG_get_clock() + duration;
+    }
+
+}
+

 process::process(int argc, char* argv[])
 {
 process::process(int argc, char* argv[])
 {

-    if (argc < 2 || !(std::istringstream(argv[1]) >> load))
+    if (argc < 2 || !(std::istringstream(argv[1]) >> real_load))

         throw std::invalid_argument("bad or missing initial load parameter");
 
         throw std::invalid_argument("bad or missing initial load parameter");
 

+    double iload = std::trunc(real_load);
+    if (opt::integer_transfer && real_load != iload) {
+        XBT_WARN("Initial load %g is not an integer.  Truncate it.",
+                 real_load);
+        real_load = iload;
+    }
+

     neigh.assign(argv + 2, argv + argc);
 
     pneigh.reserve(neigh.size());
     neigh.assign(argv + 2, argv + argc);
 
     pneigh.reserve(neigh.size());


@@ -33,22 +57,28 @@ process::process(int argc, char* argv[])
         rev_neigh.insert(std::make_pair(host, ptr));
     }
 
         rev_neigh.insert(std::make_pair(host, ptr));
     }
 

-    prev_load_broadcast = -1;   // force sending of load on first send()
-    expected_load = load;
-    total_load_running += load;
-    total_load_init += load;
+    // Note: there should not be race condition with the current
+    // version of Simgrid, when updating the global variables.
+
+    prev_load_broadcast = -1;   // force sending of load on first send_all()
+    expected_load = real_load;
+    total_load_running += real_load;
+    total_load_init += real_load;
+    received_load = 0.0;
+
+    convergence = -1.0;
+
+    process_counter++;
+    total_load_average = total_load_running / process_counter;

 
     ctrl_close_pending = data_close_pending = neigh.size();
 
     ctrl_close_pending = data_close_pending = neigh.size();

-    if (neigh.size() == 1) {
-        comm.next_close_on_ctrl_is_last();
-        comm.next_close_on_data_is_last();
-    }

     close_received = false;
     close_received = false;

-    may_receive =  (neigh.size() > 0); // the same as (ctrl_close_pending ||
-                                       //              data_close_pending)

     finalizing = false;
     finalizing = false;

-    if (may_receive)
-        comm.listen();
+
+    all_comp_iter = comp_iter = lb_iter = 0;
+
+    lb_thread = new_msg_thread("loba",
+                               std::bind(&process::load_balance_loop, this));

 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))
 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))


@@ -59,255 +89,385 @@ process::process(int argc, char* argv[])
         oss << ESSE(neigh.size()) << ": ";
         std::transform(neigh.begin(), neigh.end() - 1,
                        std::ostream_iterator<const char*>(oss, ", "),
         oss << ESSE(neigh.size()) << ": ";
         std::transform(neigh.begin(), neigh.end() - 1,
                        std::ostream_iterator<const char*>(oss, ", "),

-                       std::tr1::mem_fn(&neighbor::get_name));
+                       std::mem_fn(&neighbor::get_name));

         oss << neigh.back().get_name();
     }
         oss << neigh.back().get_name();
     }

-    LOG1(logp, "Got %s.", oss.str().c_str());
+    XBT_LOG(logp, "Got %s.", oss.str().c_str());

     print_loads(false, logp);
 }
 
 process::~process()
 {
     print_loads(false, logp);
 }
 
 process::~process()
 {

-    total_load_exit += load;
+    delete lb_thread;
+    total_load_exit += real_load;
+    xbt_assert(received_load == 0.0,
+               "received_load is %g, but should be 0.0 !", received_load);
+    if (opt::log_rate < 0)
+        return;
+    XBT_INFO("Final load after %d:%d:%d iterations: %g",
+             lb_iter, comp_iter, all_comp_iter, real_load);
+    if (convergence >= 0.0)
+        XBT_INFO("Convergence within %g%% was achieved at time %g",
+                 opt::avg_load_ratio, convergence);
+    else
+        XBT_INFO("Convergence within %g%% was not achieved",
+                 opt::avg_load_ratio);
+    XBT_VERB("Expected load was: %g", expected_load);
+    XBT_VERB("Total computation for this process: %g", get_comp_amount());
+    print_loads(true, xbt_log_priority_debug);

 }
 
 int process::run()
 {
 }
 
 int process::run()
 {

-    INFO1("Initial load: %g", load);
-    VERB0("Starting...");
-    iter = 0;
-    while (true) {
-        if (load > 0.0) {
-            ++iter;
-            if (opt::log_rate && iter % opt::log_rate == 0) {
-                if (opt::bookkeeping)
-                    INFO3("(%u) current load: %g ; expected: %g",
-                          iter, load, expected_load);
-                else
-                    INFO2("(%u) current load: %g",
-                          iter, load);
-            }
+    if (opt::log_rate >= 0) {
+        XBT_INFO("Initial load: %g", real_load);
+        XBT_VERB("Initial expected load: %g", expected_load);
+    }
+    XBT_VERB("Starting...");
+    mutex.acquire();
+    lb_thread->start();
+    while (lb_iter <= opt::comp_iter_delay)
+        cond.wait(mutex);
+    mutex.release();
+    double sleep_duration = opt::comp_time_delay - MSG_get_clock();
+    if (sleep_duration > 0.0)
+        MSG_process_sleep(sleep_duration);
+    compute_loop();
+    lb_thread->wait();
+    XBT_VERB("Done.");
+    return 0;
+}
+
+void process::load_balance_loop()
+{
+    using std::placeholders::_1;
+
+    double next_iter_after_date = MSG_get_clock() + opt::min_lb_iter_duration;
+    while (still_running()) {
+        if (lb_iter == opt::comp_iter_delay) {
+            mutex.acquire();
+            ++lb_iter;
+            cond.signal();
+            mutex.release();
+        } else {
+            ++lb_iter;
+        }

 
 

-            if (opt::bookkeeping)
-                expected_load -= load_balance(expected_load);
-            else
-                load -= load_balance(load);
+        ctrl_receive(0.0);

 
 

-            print_loads(true, xbt_log_priority_debug);
+        mutex.acquire();
+        if (!opt::bookkeeping)
+            expected_load = real_load - get_sum_of_to_send();
+        // nothing to do with opt::bookkeeping

 
 

-            send();
-            compute();
+        if (opt::log_rate && lb_iter % opt::log_rate == 0) {
+            XBT_INFO("(%u:%u:%u) current load: %g",
+                     lb_iter, comp_iter, all_comp_iter, real_load);
+            XBT_VERB("... expected load: %g", expected_load);
+        }
+
+        if (expected_load > 0.0)
+            load_balance();
+
+        print_loads(true, xbt_log_priority_debug);
+
+        // send
+        comm.ctrl_flush(false);
+        std::for_each(neigh.begin(), neigh.end(),
+                      std::bind(&process::ctrl_send, this, _1));
+        prev_load_broadcast = expected_load;
+        mutex.release();
+
+        sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
+    }
+
+    XBT_VERB("Going to finalize for %s...", __func__);
+    XBT_DEBUG("send CTRL_CLOSE to %zu neighbor%s",
+              neigh.size(), ESSE(neigh.size()));
+    std::for_each(neigh.begin(), neigh.end(),
+                  std::bind(&process::ctrl_close, this, _1));
+    while (ctrl_close_pending) {
+        comm.ctrl_flush(false);
+        XBT_DEBUG("waiting for %d CTRL_CLOSE", ctrl_close_pending);
+        ctrl_receive(-1.0);
+    }
+    comm.ctrl_flush(true);
+}

 
 

-            if (opt::maxiter && iter >= opt::maxiter)
-                break;
+void process::compute_loop()
+{
+    using std::placeholders::_1;
+
+    double next_iter_after_date = MSG_get_clock() + opt::min_comp_iter_duration;
+    while (still_running()) {
+        // receive (do not block if there is something to compute)
+        data_receive(real_load > 0.0 ? 0.0 : opt::min_comp_iter_duration);
+
+        // send
+        comm.data_flush(false);
+        mutex.acquire();
+        real_load += received_load;
+        received_load = 0.0;
+        std::for_each(neigh.begin(), neigh.end(),
+                      std::bind(&process::data_send, this, _1));
+        mutex.release();
+
+        ++all_comp_iter;
+        if (real_load == 0.0)
+            continue;
+
+        double load_ratio =
+            100.0 * std::fabs(real_load / total_load_average - 1.0);
+        if (convergence >= 0.0) {
+            if (load_ratio > opt::avg_load_ratio) {
+                XBT_VERB("current load has diverged: %g (%.4g%%)",
+                         real_load, load_ratio);
+                convergence = -1.0;
+            }

         } else {
         } else {

-            // send load information, and load when bookkeeping
-            send();
+            if (load_ratio <= opt::avg_load_ratio) {
+                XBT_VERB("current load has converged: %g (%.4g%%)",
+                         real_load, load_ratio);
+                convergence = MSG_get_clock();
+            }

         }
 
         }
 

-        // block on receiving unless there is something to compute or
-        // to send
-        bool recv_wait = (load == 0 &&
-                          ((opt::bookkeeping ? expected_load : load)
-                           == prev_load_broadcast));
-        DEBUG1("CALL RECEIVE(%s)", recv_wait? "WAIT": "NO_WAIT");
-        receive(recv_wait? WAIT: NO_WAIT);
+        // compute
+        ++comp_iter;
+        double flops = opt::comp_cost(real_load);
+        m_task_t task = MSG_task_create("computation", flops, 0.0, NULL);
+        TRACE_msg_set_task_category(task, TRACE_CAT_COMP);
+        XBT_DEBUG("compute %g flop%s", flops, ESSE(flops));
+        MSG_task_execute(task);
+        add_comp_amount(flops);
+        MSG_task_destroy(task);

 
 

-        // one of our neighbor is finalizing
-        if (opt::exit_on_close && close_received)
-            break;
+        sleep_until_date(next_iter_after_date, opt::min_comp_iter_duration);
+    }

 
 

-        // have no load and cannot receive anything
-        if (load == 0.0 && !may_receive)
-            break;
+    XBT_VERB("Going to finalize for %s...", __func__);
+    finalizing = true;
+    XBT_DEBUG("send DATA_CLOSE to %zu neighbor%s",
+              neigh.size(), ESSE(neigh.size()));
+    std::for_each(neigh.begin(), neigh.end(),
+                  std::bind(&process::data_close, this, _1));
+    while (data_close_pending) {
+        comm.data_flush(false);
+        XBT_DEBUG("waiting for %d DATA_CLOSE", data_close_pending);
+        data_receive(-1.0);
+    }
+    real_load += received_load;
+    received_load = 0.0;
+    total_load_running -= real_load;
+    comm.data_flush(true);
+}

 
 

+bool process::still_running()
+{
+    static bool last_status = true;
+
+    if (!last_status) {
+        /* nop */
+
+    } else if (opt::exit_request) {
+        XBT_VERB("Global exit requested");
+        last_status = false;
+
+    } else if (opt::time_limit && MSG_get_clock() >= opt::time_limit) {
+        XBT_VERB("Reached time limit: %g/%g", MSG_get_clock(), opt::time_limit);
+        last_status = false;
+
+    } else if (opt::lb_maxiter && lb_iter >= opt::lb_maxiter) {
+        XBT_VERB("Reached lb_maxiter: %d/%d", lb_iter, opt::lb_maxiter);
+        last_status = false;
+
+    } else if (opt::comp_maxiter && comp_iter >= opt::comp_maxiter) {
+        XBT_VERB("Reached comp_maxiter: %d/%d", comp_iter, opt::comp_maxiter);
+        last_status = false;
+
+    } else if (opt::exit_on_close && close_received) {
+        XBT_VERB("Close received");
+        last_status = false;
+
+    } else if (real_load == 0.0 && !data_close_pending) {
+        XBT_VERB("I'm a poor lonesome process, and I have no load...");
+        last_status = false;
+
+    } else if (100.0 * total_load_running / total_load_init <=
+               opt::load_ratio_threshold) {

         // fixme: this check should be implemented with a distributed
         // algorithm, and not a shared global variable!
         // fixme: this check should be implemented with a distributed
         // algorithm, and not a shared global variable!

-        if (100.0 * total_load_running / total_load_init <=
-            opt::load_ratio_threshold) {
-            VERB0("No more load to balance in system, stopping.");
-            break;
-        }
-
+        XBT_VERB("No more load to balance in system.");
+        last_status = false;

     }
     }

-    VERB0("Going to finalize...");
-    finalize();
-
-    /* Open Questions :
-     * - definition of load on heterogeneous hosts ?
-     * - how to detect convergence ?
-     * - how to manage link failures ?
-     */
-
-    VERB0("Done.");
-    INFO3("Final load after %d iteration%s: %g", iter, ESSE(iter), load);
-    if (opt::bookkeeping)
-        INFO1("Expected load: %g", expected_load);
-    return 0;
+
+    return last_status;

 }
 
 }
 

-double process::sum_of_to_send() const
+double process::get_sum_of_to_send() const

 {
 {

-    using namespace std::tr1;
-    using namespace std::tr1::placeholders;
+    using std::placeholders::_1;
+    using std::placeholders::_2;

 
     return std::accumulate(neigh.begin(), neigh.end(), 0.0,
 
     return std::accumulate(neigh.begin(), neigh.end(), 0.0,

-                           bind(std::plus<double>(),
-                                _1, bind(&neighbor::get_to_send, _2)));
+                           std::bind(std::plus<double>(), _1,
+                                     std::bind(&neighbor::get_to_send, _2)));

 }
 
 }
 

-double process::load_balance(double /*my_load*/)
+void process::load_balance()

 {
 {

-    if (iter == 1)
-        WARN0("process::load_balance is a no-op!");
-    return 0.0;
+    if (lb_iter == 1)           // warn only once
+        XBT_WARN("process::load_balance() is a no-op!");

 }
 
 }
 

-void process::compute()
+void process::send(neighbor& nb, double amount)

 {
 {

-    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));
-        MSG_task_execute(task);
-        MSG_task_destroy(task);
-    } else {
-        DEBUG0("nothing to compute !");
-    }
+    expected_load -= amount;
+    nb.set_to_send(nb.get_to_send() + amount);
+    nb.set_load(nb.get_load() + amount);

 }
 
 }
 

-void process::send1_no_bookkeeping(neighbor& nb)
+void process::ctrl_send(neighbor& nb)

 {
 {

-    if (load != prev_load_broadcast)
-        comm.send(nb.get_ctrl_mbox(), new message(message::INFO, load));
-    double load_to_send = nb.get_to_send();
-    if (load_to_send > 0.0) {
-        comm.send(nb.get_data_mbox(), new message(message::LOAD, load_to_send));
-        nb.set_to_send(0.0);
+    double info_to_send = expected_load;
+    double debt_to_send;
+    if (opt::bookkeeping) {     // bookkeeping
+        debt_to_send = nb.get_to_send();
+        if (debt_to_send > 0.0) {
+            nb.set_to_send(0.0);
+            nb.set_debt(nb.get_debt() + debt_to_send);
+        }
+    } else {                    // !bookkeeping
+        debt_to_send = 0.0;
+    }
+    if (info_to_send != prev_load_broadcast || debt_to_send > 0.0) {
+        message* msg = new message(message::CTRL, info_to_send, debt_to_send);
+        add_ctrl_send_mesg(msg->get_size());
+        comm.ctrl_send(nb.get_ctrl_mbox(), msg);

     }
 }
 
     }
 }
 

-void process::send1_bookkeeping(neighbor& nb)
+double process::compute_load_to_send(double desired)
+{
+    if (opt::integer_transfer)
+        desired = std::floor(desired);
+    return desired >= opt::min_transfer_amount ? desired : 0.0;
+}
+
+void process::data_send(neighbor& nb)

 {
 {

-    if (expected_load != prev_load_broadcast)
-        comm.send(nb.get_ctrl_mbox(),
-                  new message(message::INFO, expected_load));

     double load_to_send;
     double load_to_send;

-    double new_debt;
-    double debt_to_send = nb.get_to_send();
-    if (debt_to_send > 0.0) {
-        comm.send(nb.get_ctrl_mbox(),
-                  new message(message::CREDIT, debt_to_send));
-        nb.set_to_send(0.0);
-        new_debt = nb.get_debt() + debt_to_send;
-    } else {
-        new_debt = nb.get_debt();
+    if (opt::bookkeeping) {     // bookkeeping
+        double excess_load;     // load amount we are able to send
+        if (opt::egocentric)
+            excess_load = std::max(0.0, real_load - expected_load);
+        else
+            excess_load = real_load;
+
+        double balance = nb.get_debt() - nb.get_credit();
+        load_to_send = std::min(excess_load,
+                                std::max(0.0, balance));
+
+        // adjust load to send (rounding, truncation, etc.)
+        load_to_send = compute_load_to_send(load_to_send);
+        if (load_to_send > 0.0)
+            nb.set_debt(nb.get_debt() - load_to_send);
+    } else {                    // !bookkeeping
+        load_to_send = compute_load_to_send(nb.get_to_send());
+        if (load_to_send > 0.0)
+            nb.set_to_send(nb.get_to_send() - load_to_send);

     }
     }

-    if (load <= new_debt) {
-        load_to_send = load;
-        nb.set_debt(new_debt - load_to_send);
-        load = 0.0;
-    } else {
-        load_to_send = new_debt;
-        nb.set_debt(0.0);
-        load -= load_to_send;
+    real_load -= load_to_send;
+    while (load_to_send > 0.0) {
+        double amount;
+        if (opt::max_transfer_amount)
+            amount = std::min(load_to_send, opt::max_transfer_amount);
+        else
+            amount = load_to_send;
+        message* msg = new message(message::DATA, amount);
+        add_data_send_mesg(msg->get_size());
+        comm.data_send(nb.get_data_mbox(), msg);
+        load_to_send -= amount;

     }
     }

-    if (load_to_send > 0.0)
-        comm.send(nb.get_data_mbox(), new message(message::LOAD, load_to_send));

 }
 
 }
 

-void process::send()
+void process::ctrl_close(neighbor& nb)

 {
 {

-    using namespace std::tr1;
-    using namespace std::tr1::placeholders;
+    comm.ctrl_send(nb.get_ctrl_mbox(), new message(message::CTRL_CLOSE, 0.0));
+}

 
 

-    if (opt::bookkeeping) {
-        std::for_each(neigh.begin(), neigh.end(),
-                      bind(&process::send1_bookkeeping, this, _1));
-        prev_load_broadcast = expected_load;
-    } else {
-        std::for_each(neigh.begin(), neigh.end(),
-                      bind(&process::send1_no_bookkeeping, this, _1));
-        prev_load_broadcast = load;
-    }
+void process::data_close(neighbor& nb)
+{
+    comm.data_send(nb.get_data_mbox(), new message(message::DATA_CLOSE, 0.0));

 }
 
 }
 

-void process::receive(recv_wait_mode wait)
+void process::ctrl_receive(double timeout)

 {
 {

-    // DEBUG1("go for receive(%s)",
-    //        "NO_WAIT\0WAIT\0\0\0\0WAIT_FOR_CLOSE" + 8 * wait);

     message* msg;
     m_host_t from;
     message* msg;
     m_host_t from;

-    bool do_wait = (wait != NO_WAIT);
-    while (may_receive && comm.recv(msg, from, do_wait)) {
-        switch (msg->get_type()) {
-        case message::INFO: {
-            neighbor* n = rev_neigh[from];
-            n->set_load(msg->get_amount());
-            break;
-        }
-        case message::CREDIT:
-            expected_load += msg->get_amount();
-            break;
-        case message::LOAD: {
-            double ld = msg->get_amount();
-            load += ld;
-            if (finalizing)
-                total_load_running -= ld;
-            break;
-        }
-        case message::CTRL_CLOSE:
-            if (--ctrl_close_pending == 1)
-                comm.next_close_on_ctrl_is_last();
-            // DEBUG1("ctrl_close_pending = %d", ctrl_close_pending);
-            close_received = true;
-            break;
-        case message::DATA_CLOSE:
-            if (--data_close_pending == 1)
-                comm.next_close_on_data_is_last();
-            // DEBUG1("data_close_pending = %d", data_close_pending);
-            close_received = true;
-            break;
-        }
-        delete msg;
-        may_receive = (ctrl_close_pending || data_close_pending);
-        do_wait = (wait == WAIT_FOR_CLOSE);
+
+    XBT_DEBUG("%sblocking receive on ctrl (%g)", "\0non-" + !timeout, timeout);
+    while (ctrl_close_pending && comm.ctrl_recv(msg, from, timeout)) {
+        if (msg->get_type() != message::CTRL_CLOSE)
+            add_ctrl_recv_mesg(msg->get_size());
+        handle_message(msg, from);
+        timeout = 0.0;

     }
 }
 
     }
 }
 

-void process::finalize1(neighbor& nb)
+void process::data_receive(double timeout)

 {
 {

-    comm.send(nb.get_ctrl_mbox(), new message(message::CTRL_CLOSE, 0.0));
-    comm.send(nb.get_data_mbox(), new message(message::DATA_CLOSE, 0.0));
+    message* msg;
+    m_host_t from;
+
+    XBT_DEBUG("%sblocking receive on data (%g)", "\0non-" + !timeout, timeout);
+    while (data_close_pending && comm.data_recv(msg, from, timeout)) {
+        if (msg->get_type() != message::DATA_CLOSE)
+            add_data_recv_mesg(msg->get_size());
+        handle_message(msg, from);
+        timeout = 0.0;
+    }

 }
 
 }
 

-void process::finalize()
+void process::handle_message(message* msg, m_host_t from)

 {
 {

-    using namespace std::tr1;
-    using namespace std::tr1::placeholders;
-
-    finalizing = true;
-    total_load_running -= load;
-
-    DEBUG2("send CLOSE to %d neighbor%s.",
-           (int )neigh.size(), ESSE(neigh.size()));
-    std::for_each(neigh.begin(), neigh.end(),
-                  bind(&process::finalize1, this, _1));
-
-    DEBUG2("wait for CLOSE from %d neighbor%s.",
-           (int )neigh.size(), ESSE(neigh.size()));
-    receive(WAIT_FOR_CLOSE);
-
-    comm.flush(true);
+    switch (msg->get_type()) {
+    case message::CTRL: {
+        neighbor* n = rev_neigh[from];
+        n->set_load(msg->get_amount() + n->get_to_send());
+        if (opt::bookkeeping) {
+            double credit = msg->get_credit();
+            expected_load += credit;
+            n->set_credit(n->get_credit() + credit);
+        }
+        break;
+    }
+    case message::DATA: {
+        neighbor* n = rev_neigh[from];
+        double ld = msg->get_amount();
+        received_load += ld;
+        n->set_credit(n->get_credit() - ld);
+        break;
+    }
+    case message::CTRL_CLOSE:
+        ctrl_close_pending--;
+        close_received = true;
+        break;
+    case message::DATA_CLOSE:
+        data_close_pending--;
+        close_received = true;
+        break;
+    }
+    delete msg;

 }
 
 #define print_loads_generic(vec, verbose, logp, cat)                    \
     if (_XBT_LOG_ISENABLEDV((*cat), logp)) {                            \
 }
 
 #define print_loads_generic(vec, verbose, logp, cat)                    \
     if (_XBT_LOG_ISENABLEDV((*cat), logp)) {                            \

-        using namespace std::tr1;                                       \
-        using namespace std::tr1::placeholders;                         \
-        XCLOG0(cat, logp, "Neighbor loads:");                           \
+        using std::placeholders::_1;                                    \
+        XBT_XCLOG(cat, logp, "My load: %g (real); %g (expected).  "     \
+                  "Neighbor loads:", real_load, expected_load);         \

         std::for_each(vec.begin(), vec.end(),                           \
         std::for_each(vec.begin(), vec.end(),                           \

-                      bind(&neighbor::print, _1, verbose, logp, cat));  \
+                      std::bind(&neighbor::print, _1, verbose, logp, cat)); \

     } else ((void)0)
 
 void process::print_loads(bool verbose,
     } else ((void)0)
 
 void process::print_loads(bool verbose,