Cosmetic changes in help message.

[loba.git] / process.h

diff --git a/process.h b/process.h
index a197e9afeb54c505bd6ab47e07481c92e6b1bafe..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"
 


@@ -28,7 +29,7 @@ public:
     virtual ~process();
 
     double get_comp() const                { return comp; }
     virtual ~process();
 
     double get_comp() const                { return comp; }

-    double get_load() const                { return load; }
+    double get_real_load() const           { return real_load; }

 
     int run();
 
 
     int run();
 


@@ -39,8 +40,14 @@ protected:
     pneigh_type pneigh;         // list of pointers to neighbors that
                                 // we are free to reorder
 
     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;
+    // 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);
+
+    // 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,
 
     // Calls neighbor::print(verbose, logp, cat) for each member of neigh.
     void print_loads(bool verbose = false,


@@ -77,16 +84,11 @@ private:
 
     double prev_load_broadcast; // used to ensure that we do not send
                                 // a same information messages
 
     double prev_load_broadcast; // used to ensure that we do not send
                                 // a same information messages

-    double load;                // current load
+    double real_load;           // current load

     double expected_load;       // expected load in bookkeeping mode
 
     double expected_load;       // expected load in bookkeeping mode
 

-    double& lb_load() { return opt::bookkeeping ? expected_load : load; }
-

     // The load balancing algorithm comes here...
     // 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 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


@@ -110,6 +114,38 @@ private:
     void finalize();
 };
 
     void finalize();
 };
 

+inline
+double process::get_load() const
+{
+    if (opt::bookkeeping)
+        return expected_load;
+    else
+        return real_load;
+}
+
+inline
+void process::set_load(double load)
+{
+    if (opt::bookkeeping)
+        expected_load = load;
+    else
+        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: