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
cleanups in teshsuite/simdag/platforms, don't ask why
[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
03285b7
..
c9ef64b
100644
(file)
--- a/
teshsuite/simdag/platforms/Evaluate_get_route_time.c
+++ b/
teshsuite/simdag/platforms/Evaluate_get_route_time.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-201
4
. The SimGrid Team.
+/* Copyright (c) 2008-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-9,40
+9,33
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include "sim
dag
/simdag.h"
-#include "surf/surf
_private
.h"
+#include "sim
grid
/simdag.h"
+#include "surf/surf.h"
#include "xbt/xbt_os_time.h"
#define BILLION 1000000000L;
#include "xbt/xbt_os_time.h"
#define BILLION 1000000000L;
-extern routing_platf_t routing_platf;
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
- SD_workstation_t w1, w2;
- const SD_workstation_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();
- /* initialisation of SD */
SD_init(&argc, argv);
SD_init(&argc, argv);
-
- /* creation of the environment */
SD_create_environment(argv[1]);
SD_create_environment(argv[1]);
-
workstations = SD_workstation_ge
t_list();
-
list_size = SD_workstation_get_number
();
+
sg_host_t *workstations = sg_hos
t_list();
+
int list_size = sg_host_count
();
/* Random number initialization */
srand( (int) (xbt_os_time()*1000) );
/* Random number initialization */
srand( (int) (xbt_os_time()*1000) );
- do{
+ do
{
i = rand()%list_size;
j = rand()%list_size;
i = rand()%list_size;
j = rand()%list_size;
- }while(i==j);
+ }
while(i==j);
- w1 = workstations[i];
- w2 = workstations[j];
+
sg_host_t
w1 = workstations[i];
+
sg_host_t
w2 = workstations[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);
@@
-51,6
+44,7
@@
int main(int argc, char **argv)
printf("%f\n", xbt_os_timer_elapsed(timer) );
printf("%f\n", xbt_os_timer_elapsed(timer) );
+ xbt_free(workstations);
SD_exit();
return 0;
SD_exit();
return 0;