X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/af35c0c75c52b0cf5d0518656473503f67a79613..10e5dbdfc7cf72a000a90a2f1a27c7dc30364761:/process.h?ds=sidebyside diff --git a/process.h b/process.h index 152f5ed..4686af4 100644 --- a/process.h +++ b/process.h @@ -4,20 +4,24 @@ #define USE_UNORDERED_MAP 1 //#undef USE_UNORDERED_MAP -#include +#include +#include #ifdef USE_UNORDERED_MAP -# include -# define MAP_TEMPLATE std::tr1::unordered_map +# include +# define MAP_TEMPLATE std::unordered_map #else # include # define MAP_TEMPLATE std::map #endif +#include #include #include #include "communicator.h" #include "misc.h" +#include "msg_thread.h" #include "neighbor.h" #include "options.h" +#include "synchro.h" class process { public: @@ -28,8 +32,16 @@ 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; } + 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(); @@ -42,13 +54,19 @@ 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(); // 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 + 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, @@ -80,72 +98,85 @@ private: 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 - // The load balancing algorithm comes here... - virtual void load_balance(); + 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; + } - // Virtually do some computation - void compute(); + // Load-balancing loop + msg_thread* lb_thread; + void load_balance_loop(); - // Send procedures, with helpers for bookkeeping mode or not - void send1_no_bookkeeping(neighbor& nb); - void send1_bookkeeping(neighbor& nb); - void send_all(); + // Simulate computation loop + void compute_loop(); - // Returns true if there remains neighbors to listen for - bool may_receive() const { - return ctrl_close_pending || data_close_pending; - } + // 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; + + // 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. - 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) +template +void process::pneigh_sort_by_load(const Compare& comp) { - if (opt::bookkeeping) - expected_load = load; - else - real_load = load; + using std::placeholders::_1; + using std::placeholders::_2; + std::sort(pneigh.begin(), pneigh.end(), + std::bind(comp, + std::bind(&neighbor::get_load, _1), + std::bind(&neighbor::get_load, _2))); } -struct pneigh_load_less { - bool operator()(const neighbor* a, const neighbor* b) - { - return a->get_load() < b->get_load(); - } -}; - -struct pneigh_load_greater { - bool operator()(const neighbor* a, const neighbor* b) - { - return a->get_load() > b->get_load(); - } -}; - #endif // !PROCESS_H // Local variables: