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 branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
examples
/
simdag
/
metaxml
/
sd_meta.c
diff --git
a/examples/simdag/metaxml/sd_meta.c
b/examples/simdag/metaxml/sd_meta.c
index
0067eaa
..
a03e902
100644
(file)
--- a/
examples/simdag/metaxml/sd_meta.c
+++ b/
examples/simdag/metaxml/sd_meta.c
@@
-15,7
+15,6
@@
#include "xbt/log.h"
#include "xbt/dynar.h"
#include "xbt/dict.h"
#include "xbt/log.h"
#include "xbt/dynar.h"
#include "xbt/dict.h"
-#include "xbt/time.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(sd_test,
"Logging specific to this SimDag example");
XBT_LOG_NEW_DEFAULT_CATEGORY(sd_test,
"Logging specific to this SimDag example");
@@
-37,8
+36,8
@@
int main(int argc, char **argv)
/* xbt_log_control_set("sd.thres=debug"); */
if (argc < 2) {
/* xbt_log_control_set("sd.thres=debug"); */
if (argc < 2) {
-
INFO1
("Usage: %s platform_file", argv[0]);
-
INFO1
("example: %s sd_platform.xml", argv[0]);
+
XBT_INFO
("Usage: %s platform_file", argv[0]);
+
XBT_INFO
("example: %s sd_platform.xml", argv[0]);
exit(1);
}
exit(1);
}
@@
-61,11
+60,11
@@
int main(int argc, char **argv)
w2 = workstations[j];
name1 = SD_workstation_get_name(w1);
name2 = SD_workstation_get_name(w2);
w2 = workstations[j];
name1 = SD_workstation_get_name(w1);
name2 = SD_workstation_get_name(w2);
-
INFO2
("Route between %s and %s:", name1, name2);
+
XBT_INFO
("Route between %s and %s:", name1, name2);
route = SD_route_get_list(w1, w2);
route_size = SD_route_get_size(w1, w2);
for (k = 0; k < route_size; k++) {
route = SD_route_get_list(w1, w2);
route_size = SD_route_get_size(w1, w2);
for (k = 0; k < route_size; k++) {
-
INFO3
("\tLink %s: latency = %f, bandwidth = %f",
+
XBT_INFO
("\tLink %s: latency = %f, bandwidth = %f",
SD_link_get_name(route[k]),
SD_link_get_current_latency(route[k]),
SD_link_get_current_bandwidth(route[k]));
SD_link_get_name(route[k]),
SD_link_get_current_latency(route[k]),
SD_link_get_current_bandwidth(route[k]));