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 remote-tracking branch 'github/master'
[simgrid.git]
/
src
/
simdag
/
sd_daxloader.cpp
diff --git
a/src/simdag/sd_daxloader.cpp
b/src/simdag/sd_daxloader.cpp
index
07a3919
..
54baf37
100644
(file)
--- a/
src/simdag/sd_daxloader.cpp
+++ b/
src/simdag/sd_daxloader.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
@@
-12,11
+12,11
@@
#include <algorithm>
#include <map>
#include <algorithm>
#include <map>
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
-
#include "dax_dtd.h"
#include "dax_dtd.c"
#include "dax_dtd.h"
#include "dax_dtd.c"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
+
/* Ensure that transfer tasks have unique names even though a file is used several times */
void uniq_transfer_task_name(SD_task_t task)
{
/* Ensure that transfer tasks have unique names even though a file is used several times */
void uniq_transfer_task_name(SD_task_t task)
{
@@
-222,7
+222,7
@@
xbt_dynar_t SD_daxload(const char *filename)
if (not acyclic_graph_detail(result)) {
XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.",
if (not acyclic_graph_detail(result)) {
XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.",
- simgrid::xbt::Path(filename).get
Base
name().c_str());
+ simgrid::xbt::Path(filename).get
_base_
name().c_str());
xbt_dynar_foreach(result, cpt, file)
SD_task_destroy(file);
xbt_dynar_free_container(&result);
xbt_dynar_foreach(result, cpt, file)
SD_task_destroy(file);
xbt_dynar_free_container(&result);