From: Stéphane Castelli Date: Mon, 16 Jun 2014 09:35:38 +0000 (+0200) Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid X-Git-Tag: v3_12~973 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3516ecc808bba20973c58b49c33dded30960613a?hp=32461229e13b3f639761a4479de3825e556c5c83 Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid --- diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index 4d2b6a1f87..fa6d45c6f2 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -164,7 +164,14 @@ add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/include/xbt.h COMMAND ${CMAKE_COMMAND} -E echo "uninstall include ok" COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/simgrid_update_xml.1 - COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/tesh.1 + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/tesh.1 + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/smpicc.1 + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/smpicxx.1 + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/smpirun.1 + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/smpiff.1 + COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_INSTALL_PREFIX}/share/man/man1/smpif90.1 + + COMMAND ${CMAKE_COMMAND} -E echo "uninstall man ok" WORKING_DIRECTORY "${CMAKE_INSTALL_PREFIX}" ) diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp new file mode 100644 index 0000000000..29aeb32054 --- /dev/null +++ b/src/surf/network_ib.cpp @@ -0,0 +1,5 @@ +/* Copyright (c) 2014. 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. */ diff --git a/src/surf/network_ib.hpp b/src/surf/network_ib.hpp new file mode 100644 index 0000000000..b7d17157c5 --- /dev/null +++ b/src/surf/network_ib.hpp @@ -0,0 +1,43 @@ +/* Copyright (c) 2014. 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_IB_HPP_ +#define SURF_NETWORK_IB_HPP_ + +class NetworkIBModel : public NetworkModel { +private: +public: + NetworkIBModel(); + NetworkIBModel(const char *name); + ~NetworkModel(); + virtual ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst, + double size, double rate); + virtual NetworkLinkPtr createNetworkLink(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); +}; + +class NetworkIBLink : public NetworkLink { +private: +public: + NetworkIBLink(NetworkModelPtr model, const char *name, xbt_dict_t props); + NetworkIBLink(NetworkModelPtr model, const char *name, xbt_dict_t props, + lmm_constraint_t constraint, + tmgr_history_t history, + tmgr_trace_t state_trace); + ~NetworkIBLink(); + virtual void updateLatency(double value, double date=surf_get_clock()); + virtual void updateBandwidth(double value, double date=surf_get_clock()); + + +}; +#endif diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp index 770acf898d..b532f72be4 100644 --- a/src/surf/network_interface.hpp +++ b/src/surf/network_interface.hpp @@ -27,31 +27,31 @@ typedef NetworkAction *NetworkActionPtr; *************/ /** @ingroup SURF_callbacks - * @brief Callbacks handler which emit the callbacks after NetworkLink creation + * @brief Callbacks handler which emits 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 + * @brief Callbacks handler which emits 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 + * @brief Callbacks handler which emits 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 + * @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)` */ 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 + * @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)` */ XBT_PUBLIC_DATA( surf_callback(void, NetworkActionPtr, RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate)) networkCommunicateCallbacks; @@ -68,7 +68,7 @@ XBT_PUBLIC(void) net_add_traces(); *********/ /** @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: @@ -150,10 +150,11 @@ public: void (*f_networkSolve)(lmm_system_t); /** - * @brief Gets the right multiplicative factor for the latency. - * @details According to the model, the effective latency when sending - * a message might be different from the theoretical latency in function - * of its size. In order to account for this, this function get this factor. + * @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 The size of the message. * @return The latency factor. @@ -161,10 +162,11 @@ public: virtual double latencyFactor(double size); /** - * @brief Gets the right multiplicative factor for the bandwidth. - * @details According to the model, the effective bandwidth when sending - * a message might be different from the theoretical bandwidth in function - * of its size. In order to account for this, this function get this 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. * * @param size The size of the message. * @return The bandwidth factor. @@ -172,9 +174,9 @@ public: virtual double bandwidthFactor(double size); /** - * @brief Gets definitive bandwidth. + * @brief Get definitive bandwidth. * @details It gives the minimum bandwidth between the one that would - * occur if no limitation was enforced, and the maximum wanted bandwidth + * 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. @@ -190,14 +192,14 @@ public: ************/ /** @ingroup SURF_network_interface * @brief SURF network link interface class - * @details A NetworkLink represent the link between two [Workstations](\ref Workstation) + * @details A NetworkLink represents the link between two [Workstations](\ref Workstation) */ class NetworkLink : public Resource { public: /** * @brief NetworkLink constructor * - * @param model The CpuModel associated to this NetworkLink + * @param model The NetworkModel associated to this NetworkLink * @param name The name of the NetworkLink * @param props Dictionary of properties associated to this NetworkLink */ @@ -206,7 +208,7 @@ public: /** * @brief NetworkLink constructor * - * @param model The CpuModel associated to this NetworkLink + * @param model The NetworkModel 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 @@ -214,9 +216,9 @@ public: * @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); + lmm_constraint_t constraint, + tmgr_history_t history, + tmgr_trace_t state_trace); /** * @brief NetworkLink destructor @@ -249,7 +251,6 @@ public: /** * @brief Check if the NetworkLink is shared - * @details [long description] * * @return true if the current NetwokrLink is shared, false otherwise */ @@ -279,7 +280,8 @@ public: **********/ /** @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 + * [Workstations](\ref Workstation) */ class NetworkAction : public Action { public: @@ -299,7 +301,8 @@ public: * @param model The NetworkModel associated to this NetworkAction * @param cost The cost of this NetworkAction in [TODO] * @param failed [description] - * @param var The lmm variable associated to this Action if it is part of a LMM component + * @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) {};