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
don't load private headers from C tests: they will turn to C++
[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
db7782c
..
89a9ba8
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
, 2009, 2010, 2011
. The SimGrid Team.
+/* Copyright (c) 2008
-2015
. 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,29
+9,28
@@
#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;
+
sg_host
_t w1, w2;
+ const
sg_host
_t *workstations;
int i, j;
int list_size;
xbt_os_timer_t timer = xbt_os_timer_new();
int i, j;
int list_size;
xbt_os_timer_t timer = xbt_os_timer_new();
- /*
initialisation of SD
*/
+ /*
SD initialization
*/
SD_init(&argc, argv);
/* creation of the environment */
SD_create_environment(argv[1]);
SD_init(&argc, argv);
/* creation of the environment */
SD_create_environment(argv[1]);
- workstations =
SD_workstation_ge
t_list();
- list_size =
SD_workstation_get_number
();
+ workstations =
sg_hos
t_list();
+ list_size =
sg_host_count
();
/* Random number initialization */
srand( (int) (xbt_os_time()*1000) );
/* Random number initialization */
srand( (int) (xbt_os_time()*1000) );
@@
-49,7
+48,7
@@
int main(int argc, char **argv)
SD_route_get_list(w1, w2);
xbt_os_cputimer_stop(timer);
SD_route_get_list(w1, w2);
xbt_os_cputimer_stop(timer);
- printf("%
l
f\n", xbt_os_timer_elapsed(timer) );
+ printf("%f\n", xbt_os_timer_elapsed(timer) );
SD_exit();
SD_exit();