X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54e35ebda7e4ffacd769653b8ebb8ba93c7298bf..ccc1670e4bf36086f1f524b5ef004d5210415488:/src/surf/network_interface.hpp diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index 1893836524..415d244d49 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -1,23 +1,31 @@ -/* Copyright (c) 2004-2014. The SimGrid Team. +/* Copyright (c) 2004-2015. 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. */ +#ifndef SURF_NETWORK_INTERFACE_HPP_ +#define SURF_NETWORK_INTERFACE_HPP_ + +#include + #include #include "xbt/fifo.h" +#include "xbt/dict.h" #include "surf_interface.hpp" #include "surf_routing.hpp" +#include "src/surf/PropertyHolder.hpp" #include "simgrid/link.h" -#ifndef SURF_NETWORK_INTERFACE_HPP_ -#define SURF_NETWORK_INTERFACE_HPP_ - /*********** * Classes * ***********/ + +namespace simgrid { +namespace surf { + class NetworkModel; class NetworkAction; @@ -29,31 +37,34 @@ class NetworkAction; * @brief Callbacks handler which emits the callbacks after Link creation * @details Callback functions have the following signature: `void(Link*)` */ -XBT_PUBLIC_DATA( surf_callback(void, Link*)) networkLinkCreatedCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, simgrid::surf::Link*)) networkLinkCreatedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emits the callbacks after Link destruction * @details Callback functions have the following signature: `void(Link*)` */ -XBT_PUBLIC_DATA( surf_callback(void, Link*)) networkLinkDestructedCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, simgrid::surf::Link*)) networkLinkDestructedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emits the callbacks after Link State changed * @details Callback functions have the following signature: `void(LinkAction *action, e_surf_resource_state_t old, e_surf_resource_state_t current)` */ -XBT_PUBLIC_DATA( surf_callback(void, Link*, e_surf_resource_state_t, e_surf_resource_state_t)) networkLinkStateChangedCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, simgrid::surf::Link*, e_surf_resource_state_t, e_surf_resource_state_t)) networkLinkStateChangedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emits the callbacks after NetworkAction State changed * @details Callback functions have the following signature: `void(NetworkAction *action, e_surf_action_state_t old, e_surf_action_state_t current)` */ -XBT_PUBLIC_DATA( surf_callback(void, NetworkAction*, e_surf_action_state_t, e_surf_action_state_t)) networkActionStateChangedCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, simgrid::surf::NetworkAction*, e_surf_action_state_t, e_surf_action_state_t)) networkActionStateChangedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emits the callbacks after communication created * @details Callback functions have the following signature: `void(NetworkAction *action, RoutingEdge *src, RoutingEdge *dst, double size, double rate)` */ -XBT_PUBLIC_DATA( surf_callback(void, NetworkAction*, RoutingEdge *src, RoutingEdge *dst, double size, double rate)) networkCommunicateCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, simgrid::surf::NetworkAction*, simgrid::surf::RoutingEdge *src, simgrid::surf::RoutingEdge *dst, double size, double rate)) networkCommunicateCallbacks; + +} +} /********* * Tools * @@ -65,23 +76,20 @@ XBT_PUBLIC(void) net_add_traces(); /********* * Model * *********/ + +namespace simgrid { +namespace surf { + /** @ingroup SURF_network_interface * @brief SURF network model interface class * @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") { - f_networkSolve = lmm_solve; - }; - - /** @brief NetworkModel constructor */ - NetworkModel(const char *name) : Model(name) { - f_networkSolve = lmm_solve; - }; + /** @brief Constructor */ + NetworkModel() : Model() { } - /** @brief The destructor of the NetworkModel */ + /** @brief Destructor */ ~NetworkModel() { if (p_maxminSystem) lmm_system_free(p_maxminSystem); @@ -115,8 +123,6 @@ public: e_surf_link_sharing_policy_t policy, xbt_dict_t properties)=0; - virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction */*action*/) {}; - /** * @brief Create a communication between two hosts. * @details It makes calls to the routing part, and execute the communication @@ -132,12 +138,11 @@ public: virtual Action *communicate(RoutingEdge *src, RoutingEdge *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 Get the right multiplicative factor for the latency. @@ -174,7 +179,6 @@ public: */ virtual double bandwidthConstraint(double rate, double bound, double size); double shareResourcesFull(double now); - bool m_haveGap = false; }; /************ @@ -184,7 +188,7 @@ public: * @brief SURF network link interface class * @details A Link represents the link between two [hosts](\ref Host) */ -class Link : public Resource { +class Link : public simgrid::surf::Resource, public simgrid::surf::PropertyHolder { public: /** * @brief Link constructor @@ -193,7 +197,7 @@ public: * @param name The name of the Link * @param props Dictionary of properties associated to this Link */ - Link(NetworkModel *model, const char *name, xbt_dict_t props); + Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props); /** * @brief Link constructor @@ -205,7 +209,7 @@ public: * @param history [TODO] * @param state_trace [TODO] */ - Link(NetworkModel *model, const char *name, xbt_dict_t props, + Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint, tmgr_history_t history, tmgr_trace_t state_trace); @@ -225,12 +229,8 @@ public: /** @brief Update the latency in seconds of current Link */ virtual void updateLatency(double value, double date=surf_get_clock())=0; - /** - * @brief Check if the Link is shared - * - * @return true if the current NetwokrLink is shared, false otherwise - */ - virtual bool isShared(); + /** @brief The sharing policy is a @{link #e_surf_link_sharing_policy_t} (0: FATPIPE, 1: SHARED, 2: FULLDUPLEX) */ + virtual int sharingPolicy(); /** @brief Check if the Link is used */ bool isUsed(); @@ -239,12 +239,12 @@ public: /* Using this object with the public part of model does not make sense */ - double m_latCurrent; - tmgr_trace_event_t p_latEvent; + double m_latCurrent = 0; + tmgr_trace_event_t p_latEvent = NULL; /* LMM */ tmgr_trace_event_t p_stateEvent = NULL; - s_surf_metric_t p_power; + s_surf_metric_t p_speed; /* User data */ public: @@ -270,17 +270,16 @@ public: * @brief SURF network action interface class * @details A NetworkAction represents a communication between two [hosts](\ref Host) */ -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(Model *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 @@ -291,8 +290,8 @@ public: * @param var The lmm variable associated to this Action if it is part of a * LMM component */ - NetworkAction(Model *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); @@ -310,7 +309,6 @@ public: 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 @@ -319,6 +317,9 @@ public: }; +} +} + #endif /* SURF_NETWORK_INTERFACE_HPP_ */