Factorize computation of load_to_send.

[loba.git] / process.h

diff --git a/process.h b/process.h
index 38a6c42d8e24b9cf3621a9bf299ca98dbe4dd4f4..8a9e74c3d63da11bd185dfc525b567cf694e6b61 100644 (file)
--- a/process.h
+++ b/process.h
@@ -5,10 +5,10 @@
 //#undef USE_UNORDERED_MAP
 
 #include <algorithm>
 //#undef USE_UNORDERED_MAP
 
 #include <algorithm>

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

 #ifdef USE_UNORDERED_MAP
 #ifdef USE_UNORDERED_MAP

-#  include <tr1/unordered_map>
-#  define MAP_TEMPLATE std::tr1::unordered_map
+#  include <unordered_map>
+#  define MAP_TEMPLATE std::unordered_map

 #else
 #  include <map>
 #  define MAP_TEMPLATE std::map
 #else
 #  include <map>
 #  define MAP_TEMPLATE std::map


@@ -18,8 +18,10 @@
 #include <xbt/log.h>
 #include "communicator.h"
 #include "misc.h"
 #include <xbt/log.h>
 #include "communicator.h"
 #include "misc.h"

+#include "msg_thread.h"

 #include "neighbor.h"
 #include "options.h"
 #include "neighbor.h"
 #include "options.h"

