mise a jour des résultats des expés

[loba.git] / process.h

diff --git a/process.h b/process.h
index 9ea0521ba08e5283f565e85d8e95ac046889a0b1..c31d21345ab6c05993b7be8bab5cff20ea4e1f8e 100644 (file)
--- a/process.h
+++ b/process.h
@@ -36,6 +36,7 @@ public:
     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_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_iter_deviation() const;

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


@@ -44,6 +45,8 @@ public:
     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;  }
     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;  }

+    double get_idle_duration() const       { return idle_duration;        }
+    double get_convergence() const         { return convergence;          }

 
     int run();
 
 
     int run();
 


@@ -84,6 +87,10 @@ private:
     static double total_load_running; // sum of loads while running
     static double total_load_exit; // sum of process loads at exit
 
     static double total_load_running; // sum of loads while running
     static double total_load_exit; // sum of process loads at exit
 

+    static int process_counter;
+    static double total_load_average;
+    static double load_diff_threshold;
+

     typedef MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh_type;
     neigh_type neigh;           // list of neighbors (do not alter
                                 // after construction!)
     typedef MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh_type;
     neigh_type neigh;           // list of neighbors (do not alter
                                 // after construction!)


@@ -108,6 +115,9 @@ private:
     double expected_load;       // expected load in bookkeeping mode
     double received_load;       // load received from neighbors
 
     double expected_load;       // expected load in bookkeeping mode
     double received_load;       // load received from neighbors
 

+    double idle_duration;       // how long we had nothing to compute
+    double convergence;         // date when convergence was achieved, or -1.0
+

     mutex_t mutex;              // synchronization between threads
     condition_t cond;
 
     mutex_t mutex;              // synchronization between threads
     condition_t cond;
 


@@ -153,6 +163,9 @@ private:
     // Simulate computation loop
     void compute_loop();
 
     // Simulate computation loop
     void compute_loop();
 

+    // Check for convergence
+    void convergence_check();
+

     // Check if we need to stop
     bool still_running();
 
     // Check if we need to stop
     bool still_running();