X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/265e908745398dd4e9cc55187aa267650468c57c..4576fd50919e2cffe68e4b86943709f42eaea60f:/src/surf/network_ns3.hpp diff --git a/src/surf/network_ns3.hpp b/src/surf/network_ns3.hpp index a180ed23e8..97eba7a8d9 100644 --- a/src/surf/network_ns3.hpp +++ b/src/surf/network_ns3.hpp @@ -11,18 +11,19 @@ #include "network_interface.hpp" namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { class NetworkNS3Model : public NetworkModel { public: NetworkNS3Model(); ~NetworkNS3Model(); LinkImpl* createLink(const std::string& name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy) override; + s4u::Link::SharingPolicy policy) override; kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; - double nextOccuringEvent(double now) override; - bool nextOccuringEventIsIdempotent() override { return false; } - void updateActionsState(double now, double delta) override; + double next_occuring_event(double now) override; + bool next_occuring_event_is_idempotent() override { return false; } + void update_actions_state(double now, double delta) override; }; /************ @@ -58,6 +59,7 @@ public: s4u::Host* dst_; }; +} // namespace resource } }