X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9687670d5440f10286a0dbc5aab95bb4eb9b6138..a34d8237b8267686bbd259670f27da273ff5236e:/src/surf/network_interface.hpp?ds=sidebyside diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index 171a047f30..bca2f83ef2 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -1,28 +1,28 @@ -/* 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 "simgrid/link.h" -#ifndef SURF_NETWORK_INTERFACE_HPP_ -#define SURF_NETWORK_INTERFACE_HPP_ - /*********** * Classes * ***********/ class NetworkModel; -typedef NetworkModel *NetworkModelPtr; - class NetworkAction; -typedef NetworkAction *NetworkActionPtr; /************* * Callbacks * @@ -42,21 +42,21 @@ XBT_PUBLIC_DATA( surf_callback(void, Link*)) networkLinkDestructedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emits the callbacks after Link State changed - * @details Callback functions have the following signature: `void(LinkActionPtr action, e_surf_resource_state_t old, e_surf_resource_state_t current)` + * @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; /** @ingroup SURF_callbacks * @brief Callbacks handler which emits 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)` + * @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, NetworkActionPtr, e_surf_action_state_t, e_surf_action_state_t)) networkActionStateChangedCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, 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(NetworkActionPtr action, RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate)` + * @details Callback functions have the following signature: `void(NetworkAction *action, RoutingEdge *src, RoutingEdge *dst, double size, double rate)` */ -XBT_PUBLIC_DATA( surf_callback(void, NetworkActionPtr, RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate)) networkCommunicateCallbacks; +XBT_PUBLIC_DATA( surf_callback(void, NetworkAction*, RoutingEdge *src, RoutingEdge *dst, double size, double rate)) networkCommunicateCallbacks; /********* * Tools * @@ -74,17 +74,10 @@ XBT_PUBLIC(void) net_add_traces(); */ 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); @@ -118,7 +111,7 @@ public: e_surf_link_sharing_policy_t policy, xbt_dict_t properties)=0; - virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkActionPtr /*action*/) {}; + virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {}; /** * @brief Create a communication between two hosts. @@ -132,15 +125,14 @@ public: * unlimited. * @return The action representing the communication */ - virtual ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst, + 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. @@ -196,7 +188,7 @@ public: * @param name The name of the Link * @param props Dictionary of properties associated to this Link */ - Link(NetworkModelPtr model, const char *name, xbt_dict_t props); + Link(NetworkModel *model, const char *name, xbt_dict_t props); /** * @brief Link constructor @@ -208,7 +200,7 @@ public: * @param history [TODO] * @param state_trace [TODO] */ - Link(NetworkModelPtr model, const char *name, xbt_dict_t props, + Link(NetworkModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint, tmgr_history_t history, tmgr_trace_t state_trace); @@ -275,14 +267,13 @@ public: */ class NetworkAction : public 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) + NetworkAction(Model *model, double cost, bool failed) : Action(model, cost, failed) {} /** @@ -294,7 +285,7 @@ public: * @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) + NetworkAction(Model *model, double cost, bool failed, lmm_variable_t var) : Action(model, cost, failed, var) {}; void setState(e_surf_action_state_t state);