X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/309e5f403c858d0548cc4d7fc72901a79770b2f0..27e5a1eebe0cc33508692e868ae7b369f4a482b4:/src/surf/network_ns3.hpp diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp index 97eba7a8d9..632fe81ccc 100644 --- a/src/surf/network_ns3.hpp +++ b/src/surf/network_ns3.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. */ @@ -18,8 +18,8 @@ class NetworkNS3Model : public NetworkModel { public: NetworkNS3Model(); ~NetworkNS3Model(); - LinkImpl* createLink(const std::string& name, double bandwidth, double latency, - s4u::Link::SharingPolicy policy) override; + LinkImpl* create_link(const std::string& name, double bandwidth, double latency, + s4u::Link::SharingPolicy policy) override; kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; double next_occuring_event(double now) override; bool next_occuring_event_is_idempotent() override { return false; } @@ -34,11 +34,11 @@ public: explicit LinkNS3(NetworkNS3Model* model, const std::string& name, double bandwidth, double latency); ~LinkNS3(); - void apply_event(tmgr_trace_event_t event, double value) override; - void setBandwidth(double value) override { THROW_UNIMPLEMENTED; } - void setLatency(double value) override { THROW_UNIMPLEMENTED; } - void setBandwidthTrace(tmgr_trace_t trace) override; - void setLatencyTrace(tmgr_trace_t trace) override; + void apply_event(simgrid::kernel::profile::Event* event, double value) override; + void set_bandwidth(double value) override { THROW_UNIMPLEMENTED; } + void set_latency(double value) override { THROW_UNIMPLEMENTED; } + void set_bandwidth_profile(profile::Profile* profile) override; + void set_latency_profile(profile::Profile* profile) override; }; /********** @@ -54,7 +54,7 @@ public: void update_remains_lazy(double now) override; // private: - double lastSent_ = 0; + double last_sent_ = 0; s4u::Host* src_; s4u::Host* dst_; };