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
Add java-bittorrent example (still not working).
[simgrid.git]
/
examples
/
simdag
/
dot
/
simulate_dot.c
diff --git
a/examples/simdag/dot/simulate_dot.c
b/examples/simdag/dot/simulate_dot.c
index
a67ec8a
..
ff0dd78
100644
(file)
--- a/
examples/simdag/dot/simulate_dot.c
+++ b/
examples/simdag/dot/simulate_dot.c
@@
-12,6
+12,7
@@
#include "xbt/log.h"
#include "xbt/ex.h"
#include <string.h>
#include "xbt/log.h"
#include "xbt/ex.h"
#include <string.h>
+#include <libgen.h>
XBT_LOG_NEW_DEFAULT_CATEGORY(test,
"Logging specific to this SimDag example");
XBT_LOG_NEW_DEFAULT_CATEGORY(test,
"Logging specific to this SimDag example");
@@
-48,9
+49,9
@@
int main(int argc, char **argv)
/* load the DOT file and schedule tasks */
dot = SD_dotload_with_sched(argv[2]);
/* load the DOT file and schedule tasks */
dot = SD_dotload_with_sched(argv[2]);
- if(
dot == NULL
){
-
XBT_INFO("The dot file with the provided scheduling is wrong, more information with the option : --log=sd_dotparse.thres:verbose"
);
-
return -1
;
+ if(
!dot
){
+
SD_exit(
);
+
xbt_die("The dot file with the provided scheduling is wrong, more information with the option : --log=sd_dotparse.thres:verbose")
;
}
/* Display all the tasks */
}
/* Display all the tasks */
@@
-74,9
+75,9
@@
int main(int argc, char **argv)
xbt_dynar_free_container(&changed);
XBT_INFO
("------------------- Produce the trace file---------------------------");
xbt_dynar_free_container(&changed);
XBT_INFO
("------------------- Produce the trace file---------------------------");
- XBT_INFO("Producing the trace of the run into %s",
tracefilename
);
+ XBT_INFO("Producing the trace of the run into %s",
basename(tracefilename)
);
FILE *out = fopen(tracefilename, "w");
FILE *out = fopen(tracefilename, "w");
- xbt_assert
1
(out, "Cannot write to %s", tracefilename);
+ xbt_assert(out, "Cannot write to %s", tracefilename);
free(tracefilename);
xbt_dynar_foreach(dot, cursor, task) {
free(tracefilename);
xbt_dynar_foreach(dot, cursor, task) {
@@
-102,9
+103,8
@@
int main(int argc, char **argv)
SD_task_get_name(task));
break;
default:
SD_task_get_name(task));
break;
default:
- xbt_die(bprintf
- ("Task %s is of unknown kind %d", SD_task_get_name(task),
- SD_task_get_kind(task)));
+ xbt_die("Task %s is of unknown kind %d", SD_task_get_name(task),
+ SD_task_get_kind(task));
}
SD_task_destroy(task);
}
}
SD_task_destroy(task);
}