Partially revert "modif simple"

[loba.git] / process.h

diff --git a/process.h b/process.h
index 3baabbfddad931a25f1fe689faef32b6ca8882e3..1374bf4b9458e4f85601363651c44cb057fd4e9b 100644 (file)
--- a/process.h
+++ b/process.h
@@ -1,32 +1,133 @@
 #ifndef PROCESS_H
 #define PROCESS_H
 
 #ifndef PROCESS_H
 #define PROCESS_H
 

+#define USE_UNORDERED_MAP 1
+//#undef USE_UNORDERED_MAP
+

 #include <vector>
 #include <vector>

+#ifdef USE_UNORDERED_MAP
+#  include <tr1/unordered_map>
+#  define MAP_TEMPLATE std::tr1::unordered_map
+#else
+#  include <map>
+#  define MAP_TEMPLATE std::map
+#endif
+#include <msg/msg.h>

 #include <xbt/log.h>
 #include "communicator.h"
 #include "neighbor.h"
 #include <xbt/log.h>
 #include "communicator.h"
 #include "neighbor.h"

+#include "options.h"

 
 class process {
 public:
 
 class process {
 public:

+    static double get_total_load_init()    { return total_load_init;    }
+    static double get_total_load_running() { return total_load_running; }
+    static double get_total_load_exit()    { return total_load_exit;    }
+

     process(int argc, char* argv[]);
     process(int argc, char* argv[]);

-    ~process() { };
+    virtual ~process();
+
+    double get_comp() const                { return comp; }
+    double get_real_load() const           { return real_load; }
+

     int run();
 
     int run();
 

+protected:
+    typedef std::vector<neighbor> neigh_type;
+    typedef std::vector<neighbor*> pneigh_type;
+
+    pneigh_type pneigh;         // list of pointers to neighbors that
+                                // we are free to reorder
+
+    // 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);
+
+    // 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,
+                     xbt_log_category_t cat = _XBT_LOGV(default)) const;
+
+    // Calls neighbor::print(verbose, logp, cat) for each member of pneigh.
+    void print_loads_p(bool verbose = false,
+                       e_xbt_log_priority_t logp = xbt_log_priority_info,
+                       xbt_log_category_t cat = _XBT_LOGV(default)) const;
+

 private:
 private:

-    communicator comm;
-    std::vector<neighbor> neigh;
-    double load;
-    double expected_load;
+    static double total_load_init; // sum of process loads at init
+    static double total_load_running; // sum of loads while running
+    static double total_load_exit; // sum of process loads at exit
+
+    typedef MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh_type;
+    neigh_type neigh;           // list of neighbors (do not alter
+                                // after construction!)
+    rev_neigh_type rev_neigh;   // map m_host_t -> neighbor

 
 

-    int ctrl_close_pending;
-    int data_close_pending;
+    communicator comm;          // communicator for this process
+    int ctrl_close_pending;     // number of "close" messages to wait
+                                // on ctrl channel
+    int data_close_pending;     // number of "close" messages to wait
+                                // on data channel
+    bool close_received;        // true if we received a "close" message
+    bool finalizing;            // true when finalize() is running

 
 

+    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...
+    // Parameter "my_load" is the load to take into account for myself
+    // (may be real load or expected load).
+    // Returns the total load sent to neighbors.
+    virtual double load_balance(double my_load);
+
+    // Virtually do some computation

     void compute();
     void compute();

-    bool receive(bool wait_for_close);
+
+    // Send procedures, with helpers for bookkeeping mode or not
+    void send1_no_bookkeeping(neighbor& nb);
+    void send1_bookkeeping(neighbor& nb);
+    void send_all();
+
+    // Returns true if there remains neighbors to listen for
+    bool may_receive() { return ctrl_close_pending || data_close_pending; }
+
+    // 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 finalize();

-    void print_loads(e_xbt_log_priority_t logp = xbt_log_priority_info);

 };
 
 };
 

+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;
+}
+

 #endif // !PROCESS_H
 
 // Local variables:
 #endif // !PROCESS_H
 
 // Local variables: