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
move surf_presolve, surf_solve, and surf_get_clock to EngineImpl
[simgrid.git]
/
teshsuite
/
surf
/
surf_usage
/
surf_usage.cpp
diff --git
a/teshsuite/surf/surf_usage/surf_usage.cpp
b/teshsuite/surf/surf_usage/surf_usage.cpp
index
9ec4cd6
..
32f8006
100644
(file)
--- a/
teshsuite/surf/surf_usage/surf_usage.cpp
+++ b/
teshsuite/surf/surf_usage/surf_usage.cpp
@@
-9,9
+9,9
@@
#include "simgrid/kernel/routing/NetZoneImpl.hpp" // full type for NetZoneImpl object
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/zone.h"
#include "simgrid/kernel/routing/NetZoneImpl.hpp" // full type for NetZoneImpl object
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/zone.h"
+#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/resource/CpuImpl.hpp"
#include "src/surf/network_interface.hpp"
#include "src/kernel/resource/CpuImpl.hpp"
#include "src/surf/network_interface.hpp"
-#include "surf/surf.hpp"
#include "xbt/config.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
#include "xbt/config.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
@@
-69,7
+69,7
@@
int main(int argc, char** argv)
/* Let's do something on it */
net_model->communicate(hostA, hostB, 150.0, -1.0);
/* Let's do something on it */
net_model->communicate(hostA, hostB, 150.0, -1.0);
-
surf_
solve(-1.0);
+
e.get_impl()->
solve(-1.0);
do {
XBT_INFO("Next Event : %g", simgrid::s4u::Engine::get_clock());
XBT_DEBUG("\t CPU actions");
do {
XBT_INFO("Next Event : %g", simgrid::s4u::Engine::get_clock());
XBT_DEBUG("\t CPU actions");
@@
-106,7
+106,7
@@
int main(int argc, char** argv)
action.unref();
}
} while ((net_model->get_started_action_set()->size() || cpu_model_pm->get_started_action_set()->size()) &&
action.unref();
}
} while ((net_model->get_started_action_set()->size() || cpu_model_pm->get_started_action_set()->size()) &&
-
surf_
solve(-1.0) >= 0.0);
+
e.get_impl()->
solve(-1.0) >= 0.0);
XBT_DEBUG("Simulation Terminated");
XBT_DEBUG("Simulation Terminated");