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_parse_time.c
diff --git
a/teshsuite/simdag/platforms/Evaluate_parse_time.c
b/teshsuite/simdag/platforms/Evaluate_parse_time.c
index
d79e47e
..
08fa38b
100644
(file)
--- a/
teshsuite/simdag/platforms/Evaluate_parse_time.c
+++ b/
teshsuite/simdag/platforms/Evaluate_parse_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
@@
-7,31
+7,30
@@
//teshsuite/simdag/platforms/evaluate_parse_time ../examples/platforms/nancy.xml
#include <stdio.h>
//teshsuite/simdag/platforms/evaluate_parse_time ../examples/platforms/nancy.xml
#include <stdio.h>
-#include <stdlib.h>
-#include "simdag/simdag.h"
-#include "surf/surf_private.h"
+#include "simgrid/simdag.h"
+#include "surf/surf.h"
#include "xbt/xbt_os_time.h"
#include "xbt/xbt_os_time.h"
-extern routing_global_t global_routing;
-
int main(int argc, char **argv)
{
xbt_os_timer_t timer = xbt_os_timer_new();
int main(int argc, char **argv)
{
xbt_os_timer_t timer = xbt_os_timer_new();
+ SD_init(&argc, argv);
- /* initialization of SD */
- SD_init(&argc, argv);
-
- /* creation of the environment, timed */
- xbt_os_timer_start(timer);
- SD_create_environment(argv[1]);
- xbt_os_timer_stop(timer);
+ /* creation of the environment, timed */
+ xbt_os_cputimer_start(timer);
+ SD_create_environment(argv[1]);
+ xbt_os_cputimer_stop(timer);
/* Display the result and exit after cleanup */
/* Display the result and exit after cleanup */
- printf( "%lf\n", xbt_os_timer_elapsed(timer) );
-
- sleep(20);
+ printf( "%f\n", xbt_os_timer_elapsed(timer) );
+ printf("Workstation number: %zu, link number: %d\n", sg_host_count(), sg_link_count());
+ if(argv[2]){
+ printf("Wait for %ss\n",argv[2]);
+ sleep(atoi(argv[2]));
+ }
-
SD_exit();
+ SD_exit();
- return 0;
+ free(timer);
+ return 0;
}
}