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
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
2f0d855
..
da43e17
100644
(file)
--- a/
src/xbt/xbt_log_layout_simple.cpp
+++ b/
src/xbt/xbt_log_layout_simple.cpp
@@
-1,13
+1,14
@@
/* layout_simple - a dumb log layout */
/* layout_simple - a dumb log layout */
-/* Copyright (c) 2007-202
1
. 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. */
#include "src/xbt/log_private.hpp"
#include "xbt/sysdep.h"
/* 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 "src/xbt/log_private.hpp"
#include "xbt/sysdep.h"
-#include "xbt/virtu.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 */
@@
-34,12
+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);
} else if (not procname) {
check_overflow(len);
} else if (not procname) {
- len = snprintf(p, rem_size, "%s::(%
d) ", sg_host_self_get_name(), xbt_get
pid());
+ len = snprintf(p, rem_size, "%s::(%
ld) ", sg_host_self_get_name(), sg_actor_self_get_
pid());
check_overflow(len);
}
check_overflow(len);
}