#include "simgrid/kernel/resource/Resource.hpp"
#include "simgrid/s4u/Link.hpp"
#include "src/kernel/lmm/maxmin.hpp"
-#include "src/kernel/resource/profile/trace_mgr.hpp"
-#include "src/surf/PropertyHolder.hpp"
+#include <xbt/PropertyHolder.hpp>
#include <list>
#include <unordered_map>
*/
class NetworkModel : public Model {
public:
- static simgrid::config::Flag<double> cfg_tcp_gamma;
- static simgrid::config::Flag<bool> cfg_crosstraffic;
+ static config::Flag<double> cfg_tcp_gamma;
+ static config::Flag<bool> cfg_crosstraffic;
explicit NetworkModel(Model::UpdateAlgo algo) : Model(algo) {}
NetworkModel(const NetworkModel&) = delete;
* @param latency The initial latency of the Link in seconds
* @param policy The sharing policy of the Link
*/
- virtual LinkImpl* create_link(const std::string& name, double bandwidth, double latency,
+ virtual LinkImpl* create_link(const std::string& name, const std::vector<double>& bandwidths, double latency,
s4u::Link::SharingPolicy policy) = 0;
/**
* @brief Create a communication between two hosts.
- * @details It makes calls to the routing part, and execute the communication
- * between the two end points.
+ * @details It makes calls to the routing part, and execute the communication between the two end points.
*
* @param src The source of the communication
* @param dst The destination of the communication
* @param size The size of the communication in bytes
- * @param rate Allows to limit the transfer rate. Negative value means
- * unlimited.
+ * @param rate Allows to limit the transfer rate. Negative value means unlimited.
* @return The action representing the communication
*/
virtual Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) = 0;
/**
* @brief Get the right multiplicative factor for the latency.
- * @details Depending on the model, the effective latency when sending
- * a message might be different from the theoretical latency of the link,
- * in function of the message size. In order to account for this, this
- * function gets this factor.
+ * @details Depending on the model, the effective latency when sending a message might be different from the
+ * theoretical latency of the link, in function of the message size. In order to account for this, this function gets
+ * this factor.
*
* @param size The size of the message.
* @return The latency factor.
/**
* @brief Get the right multiplicative factor for the bandwidth.
- * @details Depending on the model, the effective bandwidth when sending
- * a message might be different from the theoretical bandwidth of the link,
- * in function of the message size. In order to account for this, this
- * function gets this factor.
+ * @details Depending on the model, the effective bandwidth when sending a message might be different from the
+ * theoretical bandwidth of the link, in function of the message size. In order to account for this, this function
+ * gets this factor.
*
* @param size The size of the message.
* @return The bandwidth factor.
/**
* @brief Get definitive bandwidth.
- * @details It gives the minimum bandwidth between the one that would
- * occur if no limitation was enforced, and the one arbitrary limited.
+ * @details It gives the minimum bandwidth between the one that would occur if no limitation was enforced, and the
+ * one arbitrary limited.
* @param rate The desired maximum bandwidth.
* @param bound The bandwidth with only the network taken into account.
* @param size The size of the message.
* @return The new bandwidth.
*/
virtual double get_bandwidth_constraint(double rate, double bound, double size);
- double next_occuring_event_full(double now) override;
+ double next_occurring_event_full(double now) override;
LinkImpl* loopback_ = nullptr;
};
* @brief SURF network link interface class
* @details A Link represents the link between two [hosts](@ref simgrid::surf::HostImpl)
*/
-class LinkImpl : public Resource, public simgrid::surf::PropertyHolder {
+class LinkImpl : public Resource, public xbt::PropertyHolder {
+ bool currently_destroying_ = false;
+ s4u::Link piface_;
+
protected:
LinkImpl(NetworkModel* model, const std::string& name, lmm::Constraint* constraint);
LinkImpl(const LinkImpl&) = delete;
public:
void destroy(); // Must be called instead of the destructor
-private:
- bool currently_destroying_ = false;
-public:
/** @brief Public interface */
- s4u::Link piface_;
+ s4u::Link* get_iface() { return &piface_; }
/** @brief Get the bandwidth in bytes per second of current Link */
virtual double get_bandwidth();
latency changes due to external load). Trace must contain
absolute values */
- Metric latency_ = {1.0, 0, nullptr};
+ Metric latency_ = {0.0, 0, nullptr};
Metric bandwidth_ = {1.0, 0, nullptr};
-
- /* User data */
- void* get_data() { return userdata_; }
- void set_data(void* d) { userdata_ = d; }
-private:
- void* userdata_ = nullptr;
};
/**********
NetworkAction(Model* model, double cost, bool failed, lmm::Variable* var) : Action(model, cost, failed, var){};
void set_state(Action::State state) override;
- virtual std::list<LinkImpl*> links();
+ virtual std::list<LinkImpl*> links() const;
double latency_ = {};
double lat_current_ = {};
- double weight_ = {};
+ double sharing_penalty_ = {};
double rate_ = {};
};
-}
-}
+} // namespace resource
+} // namespace kernel
} // namespace simgrid
+
/** @ingroup SURF_models
* @brief The network model
*/
