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
Use %zu for type size_t.
[simgrid.git]
/
src
/
simdag
/
sd_daxloader.c
diff --git
a/src/simdag/sd_daxloader.c
b/src/simdag/sd_daxloader.c
index
2bbd2c7
..
a4364e7
100644
(file)
--- a/
src/simdag/sd_daxloader.c
+++ b/
src/simdag/sd_daxloader.c
@@
-8,6
+8,7
@@
#include "simdag/simdag.h"
#include "xbt/misc.h"
#include "xbt/log.h"
#include "simdag/simdag.h"
#include "xbt/misc.h"
#include "xbt/log.h"
+#include <libgen.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
@@
-22,7
+23,7
@@
bool parents_are_marked(SD_task_t task);
static void dax_parse_error(char *msg)
{
fprintf(stderr, "Parse error on line %d: %s\n", dax_lineno, msg);
static void dax_parse_error(char *msg)
{
fprintf(stderr, "Parse error on line %d: %s\n", dax_lineno, msg);
- abort();
+
xbt_
abort();
}
static double dax_parse_double(const char *string)
}
static double dax_parse_double(const char *string)
@@
-386,7
+387,7
@@
xbt_dynar_t SD_daxload(const char *filename)
if (!acyclic_graph_detail(result)){
XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.",
if (!acyclic_graph_detail(result)){
XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.",
-
filename
);
+
basename((char*)filename)
);
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);