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
transitions in the same actor are dependent
[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 f4179ae4d5ae48ec4047a5757391541dc0ad3c7e..da43e179840d317617ec3f6e655830bda832972a 100644
(file)
--- a/
src/xbt/xbt_log_layout_simple.cpp
+++ b/
src/xbt/xbt_log_layout_simple.cpp
@@
-1,27
+1,30
@@
/* layout_simple - a dumb log layout */
/* layout_simple - a dumb log layout */
-/* Copyright (c) 2007-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-20
23
. 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/
host.h" /* sg_host_self_get_name
*/
-#include "simgrid/
msg.h" /* MSG_get_clock
*/
-#include <
stdio.h
>
+#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;
extern int xbt_log_no_loc;
-#define check_overflow(len) \
- if ((rem_size -= (len)) > 0) { \
- p += (len); \
- } else \
- return 0
+#define check_overflow(len) \
+ do { \
+ rem_size -= (len); \
+ if (rem_size <= 0) \
+ return false; \
+ p += (len); \
+ } while (0)
-static
int xbt_log_layout_simple_doit(XBT_ATTRIB_UNUSED xbt_log_layout_t l
, 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;
{
char *p = ev->buffer;
int rem_size = ev->buffer_size;
@@
-32,22
+35,21
@@
static int xbt_log_layout_simple_doit(XBT_ATTRIB_UNUSED xbt_log_layout_t l, xbt_
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);
}
/* Display the date */
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 */
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);
}
@@
-65,13
+67,13
@@
static int xbt_log_layout_simple_doit(XBT_ATTRIB_UNUSED xbt_log_layout_t l, xbt_
check_overflow(1);
*p = '\0';
check_overflow(1);
*p = '\0';
- return
1
;
+ return
true
;
}
}
-xbt_log_layout_t xbt_log_layout_simple_new(
XBT_ATTRIB_UNUSED char* arg
)
+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;
}