Cosmetics: reindent and remove unused variables.

[loba.git] / neighbor.h

diff --git a/neighbor.h b/neighbor.h
index 13d11084524353178293bf346b238d719ec885d5..ba50f2e45871f3702e22533f1808d17aa92bd868 100644 (file)
--- a/neighbor.h
+++ b/neighbor.h
@@ -1,22 +1,48 @@
 #ifndef NEIGHBOR_H
 #define NEIGHBOR_H
 
 #ifndef NEIGHBOR_H
 #define NEIGHBOR_H
 

-#include <limits>
-#include <string>
+#include <utility>
+#include <xbt/log.h>
+#include "hostdata.h"

 
 class neighbor {
 public:
 
 class neighbor {
 public:

-    neighbor(const char* const name_)
-        : name(name_)
-        , load(std::numeric_limits<double>::infinity()) {
-    }
-    const std::string& getName() const  { return name; }
-    double getLoad() const              { return load; }
-    void setLoad(double l)              { load = l;    }
+    neighbor(const char* hostname);
+    ~neighbor();
+
+    // returns name, ctrl or data mbox
+    const char* get_name() const        { return host->get_name(); }
+    const char* get_ctrl_mbox() const   { return host->get_ctrl_mbox(); }
+    const char* get_data_mbox() const   { return host->get_data_mbox(); }
+
+    // Getter and setter for load
+    double get_load() const             { return load;   }
+    void set_load(double amount)        { load = amount; }
+
+    // Getter and setter for debt
+    double get_debt() const             { return debt;   }
+    void set_debt(double amount)        { debt = amount; }
+
+    // Getter and setter for to_send
+    double get_to_send() const          { return to_send;   }
+    void set_to_send(double amount)     { to_send = amount; }
+    void add_to_send(double amount)     { to_send += amount; }
+
+    // Prints its name and load on given category, with given
+    // priority.  If verbose is true, prints debt and to_send too.
+    void print(bool verbose = false,
+               e_xbt_log_priority_t logp = xbt_log_priority_info,
+               xbt_log_category_t cat = _XBT_LOGV(default)) const;

 
 private:
 
 private:

-    std::string name;
-    double load;
+    const hostdata* host;       // pointer to this neighbor's hostdata
+
+    double load;                // the load information we know for it
+    double debt;                // the load we had to send to it, but
+                                // that we have not currently sent
+                                // (in bookkeeping mode)
+
+    double to_send;             // the load we have to send to it

 };
 
 #endif // !NEIGHBOR_H
 };
 
 #endif // !NEIGHBOR_H