+#include "synchro.h"

 
 class process {
 public:
 
 class process {
 public:


@@ -30,8 +32,16 @@ public:
     process(int argc, char* argv[]);
     virtual ~process();
 
     process(int argc, char* argv[]);
     virtual ~process();
 

-    double get_comp() const                { return comp; }
-    double get_real_load() const           { return real_load; }
+    double get_real_load() const           { return real_load;            }
+    double get_comp_amount() const         { return acc.comp_amount;      }
+    double get_data_send_amount() const    { return acc.data_send.amount; }
+    double get_data_recv_amount() const    { return acc.data_recv.amount; }
+    unsigned get_data_send_count() const   { return acc.data_send.count;  }
+    unsigned get_data_recv_count() const   { return acc.data_recv.count;  }
+    double get_ctrl_send_amount() const    { return acc.ctrl_send.amount; }
+    double get_ctrl_recv_amount() const    { return acc.ctrl_recv.amount; }
+    unsigned get_ctrl_send_count() const   { return acc.ctrl_send.count;  }
+    unsigned get_ctrl_recv_count() const   { return acc.ctrl_recv.count;  }

 
     int run();
 
 
     int run();
 


@@ -42,18 +52,21 @@ protected:
     pneigh_type pneigh;         // list of pointers to neighbors that
                                 // we are free to reorder
 
     pneigh_type pneigh;         // list of pointers to neighbors that
                                 // we are free to reorder
 

-    template <typename Compare>
-    void pneigh_sort_by_load(const Compare& comp);
-

     // Get and set current load, which may be real load, or expected
     // load if opt::bookkeeping is true.
     // Get and set current load, which may be real load, or expected
     // load if opt::bookkeeping is true.

-    double get_load() const;
-    void set_load(double load);
+    double get_load() const                { return expected_load; }
+
+    // The load balancing algorithm comes here...
+    virtual void load_balance();

 
     // Register some amount of load to send to given neighbor.
     void send(neighbor& nb, double amount);
     void send(neighbor* nb, double amount) { send(*nb, amount); }
 
 
     // Register some amount of load to send to given neighbor.
     void send(neighbor& nb, double amount);
     void send(neighbor* nb, double amount) { send(*nb, amount); }
 

+    // Sort pneigh by applying comp to their loads
+    template <typename Compare>
+    void pneigh_sort_by_load(const Compare& comp);
+

     // Calls neighbor::print(verbose, logp, cat) for each member of neigh.
     void print_loads(bool verbose = false,
                      e_xbt_log_priority_t logp = xbt_log_priority_info,
     // Calls neighbor::print(verbose, logp, cat) for each member of neigh.
     void print_loads(bool verbose = false,
                      e_xbt_log_priority_t logp = xbt_log_priority_info,


@@ -85,68 +98,87 @@ private:
     unsigned lb_iter;           // counter of load-balancing iterations
     unsigned comp_iter;         // counter of computation iterations
 
     unsigned lb_iter;           // counter of load-balancing iterations
     unsigned comp_iter;         // counter of computation iterations
 

-    double comp;                // total computing done so far (flops)
-

     double prev_load_broadcast; // used to ensure that we do not send
                                 // a same information messages
     double real_load;           // current load
     double expected_load;       // expected load in bookkeeping mode
     double prev_load_broadcast; // used to ensure that we do not send
                                 // a same information messages
     double real_load;           // current load
     double expected_load;       // expected load in bookkeeping mode

+    double received_load;       // load received from neighbors
+
+    mutex_t mutex;              // synchronization between threads
+    condition_t cond;
+
+    struct mesg_accounting {
+        double amount;          // sum of message size
+        unsigned count;         // number of messages
+        mesg_accounting(): amount(0.0), count(0) { }
+    };
+    struct accounting {
+        double comp_amount;        // total computing done so far (flops)
+        mesg_accounting data_send; // data messages sent
+        mesg_accounting data_recv; // data messages received
+        mesg_accounting ctrl_send; // ctrl message sent
+        mesg_accounting ctrl_recv; // ctrl message received
+        accounting(): comp_amount(0.0) { }
+    };
+    accounting acc;
+
+    void add_comp_amount(double amount) { acc.comp_amount += amount; }
+    void add_data_send_mesg(double amount) {
+        ++acc.data_send.count;
+        acc.data_send.amount += amount;
+    }
+    void add_data_recv_mesg(double amount) {
+        ++acc.data_recv.count;
+        acc.data_recv.amount += amount;
+    }
+    void add_ctrl_send_mesg(double amount) {
+        ++acc.ctrl_send.count;
+        acc.ctrl_send.amount += amount;
+    }
+    void add_ctrl_recv_mesg(double amount) {
+        ++acc.ctrl_recv.count;
+        acc.ctrl_recv.amount += amount;
+    }

 
 

-    // The load balancing algorithm comes here...
-    virtual void load_balance();
+    // Load-balancing loop
+    msg_thread* lb_thread;
+    void load_balance_loop();

 
 

-    // Virtually do some computation
-    void compute();
+    // Simulate computation loop
+    void compute_loop();

 
 

-    // Send procedures, with helpers for bookkeeping mode or not
-    void send1_no_bookkeeping(neighbor& nb);
-    void send1_bookkeeping(neighbor& nb);
-    void send_all();
+    // Check if we need to stop
+    bool still_running();

 
 

-    // Returns true if there remains neighbors to listen for
-    bool may_receive() const {
-        return ctrl_close_pending || data_close_pending;
-    }
+    // Returns the sum of "to_send" for all neighbors.
+    double get_sum_of_to_send() const;
+
+    // Compute load_to_send (for data_send), subject to the execution parameters
+    static double compute_load_to_send(double desired);
+
+    // Send procedures
+    void ctrl_send(neighbor& nb);
+    void data_send(neighbor& nb);
+    void ctrl_close(neighbor& nb);
+    void data_close(neighbor& nb);

 
     // Receive procedure
     // Parameter "timeout" may be 0 for non-blocking operation, -1 for
     // infinite waiting, or any positive timeout.
 
     // Receive procedure
     // Parameter "timeout" may be 0 for non-blocking operation, -1 for
     // infinite waiting, or any positive timeout.

-    void receive(double timeout);
-
-    // Finalize sends a "close" message to each neighbor and wait for
-    // all of them to answer.
-    void finalize1(neighbor& nb);
-    void finalize();
+    void ctrl_receive(double timeout);
+    void data_receive(double timeout);
+    void handle_message(message* msg, m_host_t from);

 };
 
 };
 

-inline
-double process::get_load() const
-{
-    if (opt::bookkeeping)
-        return expected_load;
-    else
-        return real_load;
-}
-
-inline
-void process::set_load(double load)
-{
-    if (opt::bookkeeping)
-        expected_load = load;
-    else
-        real_load = load;
-}
-

 template <typename Compare>
 void process::pneigh_sort_by_load(const Compare& comp)
 {
 template <typename Compare>
 void process::pneigh_sort_by_load(const Compare& comp)
 {

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

     std::sort(pneigh.begin(), pneigh.end(),
     std::sort(pneigh.begin(), pneigh.end(),

-              bind(comp,
-                   bind(&neighbor::get_load, _1),
-                   bind(&neighbor::get_load, _2)));
+              std::bind(comp,
+                        std::bind(&neighbor::get_load, _1),
+                        std::bind(&neighbor::get_load, _2)));

 }
 
 #endif // !PROCESS_H
 }
 
 #endif // !PROCESS_H