X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5ed37babb2fa9097abe82df299c0aa259ed84d5a..0404fab6d794f3ece6b6d34d600e21aa63247e04:/src/xbt/xbt_log_layout_format.cpp

diff --git a/src/xbt/xbt_log_layout_format.cpp b/src/xbt/xbt_log_layout_format.cpp
index 61bb830b77..e09d701257 100644
--- a/src/xbt/xbt_log_layout_format.cpp
+++ b/src/xbt/xbt_log_layout_format.cpp
@@ -9,7 +9,9 @@
 #include "simgrid/host.h"
 #include "src/xbt/log_private.hpp"
 #include "xbt/sysdep.h"
-#include "xbt/virtu.h"
+#include <simgrid/actor.h>
+#include <simgrid/s4u/Actor.hpp>
+
 #include <algorithm>
 #include <cstdio>
 
@@ -67,6 +69,7 @@ static constexpr const char* ERRMSG =
   } else                                                                                                               \
     (void)0
 #define show_int(data) show_it((data), "d")
+#define show_long(data) show_it((data), "ld")
 #define show_double(data) show_it((data), "f")
 
 static bool xbt_log_layout_format_doit(const s_xbt_log_layout_t* l, xbt_log_event_t ev, const char* msg_fmt)
@@ -134,10 +137,10 @@ static bool xbt_log_layout_format_doit(const s_xbt_log_layout_t* l, xbt_log_even
         case 't': /* thread/process name; LOG4J compliant */
         case 'P': /* Used before SimGrid 3.26 and kept for compatiblity. Should not hurt. */
         case 'a': /* actor name; SimGrid extension */
-          show_string(xbt_procname());
+          show_string(sg_actor_self_get_name());
           break;
         case 'i': /* actor ID; SimGrid extension */
-          show_int(xbt_getpid());
+          show_long(sg_actor_self_get_pid());
           break;
         case 'F': /* file name; LOG4J compliant */
           show_string(ev->fileName);