mc_api::get_automaton_transition_label() defined and called in run()

[simgrid.git] / src / xbt / xbt_log_layout_simple.cpp

diff --git a/src/xbt/xbt_log_layout_simple.cpp b/src/xbt/xbt_log_layout_simple.cpp
index 5cc0a6531e2299c5f834167006ebbd7b61c35942..8d26b51cafb62031f517edc2f777f67255c8532b 100644 (file)
--- a/src/xbt/xbt_log_layout_simple.cpp
+++ b/src/xbt/xbt_log_layout_simple.cpp
@@ -8,22 +8,21 @@
 #include "xbt/sysdep.h"
 #include "src/xbt/log_private.hpp"
 
-#include "simgrid/host.h" /* sg_host_self_get_name */
-#include "simgrid/msg.h"  /* MSG_get_clock */
+#include "simgrid/engine.h" /* simgrid_get_clock */
+#include "simgrid/host.h"   /* sg_host_self_get_name */
 #include <cstdio>
 
-extern const char *xbt_log_priority_names[8];
 extern int xbt_log_no_loc;
 
 #define check_overflow(len)                                                                                            \
   do {                                                                                                                 \
     rem_size -= (len);                                                                                                 \
     if (rem_size <= 0)                                                                                                 \
-      return 0;                                                                                                        \
+      return false;                                                                                                    \
     p += (len);                                                                                                        \
   } while (0)
 
-static int xbt_log_layout_simple_doit(const s_xbt_log_layout_t*, xbt_log_event_t ev, const char* fmt)
+static bool xbt_log_layout_simple_doit(const s_xbt_log_layout_t*, xbt_log_event_t ev, const char* fmt)
 {
   char *p = ev->buffer;
   int rem_size = ev->buffer_size;
@@ -45,7 +44,7 @@ static int xbt_log_layout_simple_doit(const s_xbt_log_layout_t*, xbt_log_event_t
   }
 
   /* Display the date */
-  len = snprintf(p, rem_size, "%f] ", MSG_get_clock());
+  len = snprintf(p, rem_size, "%f] ", simgrid_get_clock());
   check_overflow(len);
 
   /* Display file position if not INFO */
@@ -67,7 +66,7 @@ static int xbt_log_layout_simple_doit(const s_xbt_log_layout_t*, xbt_log_event_t
   check_overflow(1);
   *p = '\0';
 
-  return 1;
+  return true;
 }
 
 xbt_log_layout_t xbt_log_layout_simple_new(const char*)