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
simplify: callbacks are only called is trace is enabled.
[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
588764b
..
44e7788
100644
(file)
--- a/
src/surf/surf_c_bindings.cpp
+++ b/
src/surf/surf_c_bindings.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-20
20
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-46,7
+46,6
@@
void surf_presolve()
double surf_solve(double max_date)
{
double time_delta = -1.0; /* duration */
double surf_solve(double max_date)
{
double time_delta = -1.0; /* duration */
- double model_next_action_end = -1.0;
double value = -1.0;
simgrid::kernel::resource::Resource* resource = nullptr;
simgrid::kernel::profile::Event* event = nullptr;
double value = -1.0;
simgrid::kernel::resource::Resource* resource = nullptr;
simgrid::kernel::profile::Event* event = nullptr;
@@
-96,7
+95,7
@@
double surf_solve(double max_date)
XBT_DEBUG("Run the NS3 network at most %fs", time_delta);
// run until min or next flow
XBT_DEBUG("Run the NS3 network at most %fs", time_delta);
// run until min or next flow
- model_next_action_end = surf_network_model->next_occurring_event(time_delta);
+
double
model_next_action_end = surf_network_model->next_occurring_event(time_delta);
XBT_DEBUG("Min for network : %f", model_next_action_end);
if (model_next_action_end >= 0.0)
XBT_DEBUG("Min for network : %f", model_next_action_end);
if (model_next_action_end >= 0.0)
@@
-147,7
+146,5
@@
double surf_solve(double max_date)
simgrid::s4u::Engine::on_time_advance(time_delta);
simgrid::s4u::Engine::on_time_advance(time_delta);
- TRACE_paje_dump_buffer(false);
-
return time_delta;
}
return time_delta;
}