Change format for log messages.

[loba.git] / process.h

diff --git a/process.h b/process.h
index 38a6c42d8e24b9cf3621a9bf299ca98dbe4dd4f4..3e912f03c68186a860f3a16116f74018c93c7d06 100644 (file)
--- a/process.h
+++ b/process.h
@@ -18,8 +18,10 @@
 #include <xbt/log.h>
 #include "communicator.h"
 #include "misc.h"
+#include "msg_thread.h"
 #include "neighbor.h"
 #include "options.h"
+#include "synchro.h"
 
 class process {
 public:
@@ -42,18 +44,22 @@ protected:
     pneigh_type pneigh;         // list of pointers to neighbors that
                                 // we are free to reorder
 
-    template <typename Compare>
-    void pneigh_sort_by_load(const Compare& comp);
-
     // 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);
 
+    // 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 <typename Compare>
+    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,
@@ -92,31 +98,30 @@ private:
     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;
+
+    // Load-balancing loop
+    msg_thread* lb_thread;
+    void load_balance_loop();
 
-    // Virtually do some computation
-    void compute();
+    // Simulate computation loop
+    void compute_loop();
 
-    // Send procedures, with helpers for bookkeeping mode or not
-    void send1_no_bookkeeping(neighbor& nb);
-    void send1_bookkeeping(neighbor& nb);
-    void send_all();
+    bool still_running();
 
-    // Returns true if there remains neighbors to listen for
-    bool may_receive() const {
-        return ctrl_close_pending || data_close_pending;
-    }
+    // 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