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
Bug fix. The date given when updating the state of a resource was incorrect. It could...
[simgrid.git]
/
src
/
surf
/
surf.c
diff --git
a/src/surf/surf.c
b/src/surf/surf.c
index
22aeea5
..
8a1b6dd
100644
(file)
--- a/
src/surf/surf.c
+++ b/
src/surf/surf.c
@@
-418,6
+418,11
@@
void surf_init(int *argc, char **argv)
if (!history)
history = tmgr_history_new();
if (!history)
history = tmgr_history_new();
+#ifdef HAVE_TRACING
+ TRACE_add_start_function(TRACE_surf_alloc);
+ TRACE_add_end_function(TRACE_surf_release);
+#endif
+
sg_config_init(argc, argv);
surf_action_init();
sg_config_init(argc, argv);
surf_action_init();
@@
-518,9
+523,11
@@
void surf_presolve(void)
tmgr_history_get_next_event_leq(history, next_event_date,
&value,
(void **) &resource))) {
tmgr_history_get_next_event_leq(history, next_event_date,
&value,
(void **) &resource))) {
- resource->model->model_private->update_resource_state(resource,
- event, value,
- NOW);
+ if (value >= 0){
+ resource->model->model_private->update_resource_state(resource,
+ event, value,
+ NOW);
+ }
}
}
xbt_dynar_foreach(model_list, iter, model)
}
}
xbt_dynar_foreach(model_list, iter, model)
@@
-598,14
+605,14
@@
double surf_solve(double max_date)
min = model_next_action_end;
}
min = model_next_action_end;
}
- if (next_event_date
== -1
.0) {
+ if (next_event_date
< 0
.0) {
XBT_DEBUG("no next TRACE event. Stop searching for it");
break;
}
XBT_DEBUG("no next TRACE event. Stop searching for it");
break;
}
- if ((min
!= -1.0) &&
(next_event_date > NOW + min)) break;
+ if ((min
== -1.0) ||
(next_event_date > NOW + min)) break;
- XBT_DEBUG("Updating models
"
);
+ XBT_DEBUG("Updating models
(min = %g, NOW = %g, next_event_date = %g)",min, NOW, next_event_date
);
while ((event =
tmgr_history_get_next_event_leq(history, next_event_date,
&value,
while ((event =
tmgr_history_get_next_event_leq(history, next_event_date,
&value,
@@
-622,7
+629,7
@@
double surf_solve(double max_date)
resource->model->name, min);
resource->model->model_private->update_resource_state(resource,
event, value,
resource->model->name, min);
resource->model->model_private->update_resource_state(resource,
event, value,
-
NOW + min
);
+
next_event_date
);
}
} while (1);
}
} while (1);