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
jedule: obey our coding standards
[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
ee3c110
..
769ca21
100644
(file)
--- a/
src/instr/jedule/jedule_sd_binding.cpp
+++ b/
src/instr/jedule/jedule_sd_binding.cpp
@@
-1,19
+1,15
@@
-/* Copyright (c) 2010-2016. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2018. 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 "simgrid/s4u/As.hpp"
-#include "simgrid/s4u/engine.hpp"
#include "simgrid/jedule/jedule.hpp"
#include "simgrid/jedule/jedule.hpp"
-#include "../../simdag/simdag_private.hpp"
+#include "src/simdag/simdag_private.hpp"
+
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/NetZone.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");
@@
-26,23
+22,23
@@
void jedule_log_sd_event(SD_task_t task)
jed_event_t event = new simgrid::jedule::Event(std::string(SD_task_get_name(task)),
SD_task_get_start_time(task), SD_task_get_finish_time(task), "SD");
jed_event_t event = new simgrid::jedule::Event(std::string(SD_task_get_name(task)),
SD_task_get_start_time(task), SD_task_get_finish_time(task), "SD");
- event->add
R
esources(task->allocation);
- my_jedule->event_set.push_back(event);
+ event->add
_r
esources(task->allocation);
+ my_jedule->event_set
_
.push_back(event);
}
void jedule_sd_init()
{
}
void jedule_sd_init()
{
-
AS_t root_comp = simgrid::s4u::Engine::instance()->rootAs
();
- XBT_DEBUG("root name %s\n", root_comp->name());
+
sg_netzone_t root_comp = simgrid::s4u::Engine::get_instance()->get_netzone_root
();
+ XBT_DEBUG("root name %s\n", root_comp->
get_c
name());
my_jedule = new simgrid::jedule::Jedule();
my_jedule = new simgrid::jedule::Jedule();
- jed_container_t root_container = new simgrid::jedule::Container(std::string(root_comp->name()));
- root_container->create
H
ierarchy(root_comp);
- my_jedule->root_container = root_container;
+ jed_container_t root_container = new simgrid::jedule::Container(std::string(root_comp->
get_c
name()));
+ root_container->create
_h
ierarchy(root_comp);
+ my_jedule->root_container
_
= root_container;
}
}
-void jedule_sd_exit(
void
)
+void jedule_sd_exit()
{
delete my_jedule;
}
{
delete my_jedule;
}
@@
-51,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);
@@
-59,7
+55,7
@@
void jedule_sd_dump(const char * filename)
FILE *fh = fopen(fname, "w");
FILE *fh = fopen(fname, "w");
- my_jedule->write
O
utput(fh);
+ my_jedule->write
_o
utput(fh);
fclose(fh);
xbt_free(fname);
fclose(fh);
xbt_free(fname);