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
do not use f2c with 64 bits platforms which use old gcc (<4.5)
[simgrid.git]
/
examples
/
simdag
/
sd_test2.c
diff --git
a/examples/simdag/sd_test2.c
b/examples/simdag/sd_test2.c
index
cc86f17
..
7c0baab
100644
(file)
--- a/
examples/simdag/sd_test2.c
+++ b/
examples/simdag/sd_test2.c
@@
-61,7
+61,14
@@
int main(int argc, char **argv)
SD_init(&argc, argv);
/* creation of the environment */
SD_init(&argc, argv);
/* creation of the environment */
- SD_create_environment(argv[1]);
+ if (strstr(argv[1],".xml"))
+ SD_create_environment(argv[1]);
+ else
+ if (strstr(argv[1],".lua"))
+ SD_load_environment_script(argv[1]);
+ else
+ xbt_die("Unsupported platform description style (neither XML nor lua): %s",
+ argv[1]);
/* getting platform infos */
n_hosts = SD_workstation_get_number();
/* getting platform infos */
n_hosts = SD_workstation_get_number();
@@
-199,7
+206,7
@@
int main(int argc, char **argv)
/* let's launch the simulation! */
changed_tasks = SD_simulate(-1.0);
/* let's launch the simulation! */
changed_tasks = SD_simulate(-1.0);
-
INFO1
("Simulation time: %f", SD_get_clock());
+
XBT_INFO
("Simulation time: %f", SD_get_clock());
xbt_dynar_free_container(&changed_tasks);
xbt_dynar_free_container(&changed_tasks);