X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e13ce5b2e888ecb8a373501a4332860f71a1e97c..f7c345a00e92ff915252ae30043dc90ca9a48686:/src/surf/ptask_L07.cpp diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index bea3d7c1f0..f0deae582b 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -18,8 +18,8 @@ XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg); void surf_host_model_init_ptask_L07() { XBT_CINFO(xbt_cfg,"Switching to the L07 model to handle parallel tasks."); - xbt_assert(not surf_cpu_model_pm, "CPU model type already defined"); - xbt_assert(not surf_network_model, "network model type already defined"); + xbt_assert(not surf_cpu_model_pm, "Cannot switch to ptasks: CPU model already defined"); + xbt_assert(not surf_network_model, "Cannot switch to ptasks: network model already defined"); surf_host_model = new simgrid::surf::HostL07Model(); all_existing_models->push_back(surf_host_model); @@ -57,7 +57,7 @@ NetworkL07Model::NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys) : NetworkModel(Model::UpdateAlgo::FULL), hostModel_(hmodel) { set_maxmin_system(sys); - loopback_ = NetworkL07Model::createLink("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE); + loopback_ = NetworkL07Model::create_link("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE); } NetworkL07Model::~NetworkL07Model() @@ -228,8 +228,8 @@ Cpu* CpuL07Model::create_cpu(simgrid::s4u::Host* host, std::vector* spee return new CpuL07(this, host, speed_per_pstate, core); } -kernel::resource::LinkImpl* NetworkL07Model::createLink(const std::string& name, double bandwidth, double latency, - s4u::Link::SharingPolicy policy) +kernel::resource::LinkImpl* NetworkL07Model::create_link(const std::string& name, double bandwidth, double latency, + s4u::Link::SharingPolicy policy) { return new LinkL07(this, name, bandwidth, latency, policy); }