X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d7c957a488bb2ebd0ef5ea7a3323f1ccea620f30..7980fa5940ddbfec4a0ce0e21f38de9a88530656:/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 8f3e1a04f2..5288350b4d 100644 --- a/teshsuite/surf/surf_usage2/surf_usage2.cpp +++ b/teshsuite/surf/surf_usage2/surf_usage2.cpp @@ -6,6 +6,9 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/host.h" +#include "simgrid/kernel/routing/NetZoneImpl.hpp" // full type for NetZoneImpl object +#include "simgrid/zone.h" +#include "src/kernel/EngineImpl.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" #include "src/surf/surf_interface.hpp" @@ -35,7 +38,9 @@ int main(int argc, char** argv) hostB->pimpl_cpu->execution_start(1000.0); hostB->pimpl_cpu->sleep(7.32); - surf_network_model->communicate(hostA, hostB, 150.0, -1.0); + const_sg_netzone_t as_zone = sg_zone_get_by_name("AS0"); + simgrid::kernel::resource::NetworkModel* 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 */ do { @@ -45,7 +50,7 @@ int main(int argc, char** argv) double now = surf_get_clock(); XBT_INFO("Next Event : %g", now); - for (auto const& model : all_existing_models) { + for (auto const& model : simgrid::kernel::EngineImpl::get_instance()->get_all_models()) { if (model->get_started_action_set()->size() != 0) { XBT_DEBUG("\t Running that model"); running = 1;