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 with master
[simgrid.git]
/
examples
/
simdag
/
dot
/
dot_test.c
diff --git
a/examples/simdag/dot/dot_test.c
b/examples/simdag/dot/dot_test.c
index
dfc57ab
..
58addb1
100644
(file)
--- a/
examples/simdag/dot/dot_test.c
+++ b/
examples/simdag/dot/dot_test.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");
@@
-22,7
+23,7
@@
int main(int argc, char **argv)
unsigned int cursor;
SD_task_t task;
unsigned int cursor;
SD_task_t task;
- /* initiali
s
ation of SD */
+ /* initiali
z
ation of SD */
SD_init(&argc, argv);
/* Check our arguments */
SD_init(&argc, argv);
/* Check our arguments */
@@
-49,8
+50,8
@@
int main(int argc, char **argv)
/* load the DOT file */
dot = SD_dotload(argv[2]);
if(dot == NULL){
/* load the DOT file */
dot = SD_dotload(argv[2]);
if(dot == NULL){
-
XBT_INFO("No dot load may be you have a cycle in your graph"
);
-
return -1
;
+
SD_exit(
);
+
xbt_die("No dot load may be you have a cycle in your graph")
;
}
/* Display all the tasks */
}
/* Display all the tasks */
@@
-88,9
+89,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) {
@@
-116,12
+117,12
@@
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);
}
+ xbt_dynar_free_container(&dot);
fclose(out);
/* exit */
fclose(out);
/* exit */