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
Typo + kill useless empty lines.
[simgrid.git]
/
src
/
simdag
/
sd_global.c
diff --git
a/src/simdag/sd_global.c
b/src/simdag/sd_global.c
index
00512b1
..
2294740
100644
(file)
--- a/
src/simdag/sd_global.c
+++ b/
src/simdag/sd_global.c
@@
-229,13
+229,14
@@
xbt_swag_t SD_simulate_swag(double how_long) {
unsigned int iter, depcnt;
static int first_time = 1;
unsigned int iter, depcnt;
static int first_time = 1;
-
if (first_time) {
-
XBT_VERB("Starting simulation...");
+ if (first_time) {
+ XBT_VERB("Starting simulation...");
-
surf_presolve(); /* Takes traces into account */
-
first_time = 0;
-
}
+ surf_presolve(); /* Takes traces into account */
+ first_time = 0;
+ }
+ XBT_VERB("Run simulation for %f seconds", how_long);
sd_global->watch_point_reached = 0;
xbt_swag_reset(sd_global->return_set);
sd_global->watch_point_reached = 0;
xbt_swag_reset(sd_global->return_set);
@@
-250,7
+251,7
@@
xbt_swag_t SD_simulate_swag(double how_long) {
/* main loop */
elapsed_time = 0.0;
while (elapsed_time >= 0.0 &&
/* main loop */
elapsed_time = 0.0;
while (elapsed_time >= 0.0 &&
- (how_long < 0.0 ||
total_time < how_long
) &&
+ (how_long < 0.0 ||
0.00001 < (how_long -total_time)
) &&
!sd_global->watch_point_reached) {
surf_model_t model = NULL;
/* dumb variables */
!sd_global->watch_point_reached) {
surf_model_t model = NULL;
/* dumb variables */
@@
-258,7
+259,7
@@
xbt_swag_t SD_simulate_swag(double how_long) {
XBT_DEBUG("Total time: %f", total_time);
XBT_DEBUG("Total time: %f", total_time);
- elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long : -1.0);
+ elapsed_time = surf_solve(how_long > 0 ? surf_get_clock() + how_long
- total_time
: -1.0);
XBT_DEBUG("surf_solve() returns %f", elapsed_time);
if (elapsed_time > 0.0)
total_time += elapsed_time;
XBT_DEBUG("surf_solve() returns %f", elapsed_time);
if (elapsed_time > 0.0)
total_time += elapsed_time;