modif simple

[loba.git] / process.h

diff --git a/process.h b/process.h
index 58024265d8b0ac06fb43755966f0eaff02d814f2..df0cfe5fc19682172030a5e27769708a25877aa4 100644 (file)
--- a/process.h
+++ b/process.h
@@ -18,35 +18,74 @@
 
 class process {
 public:
 
 class process {
 public:

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

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

-    ~process();
+    virtual ~process();
+

     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
+
+    // Returns the sum of "to_send" for all neighbors.
+    double sum_of_to_send() const;
+    // Print with given priority what we know about our neighbors' loads
+    void print_loads(e_xbt_log_priority_t logp = xbt_log_priority_info);
+

 private:
 private:

-    std::vector<neighbor> neigh;
-    MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh;
-    std::vector<neighbor*> pneigh;
+    static double total_load_init;
+    static double total_load_exit;

 
 

-    communicator comm;
-    int ctrl_close_pending;
-    int data_close_pending;
+    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

 
 

-    unsigned iter;
+    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

 
 

-    double load;
-    double expected_load;
+    unsigned iter;              // counter of iterations

 
 

-    void compute();
+    double prev_load_broadcast; // used to ensure that we do not send
+                                // a same information messages
+    double 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 load or expected load).
+    // Returns the total load sent to neighbors.

     virtual double load_balance(double my_load);
     virtual double load_balance(double my_load);

+
+    // Virtually do some computation
+    void compute();
+
+    // Send procedures, with helpers for bookkeeping mode or not

     void send1_no_bookkeeping(neighbor& nb);
     void send1_bookkeeping(neighbor& nb);
     void send();
     void send1_no_bookkeeping(neighbor& nb);
     void send1_bookkeeping(neighbor& nb);
     void send();

-    bool receive(bool wait_for_close);
+
+    // Receive procedure: wait (or not) for a message to come.
+    // Returns false if some "close" message was received, returns true
+    // otherwise.
+    enum recv_wait_mode { NO_WAIT = 0, WAIT, WAIT_FOR_CLOSE };
+    bool receive(recv_wait_mode wait);
+
+    // Finalize sends a "close" message to each neighbor and wait for
+    // all of them to answer.

     void finalize1(neighbor& nb);
     void finalize();
     void finalize1(neighbor& nb);
     void finalize();

-    void print_loads(e_xbt_log_priority_t logp = xbt_log_priority_info);

 
 

-    void insert_neighbor_in_map(neighbor& nb);
+

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