Use git diff instead of diff-index for setlocalversion.

[loba.git] / neighbor.cpp

diff --git a/neighbor.cpp b/neighbor.cpp
index 752378312ef2a4ee0fad36cefdb89e221aba8bfd..c3ea8c8a1f4cd7035d34f087d6752fe29730e0bc 100644 (file)
--- a/neighbor.cpp
+++ b/neighbor.cpp
@@ -1,5 +1,5 @@
 #include <limits>
 #include <limits>

-#include <msg/msg.h>
+#include <simgrid/msg.h>

 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc); // needed to compile neighbor.h
 
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc); // needed to compile neighbor.h
 


@@ -8,9 +8,11 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc); // needed to compile neighbor.h
 #include "neighbor.h"
 
 neighbor::neighbor(const char* hostname)
 #include "neighbor.h"
 
 neighbor::neighbor(const char* hostname)

-    : host(static_cast<hostdata*>(MSG_host_get_data(MSG_get_host_by_name(hostname))))
+    : host(static_cast<hostdata*>
+           (MSG_host_get_data(MSG_get_host_by_name(hostname))))

     , load(std::numeric_limits<double>::infinity())
     , debt(0.0)
     , load(std::numeric_limits<double>::infinity())
     , debt(0.0)

+    , credit(0.0)

     , to_send(0.0)
 {
 }
     , to_send(0.0)
 {
 }


@@ -23,8 +25,10 @@ void neighbor::print(bool verbose,
                      e_xbt_log_priority_t logp, xbt_log_category_t cat) const
 {
     if (verbose)
                      e_xbt_log_priority_t logp, xbt_log_category_t cat) const
 {
     if (verbose)

-        XCLOG4(cat, logp, "%s: load = %g ; debt = %g ; to_send = %g",
-              get_name(), get_load(), get_debt(), get_to_send());
+        XBT_XCLOG(cat, logp,
+                  "%s: load = %g ; debt = %g ; credit = %g ; to_send = %g",
+                  get_name(), get_load(), get_debt(), get_credit(),
+                  get_to_send());

     else
     else

-        XCLOG2(cat, logp, "%s: load = %g", get_name(), get_load());
+        XBT_XCLOG(cat, logp, "%s: load = %g", get_name(), get_load());

 }
 }