X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/d79c6aa768cb68806408632c832e5e1330e451a6..2e70ca1b25f409c6755cd7c4b4709aacd60afdf6:/process.h?ds=inline diff --git a/process.h b/process.h index ceca948..9ea0521 100644 --- a/process.h +++ b/process.h @@ -5,10 +5,10 @@ //#undef USE_UNORDERED_MAP #include <algorithm> -#include <tr1/functional> +#include <functional> #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 @@ -21,6 +21,7 @@ #include "msg_thread.h" #include "neighbor.h" #include "options.h" +#include "synchro.h" class process { public: @@ -31,8 +32,18 @@ public: 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; } + unsigned get_comp_iter() const { return comp_iter; } + unsigned get_all_comp_iter() const { return all_comp_iter; } + 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(); @@ -45,8 +56,7 @@ protected: // 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(); @@ -89,13 +99,52 @@ private: unsigned lb_iter; // counter of load-balancing iterations unsigned comp_iter; // counter of computation iterations - - double comp; // total computing done so far (flops) + unsigned all_comp_iter; // counter of computation iterations + // (counting empty iterations too) 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; // use a structure so that it is + // automatically initialized a + // construction + + 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; + } // Load-balancing loop msg_thread* lb_thread; @@ -104,8 +153,15 @@ private: // Simulate computation loop void compute_loop(); + // Check if we need to stop bool still_running(); + // 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); @@ -120,34 +176,15 @@ private: 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) { - 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(), - 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