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 #168 from simgrid/smpi_huge_pages
[simgrid.git]
/
src
/
surf
/
surf_c_bindings.cpp
diff --git
a/src/surf/surf_c_bindings.cpp
b/src/surf/surf_c_bindings.cpp
index
7840806
..
85582c5
100644
(file)
--- a/
src/surf/surf_c_bindings.cpp
+++ b/
src/surf/surf_c_bindings.cpp
@@
-18,7
+18,7
@@
extern double NOW;
void surf_presolve()
{
double next_event_date = -1.0;
void surf_presolve()
{
double next_event_date = -1.0;
- tmgr_trace_
iterator_t event
= nullptr;
+ tmgr_trace_
event_t event
= nullptr;
double value = -1.0;
simgrid::surf::Resource *resource = nullptr;
double value = -1.0;
simgrid::surf::Resource *resource = nullptr;
@@
-28,9
+28,8
@@
void surf_presolve()
break;
while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) {
break;
while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) {
- if (value >= 0)
{
+ if (value >= 0)
resource->apply_event(event, value);
resource->apply_event(event, value);
- }
}
}
}
}
@@
-46,7
+45,7
@@
double surf_solve(double max_date)
double model_next_action_end = -1.0;
double value = -1.0;
simgrid::surf::Resource *resource = nullptr;
double model_next_action_end = -1.0;
double value = -1.0;
simgrid::surf::Resource *resource = nullptr;
- tmgr_trace_
iterator_t event
= nullptr;
+ tmgr_trace_
event_t event
= nullptr;
if (max_date > 0.0) {
xbt_assert(max_date > NOW,"You asked to simulate up to %f, but that's in the past already", max_date);
if (max_date > 0.0) {
xbt_assert(max_date > NOW,"You asked to simulate up to %f, but that's in the past already", max_date);