-/* Copyright (c) 2004-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2017. 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 "surf_interface.hpp"
-#include "surf_routing.hpp"
-
#ifndef SURF_NETWORK_INTERFACE_HPP_
#define SURF_NETWORK_INTERFACE_HPP_
+#include "simgrid/s4u/Link.hpp"
+#include "src/surf/PropertyHolder.hpp"
+#include "src/surf/surf_interface.hpp"
+#include "xbt/base.h"
+#include <list>
+#include <unordered_map>
+
/***********
* Classes *
***********/
-class NetworkModel;
-typedef NetworkModel *NetworkModelPtr;
-
-class NetworkLink;
-typedef NetworkLink *NetworkLinkPtr;
-
-class NetworkAction;
-typedef NetworkAction *NetworkActionPtr;
-
-/*************
- * Callbacks *
- *************/
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emit the callbacks after NetworkLink creation
- * @details Callback functions have the following signature: `void(NetworkLinkPtr)`
- */
-XBT_PUBLIC_DATA( surf_callback(void, NetworkLinkPtr)) networkLinkCreatedCallbacks;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emit the callbacks after NetworkLink destruction
- * @details Callback functions have the following signature: `void(NetworkLinkPtr)`
- */
-XBT_PUBLIC_DATA( surf_callback(void, NetworkLinkPtr)) networkLinkDestructedCallbacks;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emit the callbacks after NetworkLink State changed
- * @details Callback functions have the following signature: `void(NetworkLinkActionPtr action, e_surf_resource_state_t old, e_surf_resource_state_t current)`
- */
-XBT_PUBLIC_DATA( surf_callback(void, NetworkLinkPtr, e_surf_resource_state_t, e_surf_resource_state_t)) networkLinkStateChangedCallbacks;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emit the callbacks after NetworkAction State changed
- * @details Callback functions have the following signature: `void(NetworkActionPtr action, e_surf_action_state_t old, e_surf_action_state_t current)`
- */
-XBT_PUBLIC_DATA( surf_callback(void, NetworkActionPtr, e_surf_action_state_t, e_surf_action_state_t)) networkActionStateChangedCallbacks;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks handler which emit the callbacks after communication created
- * @details Callback functions have the following signature: `void(NetworkActionPtr action, RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate)`
- */
-XBT_PUBLIC_DATA( surf_callback(void, NetworkActionPtr, RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate)) networkCommunicateCallbacks;
-
-/*********
- * Tools *
- *********/
-
-void net_define_callbacks(void);
+namespace simgrid {
+namespace surf {
/*********
* Model *
*********/
+
/** @ingroup SURF_network_interface
* @brief SURF network model interface class
- * @details A model is an object which handle the interactions between its Resources and its Actions
+ * @details A model is an object which handles the interactions between its Resources and its Actions
*/
class NetworkModel : public Model {
public:
- /**
- * @brief NetworkModel constructor
- */
- NetworkModel() : Model("network") {
- };
+ /** @brief Constructor */
+ NetworkModel() : Model() {}
- /**
- * @brief NetworkModel constructor
- *
- * @param name The name of the NetworkModel
- */
- NetworkModel(const char *name) : Model(name) {
- f_networkSolve = lmm_solve;
- m_haveGap = false;
- };
+ /** @brief Destructor */
+ ~NetworkModel() override;
/**
- * @brief The destructor of the NetworkModel
- */
- ~NetworkModel() {
- if (p_maxminSystem)
- lmm_system_free(p_maxminSystem);
- if (p_actionHeap)
- xbt_heap_free(p_actionHeap);
- if (p_modifiedSet)
- delete p_modifiedSet;
- }
-
- /**
- * @brief Create a NetworkLink
+ * @brief Create a Link
*
- * @param name The name of the NetworkLink
- * @param bw_initial The initial bandwidth of the NetworkLink in bytes per second
- * @param bw_trace The trace associated to the NetworkLink bandwidth [TODO]
- * @param lat_initial The initial latency of the NetworkLink in seconds
- * @param lat_trace The trace associated to the NetworkLink latency [TODO]
- * @param state_initial The initial NetworkLink (state)[e_surf_resource_state_t]
- * @param state_trace The trace associated to the NetworkLink (state)[e_surf_resource_state_t] [TODO]
- * @param policy The sharing policy of the NetworkLink
- * @param properties Dictionary of properties associated to this Resource
- * @return The created NetworkLink
+ * @param name The name of the Link
+ * @param bandwidth The initial bandwidth of the Link in bytes per second
+ * @param latency The initial latency of the Link in seconds
+ * @param policy The sharing policy of the Link
*/
- virtual NetworkLinkPtr createResource(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)=0;
-
-
- virtual void gapAppend(double /*size*/, const NetworkLinkPtr /*link*/, NetworkActionPtr /*action*/) {};
+ virtual LinkImpl* createLink(const char* name, double bandwidth, double latency,
+ e_surf_link_sharing_policy_t policy) = 0;
/**
- * @brief Create a communication between two [TODO]
- * @details [TODO]
+ * @brief Create a communication between two hosts.
+ * @details It makes calls to the routing part, and execute the communication
+ * between the two end points.
*
- * @param src The source [TODO]
- * @param dst The destination [TODO]
+ * @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 The
+ * @param rate Allows to limit the transfer rate. Negative value means
+ * unlimited.
* @return The action representing the communication
*/
- virtual ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
- double size, double rate)=0;
+ virtual Action* communicate(simgrid::s4u::Host* src, simgrid::s4u::Host* dst, double size, double rate) = 0;
- /**
- * @brief Function pointer to the function to use to solve the lmm_system_t
+ /** @brief Function pointer to the function to use to solve the lmm_system_t
*
* @param system The lmm_system_t to solve
*/
- void (*f_networkSolve)(lmm_system_t);
+ void (*f_networkSolve)(lmm_system_t) = lmm_solve;
/**
- * @brief [brief description]
- * @details [long description]
+ * @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.
*
- * @param size [description]
- * @return [description]
+ * @param size The size of the message.
+ * @return The latency factor.
*/
virtual double latencyFactor(double size);
/**
- * @brief [brief description]
- * @details [long description]
+ * @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.
*
- * @param size [description]
- * @return [description]
+ * @param size The size of the message.
+ * @return The bandwidth factor.
*/
virtual double bandwidthFactor(double size);
/**
- * @brief [brief description]
- * @details [long description]
- *
- * @param rate [description]
- * @param bound [description]
- * @param size [description]
- * @return [description]
+ * @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.
+ * @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 bandwidthConstraint(double rate, double bound, double size);
- bool m_haveGap;
+ double nextOccuringEventFull(double now) override;
+
+ LinkImpl* loopback_ = nullptr;
};
/************
* Resource *
************/
- /** @ingroup SURF_network_interface
- * @brief SURF network link interface class
- * @details A NetworkLink represent the link between two [Workstations](\ref Workstation)
- */
-class NetworkLink : public Resource {
+/** @ingroup SURF_network_interface
+ * @brief SURF network link interface class
+ * @details A Link represents the link between two [hosts](\ref simgrid::surf::HostImpl)
+ */
+class LinkImpl : public simgrid::surf::Resource, public simgrid::surf::PropertyHolder {
+protected:
+ LinkImpl(simgrid::surf::NetworkModel* model, const char* name, lmm_constraint_t constraint);
+ ~LinkImpl() override;
+
public:
- /**
- * @brief NetworkLink constructor
- *
- * @param model The CpuModel associated to this NetworkLink
- * @param name The name of the NetworkLink
- * @param props Dictionary of properties associated to this NetworkLink
- */
- NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props);
+ void destroy(); // Must be called instead of the destructor
+private:
+ bool currentlyDestroying_ = false;
- /**
- * @brief NetworkLink constructor
- *
- * @param model The CpuModel associated to this NetworkLink
- * @param name The name of the NetworkLink
- * @param props Dictionary of properties associated to this NetworkLink
- * @param constraint The lmm constraint associated to this Cpu if it is part of a LMM component
- * @param history [TODO]
- * @param state_trace [TODO]
- */
- NetworkLink(NetworkModelPtr model, const char *name, xbt_dict_t props,
- lmm_constraint_t constraint,
- tmgr_history_t history,
- tmgr_trace_t state_trace);
+public:
+ /** @brief Public interface */
+ s4u::Link piface_;
- /**
- * @brief NetworkLink destructor
- */
- ~NetworkLink();
+ /** @brief Get the bandwidth in bytes per second of current Link */
+ virtual double bandwidth();
- /**
- * @brief Get the bandwidth in bytes per second of current NetworkLink
- *
- * @return The bandwith in bytes per second of the current NetworkLink
- */
- virtual double getBandwidth();
+ /** @brief Update the bandwidth in bytes per second of current Link */
+ virtual void setBandwidth(double value) = 0;
- /**
- * @brief Update the bandwidth in bytes per second of current NetworkLink
- */
- virtual void updateBandwidth(double value, double date=surf_get_clock())=0;
+ /** @brief Get the latency in seconds of current Link */
+ virtual double latency();
- /**
- * @brief Get the latency in seconds of current NetworkLink
- *
- * @return The latency in seconds of the current NetworkLink
- */
- virtual double getLatency();
+ /** @brief Update the latency in seconds of current Link */
+ virtual void setLatency(double value) = 0;
- /**
- * @brief Update the latency in seconds of current NetworkLink
- */
- virtual void updateLatency(double value, double date=surf_get_clock())=0;
+ /** @brief The sharing policy is a @{link e_surf_link_sharing_policy_t::EType} (0: FATPIPE, 1: SHARED, 2:
+ * FULLDUPLEX) */
+ virtual int sharingPolicy();
- /**
- * @brief Check if the NetworkLink is shared
- * @details [long description]
- *
- * @return true if the current NetwokrLink is shared, false otherwise
- */
- virtual bool isShared();
+ /** @brief Check if the Link is used */
+ bool isUsed() override;
- /**
- * @brief Check if the NetworkLink is used
- *
- * @return true if the current NetwokrLink is used, false otherwise
- */
- bool isUsed();
+ void turnOn() override;
+ void turnOff() override;
+
+ virtual void setStateTrace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF).
+ Trace must contain boolean values. */
+ virtual void setBandwidthTrace(
+ tmgr_trace_t trace); /*< setup the trace file with bandwidth events (peak speed changes due to external load).
+ Trace must contain percentages (value between 0 and 1). */
+ virtual void setLatencyTrace(
+ tmgr_trace_t trace); /*< setup the trace file with latency events (peak latency changes due to external load).
+ Trace must contain absolute values */
- void setState(e_surf_resource_state_t state);
+ tmgr_trace_event_t stateEvent_ = nullptr;
+ s_surf_metric_t latency_ = {1.0, 0, nullptr};
+ s_surf_metric_t bandwidth_ = {1.0, 0, nullptr};
- /* Using this object with the public part of
- model does not make sense */
- double m_latCurrent;
- tmgr_trace_event_t p_latEvent;
+ /* User data */
+ void* getData() { return userData; }
+ void setData(void* d) { userData = d; }
+private:
+ void* userData = nullptr;
- /* LMM */
- tmgr_trace_event_t p_stateEvent;
- s_surf_metric_t p_power;
+ /* List of all links. FIXME: should move to the Engine */
+ static std::unordered_map<std::string, LinkImpl*>* links;
+
+public:
+ static LinkImpl* byName(const char* name);
+ static int linksCount();
+ static LinkImpl** linksList();
+ static void linksExit();
};
/**********
**********/
/** @ingroup SURF_network_interface
* @brief SURF network action interface class
- * @details A NetworkAction represent a communication bettween two [Workstations](\ref Workstation)
+ * @details A NetworkAction represents a communication between two [hosts](\ref HostImpl)
*/
-class NetworkAction : public Action {
+class NetworkAction : public simgrid::surf::Action {
public:
- /**
- * @brief NetworkAction constructor
+ /** @brief Constructor
*
* @param model The NetworkModel associated to this NetworkAction
* @param cost The cost of this NetworkAction in [TODO]
* @param failed [description]
*/
- NetworkAction(ModelPtr model, double cost, bool failed)
- : Action(model, cost, failed) {}
+ NetworkAction(simgrid::surf::Model* model, double cost, bool failed) : simgrid::surf::Action(model, cost, failed) {}
/**
* @brief NetworkAction constructor
* @param failed [description]
* @param var The lmm variable associated to this Action if it is part of a LMM component
*/
- NetworkAction(ModelPtr model, double cost, bool failed, lmm_variable_t var)
- : Action(model, cost, failed, var) {};
+ NetworkAction(simgrid::surf::Model* model, double cost, bool failed, lmm_variable_t var)
+ : simgrid::surf::Action(model, cost, failed, var){};
- void setState(e_surf_action_state_t state);
-
-#ifdef HAVE_LATENCY_BOUND_TRACKING
- /**
- * @brief Check if the action is limited by latency.
- *
- * @return 1 if action is limited by latency, 0 otherwise
- */
- virtual int getLatencyLimited() {return m_latencyLimited;}
-#endif
-
- double m_latency;
- double m_latCurrent;
- double m_weight;
- double m_rate;
- const char* p_senderLinkName;
- double m_senderGap;
- double m_senderSize;
- xbt_fifo_item_t p_senderFifoItem;
-#ifdef HAVE_LATENCY_BOUND_TRACKING
- int m_latencyLimited;
-#endif
+ void setState(simgrid::surf::Action::State state) override;
+ virtual std::list<LinkImpl*> links();
+ double latency_;
+ double latCurrent_;
+ double weight_;
+ double rate_;
};
+}
+}
#endif /* SURF_NETWORK_INTERFACE_HPP_ */
