Cosmetics...

[loba.git] / process.h

diff --git a/process.h b/process.h
index 58024265d8b0ac06fb43755966f0eaff02d814f2..607a6af130e1dc330f555d4b5b23edc45eea8c24 100644 (file)
--- a/process.h
+++ b/process.h
@@ -22,10 +22,18 @@ public:
     ~process();
     int run();
 
     ~process();
     int run();
 

+protected:
+    typedef std::vector<neighbor> neigh_type;
+    typedef std::vector<neighbor*> pneigh_type;
+
+    neigh_type neigh;
+    pneigh_type pneigh;
+

 private:
 private:

-    std::vector<neighbor> neigh;
-    MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh;
-    std::vector<neighbor*> pneigh;
+    typedef MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh_type;
+    enum recv_wait_mode { NO_WAIT = 0, WAIT, WAIT_FOR_CLOSE };
+
+    rev_neigh_type rev_neigh;

 
     communicator comm;
     int ctrl_close_pending;
 
     communicator comm;
     int ctrl_close_pending;


@@ -33,20 +41,21 @@ private:
 
     unsigned iter;
 
 
     unsigned iter;
 

+    double prev_load_broadcast;

     double load;
     double expected_load;
 
     double load;
     double expected_load;
 

-    void compute();
+    double sum_of_to_send() const;

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

+
+    void compute();

     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);
+    bool receive(recv_wait_mode wait);

     void finalize1(neighbor& nb);
     void finalize();
     void print_loads(e_xbt_log_priority_t logp = xbt_log_priority_info);
     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