X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7444a715278a4bad33c0200162286c50f03bcaef..387f0d33929229d58e854595762a9951d880b9fb:/src/surf/sg_platf.cpp?ds=sidebyside diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 1644840fe8..dc6fee2084 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -3,15 +3,6 @@ /* 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. */ -#include "simgrid/s4u/Engine.hpp" -#include "simgrid/s4u/Storage.hpp" -#include "src/kernel/EngineImpl.hpp" -#include "src/simix/smx_private.hpp" -#include "src/include/simgrid/sg_config.h" -#include "src/surf/HostImpl.hpp" -#include "src/surf/cpu_interface.hpp" -#include "src/surf/network_interface.hpp" -#include "src/surf/xml/platf_private.hpp" #include "simgrid/kernel/routing/ClusterZone.hpp" #include "simgrid/kernel/routing/DijkstraZone.hpp" #include "simgrid/kernel/routing/DragonflyZone.hpp" @@ -23,6 +14,15 @@ #include "simgrid/kernel/routing/NetZoneImpl.hpp" #include "simgrid/kernel/routing/TorusZone.hpp" #include "simgrid/kernel/routing/VivaldiZone.hpp" +#include "simgrid/s4u/Engine.hpp" +#include "simgrid/s4u/Storage.hpp" +#include "src/include/simgrid/sg_config.hpp" +#include "src/kernel/EngineImpl.hpp" +#include "src/simix/smx_private.hpp" +#include "src/surf/HostImpl.hpp" +#include "src/surf/cpu_interface.hpp" +#include "src/surf/network_interface.hpp" +#include "src/surf/xml/platf_private.hpp" #include @@ -83,7 +83,7 @@ void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) if (args->state_trace) host->pimpl_cpu->setStateTrace(args->state_trace); if (args->speed_trace) - host->pimpl_cpu->setSpeedTrace(args->speed_trace); + host->pimpl_cpu->set_speed_trace(args->speed_trace); if (args->pstate != 0) host->pimpl_cpu->setPState(args->pstate); if (args->coord && strcmp(args->coord, "")) @@ -490,7 +490,7 @@ void sg_platf_new_peer(simgrid::kernel::routing::PeerCreationArgs* peer) if (peer->state_trace) host->pimpl_cpu->setStateTrace(peer->state_trace); if (peer->speed_trace) - host->pimpl_cpu->setSpeedTrace(peer->speed_trace); + host->pimpl_cpu->set_speed_trace(peer->speed_trace); } void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ }