From 3bee892da3da2776214c7e51e563ec65ccb69277 Mon Sep 17 00:00:00 2001
From: couturie <couturie@carcariass.(none)>
Date: Sun, 30 Jan 2011 19:47:46 +0100
Subject: [PATCH] new fair
---
loba_fairstrategy.cpp | 8 +-------
loba_fairstrategy.h | 2 +-
loba_simple.h | 6 +++---
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/loba_fairstrategy.cpp b/loba_fairstrategy.cpp
index f4dbb28..ccfd700 100644
--- a/loba_fairstrategy.cpp
+++ b/loba_fairstrategy.cpp
@@ -5,11 +5,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
#include "loba_fairstrategy.h"
-/* simple version:
- * load balance with a least-loaded neighbor,
- * without breaking the ping-pong condition
- */
-
class compare {
public:
bool operator()(const neighbor*a, const neighbor*b) {
@@ -21,8 +16,7 @@ void loba_fairstrategy::load_balance()
{
std::sort(pneigh.begin(), pneigh.end(), compare());
- // print_loads_p();
- //print_loads_p(false, xbt_log_priority_debug);
+ print_loads_p(false, xbt_log_priority_debug);
bool found = true;
diff --git a/loba_fairstrategy.h b/loba_fairstrategy.h
index 3e09627..e6de7a9 100644
--- a/loba_fairstrategy.h
+++ b/loba_fairstrategy.h
@@ -12,7 +12,7 @@ private:
void load_balance();
};
-#endif //!LOBA_SIMPLE
+#endif //!LOBA_FAIR_STRATEGY_H
// Local variables:
// mode: c++
diff --git a/loba_simple.h b/loba_simple.h
index 77cd8ad..164641c 100644
--- a/loba_simple.h
+++ b/loba_simple.h
@@ -1,5 +1,5 @@
-#ifndef LOBA_SIMPLE
-#define LOBA_SIMPLE
+#ifndef LOBA_SIMPLE_H
+#define LOBA_SIMPLE_H
#include "process.h"
@@ -12,7 +12,7 @@ private:
void load_balance();
};
-#endif //!LOBA_SIMPLE
+#endif //!LOBA_SIMPLE_H
// Local variables:
// mode: c++
--
2.39.5