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 pull request #65 from fabienchaix/master
[simgrid.git]
/
teshsuite
/
simdag
/
platforms
/
Evaluate_get_route_time.c
diff --git
a/teshsuite/simdag/platforms/Evaluate_get_route_time.c
b/teshsuite/simdag/platforms/Evaluate_get_route_time.c
index
89a9ba8
..
5737ea5
100644
(file)
--- a/
teshsuite/simdag/platforms/Evaluate_get_route_time.c
+++ b/
teshsuite/simdag/platforms/Evaluate_get_route_time.c
@@
-17,39
+17,34
@@
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
- sg_host_t w1, w2;
- const sg_host_t *workstations;
int i, j;
int i, j;
- int list_size;
xbt_os_timer_t timer = xbt_os_timer_new();
xbt_os_timer_t timer = xbt_os_timer_new();
- /* SD initialization */
SD_init(&argc, argv);
SD_init(&argc, argv);
-
- /* creation of the environment */
SD_create_environment(argv[1]);
SD_create_environment(argv[1]);
-
workstation
s = sg_host_list();
-
list_size
= sg_host_count();
+
sg_host_t *host
s = sg_host_list();
+
int host_count
= sg_host_count();
/* Random number initialization */
srand( (int) (xbt_os_time()*1000) );
/* Random number initialization */
srand( (int) (xbt_os_time()*1000) );
- do{
- i = rand()%
list_size
;
- j = rand()%
list_size
;
- }while(i==j);
+ do
{
+ i = rand()%
host_count
;
+ j = rand()%
host_count
;
+ }
while(i==j);
-
w1 = workstation
s[i];
-
w2 = workstation
s[j];
+
sg_host_t h1 = host
s[i];
+
sg_host_t h2 = host
s[j];
printf("%d\tand\t%d\t\t",i,j);
xbt_os_cputimer_start(timer);
printf("%d\tand\t%d\t\t",i,j);
xbt_os_cputimer_start(timer);
- SD_route_get_list(
w1, w
2);
+ SD_route_get_list(
h1, h
2);
xbt_os_cputimer_stop(timer);
printf("%f\n", xbt_os_timer_elapsed(timer) );
xbt_os_cputimer_stop(timer);
printf("%f\n", xbt_os_timer_elapsed(timer) );
+ xbt_free(hosts);
SD_exit();
return 0;
SD_exit();
return 0;