A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Let the xbt_log module register its finalizer itself
[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
8d26b51
..
da43e17
100644
(file)
--- a/
src/xbt/xbt_log_layout_simple.cpp
+++ b/
src/xbt/xbt_log_layout_simple.cpp
@@
-1,12
+1,14
@@
/* layout_simple - a dumb log layout */
/* layout_simple - a dumb log layout */
-/* Copyright (c) 2007-202
0
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-202
3
. 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. */
/* 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 "src/xbt/log_private.hpp"
+#include "xbt/sysdep.h"
+#include <simgrid/actor.h>
+#include <simgrid/s4u/Actor.hpp>
#include "simgrid/engine.h" /* simgrid_get_clock */
#include "simgrid/host.h" /* sg_host_self_get_name */
#include "simgrid/engine.h" /* simgrid_get_clock */
#include "simgrid/host.h" /* sg_host_self_get_name */
@@
-33,13
+35,12
@@
static bool xbt_log_layout_simple_doit(const s_xbt_log_layout_t*, xbt_log_event_
check_overflow(1);
/* Display the proc info if available */
check_overflow(1);
/* Display the proc info if available */
- procname =
xbt_proc
name();
+ procname =
sg_actor_self_get_
name();
if (procname && strcmp(procname,"maestro")) {
if (procname && strcmp(procname,"maestro")) {
- len = snprintf(p, rem_size, "%s:%s:(%
d) ", sg_host_self_get_name(), procname, xbt_get
pid());
+ len = snprintf(p, rem_size, "%s:%s:(%
ld) ", sg_host_self_get_name(), procname, sg_actor_self_get_
pid());
check_overflow(len);
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);
}
check_overflow(len);
}
@@
-48,7
+49,7
@@
static bool xbt_log_layout_simple_doit(const s_xbt_log_layout_t*, xbt_log_event_
check_overflow(len);
/* Display file position if not INFO */
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);
}
len = snprintf(p, rem_size, "%s:%d: ", ev->fileName, ev->lineNum);
check_overflow(len);
}
@@
-71,8
+72,8
@@
static bool xbt_log_layout_simple_doit(const s_xbt_log_layout_t*, xbt_log_event_
xbt_log_layout_t xbt_log_layout_simple_new(const 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;
}
return res;
}