X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bdfa117ce4f85c77d50219cb2e115d88d3f35f8e..76d4849864c227687e17bdd93c5b1338e9b4cb50:/teshsuite/surf/surf_usage2/surf_usage2.cpp diff --git a/teshsuite/surf/surf_usage2/surf_usage2.cpp b/teshsuite/surf/surf_usage2/surf_usage2.cpp index 18bc5b0a12..74bdf88392 100644 --- a/teshsuite/surf/surf_usage2/surf_usage2.cpp +++ b/teshsuite/surf/surf_usage2/surf_usage2.cpp @@ -10,10 +10,9 @@ #include "simgrid/s4u/Engine.hpp" #include "simgrid/zone.h" #include "src/kernel/EngineImpl.hpp" -#include "src/surf/cpu_interface.hpp" -#include "src/surf/network_interface.hpp" +#include "src/kernel/resource/CpuImpl.hpp" +#include "src/kernel/resource/LinkImpl.hpp" #include "src/surf/surf_interface.hpp" -#include "surf/surf.hpp" #include "xbt/config.hpp" XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example"); @@ -43,7 +42,7 @@ int main(int argc, char** argv) auto net_model = as_zone->get_impl()->get_network_model(); net_model->communicate(hostA, hostB, 150.0, -1.0); - surf_solve(-1.0); /* Takes traces into account. Returns 0.0 */ + e.get_impl()->solve(-1.0); /* Takes traces into account. Returns 0.0 */ do { simgrid::kernel::resource::Action* action = nullptr; running = 0; @@ -73,7 +72,7 @@ int main(int argc, char** argv) action = model->extract_done_action(); } } - } while (running && surf_solve(-1.0) >= 0.0); + } while (running && e.get_impl()->solve(-1.0) >= 0.0); XBT_INFO("Simulation Terminated"); return 0;