Use #include <...> for foreign header files.

[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 aa4a1c9..da43e17 100644 (file)
--- a/src/xbt/xbt_log_layout_simple.cpp
+++ b/src/xbt/xbt_log_layout_simple.cpp
@@ -1,29 +1,30 @@
 /* layout_simple - a dumb log layout                                        */
 
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "xbt/sysdep.h"
 #include "src/xbt/log_private.hpp"
+#include "xbt/sysdep.h"
+#include <simgrid/actor.h>
+#include <simgrid/s4u/Actor.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(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;
@@ -34,22 +35,21 @@ static int xbt_log_layout_simple_doit(xbt_log_layout_t, xbt_log_event_t ev, cons
   check_overflow(1);
 
   /* Display the proc info if available */
-  procname = xbt_procname();
+  procname = sg_actor_self_get_name();
   if (procname && strcmp(procname,"maestro")) {
-    len = snprintf(p, rem_size, "%s:%s:(%d) ", sg_host_self_get_name(), procname, xbt_getpid());
+    len = snprintf(p, rem_size, "%s:%s:(%ld) ", sg_host_self_get_name(), procname, sg_actor_self_get_pid());
     check_overflow(len);
-  }
-  else if (!procname)  {
-    len = snprintf(p, rem_size, "%s::(%d) ", sg_host_self_get_name(), xbt_getpid());
+  } else if (not procname) {
+    len = snprintf(p, rem_size, "%s::(%ld) ", sg_host_self_get_name(), sg_actor_self_get_pid());
     check_overflow(len);
   }
 
   /* 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 */
-  if (ev->priority != xbt_log_priority_info && !xbt_log_no_loc) {
+  if (ev->priority != xbt_log_priority_info && not xbt_log_no_loc) {
     len = snprintf(p, rem_size, "%s:%d: ", ev->fileName, ev->lineNum);
     check_overflow(len);
   }
@@ -67,13 +67,13 @@ static int xbt_log_layout_simple_doit(xbt_log_layout_t, xbt_log_event_t ev, cons
   check_overflow(1);
   *p = '\0';
 
-  return 1;
+  return true;
 }
 
-xbt_log_layout_t xbt_log_layout_simple_new(char*)
+xbt_log_layout_t xbt_log_layout_simple_new(const char*)
 {
-  xbt_log_layout_t res = xbt_new0(s_xbt_log_layout_t, 1);
-  res->do_layout       = &xbt_log_layout_simple_doit;
+  auto* res      = xbt_new0(s_xbt_log_layout_t, 1);
+  res->do_layout = &xbt_log_layout_simple_doit;
 
   return res;
 }