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
Merge branches 'master' and 'master' of github.com:simgrid/simgrid
[simgrid.git]
/
src
/
instr
/
jedule
/
jedule_sd_binding.cpp
diff --git
a/src/instr/jedule/jedule_sd_binding.cpp
b/src/instr/jedule/jedule_sd_binding.cpp
index
4206fdb
..
7bd6543
100644
(file)
--- a/
src/instr/jedule/jedule_sd_binding.cpp
+++ b/
src/instr/jedule/jedule_sd_binding.cpp
@@
-1,20
+1,15
@@
-/* Copyright (c) 2010-2016. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2017. 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/asserts.h"
-#include "simgrid/jedule/jedule_sd_binding.h"
-
-#include "simgrid/forward.h"
-
-#include "../../simdag/simdag_private.hpp"
#include "simgrid/jedule/jedule.hpp"
#include "simgrid/jedule/jedule.hpp"
+#include "src/simdag/simdag_private.hpp"
+
+#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/NetZone.hpp"
#include "simgrid/s4u/NetZone.hpp"
-#include "simgrid/s4u/engine.hpp"
-#if HAVE_JEDULE
+#if
SIMGRID_
HAVE_JEDULE
XBT_LOG_NEW_CATEGORY(jedule, "Logging specific to Jedule");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jed_sd, jedule, "Logging specific to Jedule SD binding");
XBT_LOG_NEW_CATEGORY(jedule, "Logging specific to Jedule");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(jed_sd, jedule, "Logging specific to Jedule SD binding");
@@
-43,7
+38,7
@@
void jedule_sd_init()
my_jedule->root_container = root_container;
}
my_jedule->root_container = root_container;
}
-void jedule_sd_exit(
void
)
+void jedule_sd_exit()
{
delete my_jedule;
}
{
delete my_jedule;
}
@@
-52,7
+47,7
@@
void jedule_sd_dump(const char * filename)
{
if (my_jedule) {
char *fname;
{
if (my_jedule) {
char *fname;
- if (
!
filename) {
+ if (
not
filename) {
fname = bprintf("%s.jed", xbt_binary_name);
} else {
fname = xbt_strdup(filename);
fname = bprintf("%s.jed", xbt_binary_name);
} else {
fname = xbt_strdup(filename);