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 branch 'master' of framagit.org:simgrid/simgrid
[simgrid.git]
/
src
/
simdag
/
sd_dotloader.cpp
diff --git
a/src/simdag/sd_dotloader.cpp
b/src/simdag/sd_dotloader.cpp
index
10bb4ad
..
ec453f7
100644
(file)
--- a/
src/simdag/sd_dotloader.cpp
+++ b/
src/simdag/sd_dotloader.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-201
8
. The SimGrid Team.
+/* Copyright (c) 2009-201
9
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-213,7
+213,7
@@
xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool sched
if(schedule){
if (schedule_success) {
if(schedule){
if (schedule_success) {
- std::vector<simgrid::s4u::Host*> hosts = simgrid::s4u::Engine::get
Instance()->getHostList
();
+ std::vector<simgrid::s4u::Host*> hosts = simgrid::s4u::Engine::get
_instance()->get_all_hosts
();
for (auto const& elm : computers) {
SD_task_t previous_task = nullptr;
for (auto const& elm : computers) {
SD_task_t previous_task = nullptr;
@@
-239,7
+239,7
@@
xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool sched
}
if (result && not acyclic_graph_detail(result)) {
}
if (result && not acyclic_graph_detail(result)) {
- std::string base = simgrid::xbt::Path(filename).get
Base
name();
+ std::string base = simgrid::xbt::Path(filename).get
_base_
name();
XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", base.c_str());
xbt_dynar_free(&result);
result = nullptr;
XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", base.c_str());
xbt_dynar_free(&result);
result = nullptr;