X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b1e4e803685007394a5a9b63ab87339d3bf35657..6c56800bdad43cabb6c870c9163bbeea694d6692:/src/surf/network_cm02.hpp diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp index 84b0e992c8..c962616e35 100644 --- a/src/surf/network_cm02.hpp +++ b/src/surf/network_cm02.hpp @@ -1,101 +1,96 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2021. 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. */ -#include "network_interface.hpp" -#include "xbt/fifo.h" -#include "xbt/graph.h" - #ifndef SURF_NETWORK_CM02_HPP_ #define SURF_NETWORK_CM02_HPP_ +#include + +#include "network_interface.hpp" +#include "simgrid/kernel/resource/NetworkModelIntf.hpp" +#include "xbt/graph.h" +#include "xbt/string.hpp" + /*********** * Classes * ***********/ -class NetworkCm02Model; -typedef NetworkCm02Model *NetworkCm02ModelPtr; - -class NetworkCm02Action; -typedef NetworkCm02Action *NetworkCm02ActionPtr; -/********* - * Tools * - *********/ +namespace simgrid { +namespace kernel { +namespace resource { -void net_define_callbacks(void); +class XBT_PRIVATE NetworkCm02Model; +class XBT_PRIVATE NetworkCm02Action; +class XBT_PRIVATE NetworkSmpiModel; /********* * Model * *********/ + class NetworkCm02Model : public NetworkModel { -private: - void initialize(); + /** @brief Get route information (2-way) */ + bool comm_get_route_info(const s4u::Host* src, const s4u::Host* dst, /* OUT */ double& latency, + std::vector& route, std::vector& back_route, + std::unordered_set& netzones) const; + /** @brief Create network action for this communication */ + NetworkCm02Action* comm_action_create(s4u::Host* src, s4u::Host* dst, double size, + const std::vector& route, bool failed); + /** @brief Expand link contraint considering this new communication action */ + void comm_action_expand_constraints(const s4u::Host* src, const s4u::Host* dst, const NetworkCm02Action* action, + const std::vector& route, + const std::vector& back_route) const; + /** @brief Set communication bounds for latency and bandwidth */ + void comm_action_set_bounds(const s4u::Host* src, const s4u::Host* dst, double size, NetworkCm02Action* action, + const std::vector& route, + const std::unordered_set& netzones, double rate); + /** @brief Create maxmin variable in communication action */ + void comm_action_set_variable(NetworkCm02Action* action, const std::vector& route, + const std::vector& back_route); + public: - NetworkCm02Model(int /*i*/) : NetworkModel("network") { - f_networkSolve = lmm_solve; - m_haveGap = false; - };//FIXME: add network clean interface - NetworkCm02Model(const char *name) : NetworkModel(name) { - this->initialize(); - } - NetworkCm02Model() : NetworkModel("network") { - this->initialize(); - } - ~NetworkCm02Model() { - } - Link* createLink(const char *name, - double bw_initial, - tmgr_trace_t bw_trace, - double lat_initial, - tmgr_trace_t lat_trace, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - e_surf_link_sharing_policy_t policy, - xbt_dict_t properties); - void addTraces(); - void updateActionsStateLazy(double now, double delta); - void updateActionsStateFull(double now, double delta); - ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst, - double size, double rate); + explicit NetworkCm02Model(const std::string& name); + LinkImpl* create_link(const std::string& name, const std::vector& bandwidths) final; + LinkImpl* create_wifi_link(const std::string& name, const std::vector& bandwidths) override; + void update_actions_state_lazy(double now, double delta) override; + void update_actions_state_full(double now, double delta) override; + Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; + void set_lat_factor_cb(const std::function& cb) override; + void set_bw_factor_cb(const std::function& cb) override; + +protected: + virtual void check_lat_factor_cb(); + virtual void check_bw_factor_cb(); + +private: + std::function lat_factor_cb_; + std::function bw_factor_cb_; }; /************ * Resource * ************/ -class NetworkCm02Link : public Link { +class NetworkCm02Link : public LinkImpl { public: - NetworkCm02Link(NetworkCm02ModelPtr model, const char *name, xbt_dict_t props, - lmm_system_t system, - double constraint_value, - tmgr_history_t history, - e_surf_resource_state_t state_init, - tmgr_trace_t state_trace, - double metric_peak, - tmgr_trace_t metric_trace, - double lat_initial, - tmgr_trace_t lat_trace, - e_surf_link_sharing_policy_t policy); - void updateState(tmgr_trace_event_t event_type, double value, double date); - void updateBandwidth(double value, double date=surf_get_clock()); - void updateLatency(double value, double date=surf_get_clock()); + NetworkCm02Link(const std::string& name, double bandwidth, lmm::System* system); + void apply_event(kernel::profile::Event* event, double value) override; + void set_bandwidth(double value) override; + void set_latency(double value) override; }; - /********** * Action * **********/ - class NetworkCm02Action : public NetworkAction { - friend ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate); + friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate); public: - NetworkCm02Action(ModelPtr model, double cost, bool failed) - : NetworkAction(model, cost, failed) {}; - void updateRemainingLazy(double now); - void recycle(); + using NetworkAction::NetworkAction; + void update_remains_lazy(double now) override; }; - +} // namespace resource +} // namespace kernel +} // namespace simgrid #endif /* SURF_NETWORK_CM02_HPP_ */