X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/198b09ec16ca1b8fc05053bcae9e75c0ad689711..8372ae97612f27b84e8d75aeeed9de0ba6d2ba6a:/src/surf/network_constant.hpp diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp index 93fd2f1f4e..151b2d072a 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,14 @@ namespace simgrid { *********/ class NetworkConstantModel : public NetworkModel { public: - NetworkConstantModel() : NetworkModel() { }; - ~NetworkConstantModel() override; - - Action *communicate(routing::NetCard *src, routing::NetCard *dst, double size, double rate) override; + NetworkConstantModel() : NetworkModel(Model::UpdateAlgo::Full) {} + kernel::resource::Action* communicate(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double size, + double rate) override; double next_occuring_event(double now) override; - bool next_occuring_event_isIdempotent() override {return true;} - void updateActionsState(double now, double delta) override; + void update_actions_state(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 +43,7 @@ namespace simgrid { NetworkConstantAction(NetworkConstantModel *model_, double size, double latency); ~NetworkConstantAction(); double initialLatency_; + void update_remains_lazy(double now) override; }; }