X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d8eb62b207b566949a0d9ce649a7b21e226b9168..8c753c341f0c7f6d5ea38c4cb7bf7da6f0ef0a1b:/src/surf/network_interface.hpp diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index 915a925049..de80df17ee 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */ /* 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. */ @@ -10,8 +10,8 @@ #include "simgrid/kernel/resource/Resource.hpp" #include "simgrid/s4u/Link.hpp" #include "src/kernel/lmm/maxmin.hpp" +#include "src/kernel/resource/profile/trace_mgr.hpp" #include "src/surf/PropertyHolder.hpp" -#include "src/surf/trace_mgr.hpp" #include #include @@ -37,6 +37,8 @@ public: static simgrid::config::Flag cfg_crosstraffic; explicit NetworkModel(Model::UpdateAlgo algo) : Model(algo) {} + NetworkModel(const NetworkModel&) = delete; + NetworkModel& operator=(const NetworkModel&) = delete; ~NetworkModel() override; /** @@ -113,6 +115,8 @@ public: class LinkImpl : public Resource, public simgrid::surf::PropertyHolder { protected: LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint); + LinkImpl(const LinkImpl&) = delete; + LinkImpl& operator=(const LinkImpl&) = delete; ~LinkImpl() override; public: @@ -147,12 +151,14 @@ public: void on_bandwidth_change(); - virtual void set_bandwidth_trace( - tmgr_trace_t trace); /*< setup the trace file with bandwidth events (peak speed changes due to external load). - Trace must contain percentages (value between 0 and 1). */ - virtual void set_latency_trace( - tmgr_trace_t trace); /*< setup the trace file with latency events (peak latency changes due to external load). - Trace must contain absolute values */ + virtual void + set_bandwidth_profile(kernel::profile::Profile* profile); /*< setup the profile file with bandwidth events + (peak speed changes due to external load). Trace must + contain percentages (value between 0 and 1). */ + virtual void + set_latency_profile(kernel::profile::Profile* profile); /*< setup the trace file with latency events (peak + latency changes due to external load). Trace must contain + absolute values */ Metric latency_ = {1.0, 0, nullptr}; Metric bandwidth_ = {1.0, 0, nullptr};