Replace NULL with nullptr.

[loba.git] / neighbor.cpp

diff --git a/neighbor.cpp b/neighbor.cpp
index 3340f8f49678998415d94a3fb9f5b83f43b6128d..c3ea8c8a1f4cd7035d34f087d6752fe29730e0bc 100644 (file)
--- a/neighbor.cpp
+++ b/neighbor.cpp
@@ -1,12 +1,18 @@
-#include "neighbor.h"
-

 #include <limits>
 #include <limits>

-#include <msg/msg.h>
+#include <simgrid/msg.h>
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc); // needed to compile neighbor.h
+
+#include "misc.h"
+
+#include "neighbor.h"

 
 neighbor::neighbor(const char* hostname)
 
 neighbor::neighbor(const char* hostname)

-    : host((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)
 {
 }


@@ -14,3 +20,15 @@ neighbor::neighbor(const char* hostname)
 neighbor::~neighbor()
 {
 }
 neighbor::~neighbor()
 {
 }

+
+void neighbor::print(bool verbose,
+                     e_xbt_log_priority_t logp, xbt_log_category_t cat) const
+{
+    if (verbose)
+        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
+        XBT_XCLOG(cat, logp, "%s: load = %g", get_name(), get_load());
+}