X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3e2e56a1ff8c65d47e0cf4e458eac56e08a2b528..cf975a3147956b454a79d81f3557a13ba7800083:/src/surf/network_constant.hpp diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp index 7a8644d0d2..0336b1e6f9 100644 --- a/src/surf/network_constant.hpp +++ b/src/surf/network_constant.hpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2018. 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. */ @@ -26,15 +25,13 @@ namespace simgrid { *********/ class NetworkConstantModel : public NetworkModel { public: - NetworkConstantModel() : NetworkModel() { }; - ~NetworkConstantModel() override; - - Action *communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate) override; + kernel::resource::Action* communicate(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double size, + double rate) override; double nextOccuringEvent(double now) override; - bool next_occuring_event_isIdempotent() override {return true;} void updateActionsState(double now, double delta) override; - Link* createLink(const char *name, double bw, double lat, e_surf_link_sharing_policy_t policy, xbt_dict_t properties) override; + LinkImpl* createLink(const std::string& name, double bw, double lat, + e_surf_link_sharing_policy_t policy) override; }; /********** @@ -45,6 +42,7 @@ namespace simgrid { NetworkConstantAction(NetworkConstantModel *model_, double size, double latency); ~NetworkConstantAction(); double initialLatency_; + void update_remains_lazy(double now) override; }; }