Use tr1/functional for sorting the hosts.

[loba.git] / process.h

diff --git a/process.h b/process.h
index 1374bf4b9458e4f85601363651c44cb057fd4e9b..152f5ed1c5e45a02f413e08394e93ee602bcde2c 100644 (file)
--- a/process.h
+++ b/process.h
@@ -15,6 +15,7 @@
 #include <msg/msg.h>
 #include <xbt/log.h>
 #include "communicator.h"
 #include <msg/msg.h>
 #include <xbt/log.h>
 #include "communicator.h"

+#include "misc.h"

 #include "neighbor.h"
 #include "options.h"
 
 #include "neighbor.h"
 #include "options.h"
 


@@ -44,6 +45,10 @@ protected:
     double get_load() const;
     void set_load(double load);
 
     double get_load() const;
     void set_load(double load);
 

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

     // 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,
     // 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,


@@ -83,10 +88,7 @@ private:
     double expected_load;       // expected load in bookkeeping mode
 
     // The load balancing algorithm comes here...
     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);
+    virtual void load_balance();

 
     // Virtually do some computation
     void compute();
 
     // Virtually do some computation
     void compute();


@@ -97,7 +99,9 @@ private:
     void send_all();
 
     // Returns true if there remains neighbors to listen for
     void send_all();
 
     // Returns true if there remains neighbors to listen for

-    bool may_receive() { return ctrl_close_pending || data_close_pending; }
+    bool may_receive() const {
+        return ctrl_close_pending || data_close_pending;
+    }

 
     // Receive procedure
     // Parameter "timeout" may be 0 for non-blocking operation, -1 for
 
     // Receive procedure
     // Parameter "timeout" may be 0 for non-blocking operation, -1 for


@@ -128,6 +132,20 @@ void process::set_load(double load)
         real_load = load;
 }
 
         real_load = load;
 }
 

+struct pneigh_load_less {
+    bool operator()(const neighbor* a, const neighbor* b)
+    {
+        return a->get_load() < b->get_load();
+    }
+};
+
+struct pneigh_load_greater {
+    bool operator()(const neighbor* a, const neighbor* b)
+    {
+        return a->get_load() > b->get_load();
+    }
+};
+

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