X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18d23a87c23647366cfffbc61d3f7c632301159c..4429a5bdc377b1e8e1e6b1eefc3c56a5f251a47d:/src/surf/network_cm02.hpp diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp index 67a20851a5..5fb0290408 100644 --- a/src/surf/network_cm02.hpp +++ b/src/surf/network_cm02.hpp @@ -1,94 +1,88 @@ -#include "network_interface.hpp" -#include "xbt/fifo.h" -#include "xbt/graph.h" +/* Copyright (c) 2013-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_CM02_HPP_ #define SURF_NETWORK_CM02_HPP_ +#include + +#include "network_interface.hpp" +#include "xbt/graph.h" + + + /*********** * Classes * ***********/ -class NetworkCm02Model; -typedef NetworkCm02Model *NetworkCm02ModelPtr; -class NetworkCm02LinkLmm; -typedef NetworkCm02LinkLmm *NetworkCm02LinkLmmPtr; +namespace simgrid { + namespace surf { -class NetworkCm02ActionLmm; -typedef NetworkCm02ActionLmm *NetworkCm02ActionLmmPtr; - -/********* - * Tools * - *********/ + class XBT_PRIVATE NetworkCm02Model; + class XBT_PRIVATE NetworkCm02Action; + class XBT_PRIVATE NetworkSmpiModel; -void net_define_callbacks(void); + } +} /********* * Model * *********/ -class NetworkCm02Model : public NetworkModel { -private: - void initialize(); -public: - NetworkCm02Model(int /*i*/) : NetworkModel("network") { - f_networkSolve = lmm_solve; - m_haveGap = false; - };//FIXME: add network clean interface - NetworkCm02Model(const char *name) : NetworkModel(name) { - this->initialize(); - } - NetworkCm02Model() : NetworkModel("network") { - this->initialize(); - } - ~NetworkCm02Model() { + +namespace simgrid { + namespace surf { + + class NetworkCm02Model : public NetworkModel { + public: + NetworkCm02Model(); + explicit NetworkCm02Model(void (*solve_fun)(lmm_system_t self)); + virtual ~NetworkCm02Model() = default; + LinkImpl* createLink(const char* name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy) override; + void updateActionsStateLazy(double now, double delta) override; + void updateActionsStateFull(double now, double delta) override; + Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; + virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action); + + protected: + bool haveGap_ = false; + }; + + /************ + * Resource * + ************/ + + class NetworkCm02Link : public LinkImpl { + public: + NetworkCm02Link(NetworkCm02Model* model, const char* name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy, lmm_system_t system); + virtual ~NetworkCm02Link() = default; + void apply_event(tmgr_trace_iterator_t event, double value) override; + void setBandwidth(double value) override; + void setLatency(double value) override; + virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action); + }; + + + /********** + * Action * + **********/ + class NetworkCm02Action : public NetworkAction { + friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate); + friend NetworkSmpiModel; + public: + NetworkCm02Action(Model *model, double cost, bool failed) + : NetworkAction(model, cost, failed) {}; + virtual ~NetworkCm02Action() = default; + void updateRemainingLazy(double now) override; + protected: + double senderGap_; + }; + } - 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); - void updateActionsStateLazy(double now, double delta); - ActionPtr communicate(RoutingEdgePtr src, RoutingEdgePtr dst, - double size, double rate); -}; - -/************ - * Resource * - ************/ - -class NetworkCm02LinkLmm : public NetworkLinkLmm { -public: - NetworkCm02LinkLmm(NetworkCm02ModelPtr model, const char *name, xbt_dict_t props, - lmm_system_t system, - double constraint_value, - tmgr_history_t history, - e_surf_resource_state_t state_init, - tmgr_trace_t state_trace, - double metric_peak, - tmgr_trace_t metric_trace, - double lat_initial, - tmgr_trace_t lat_trace, - e_surf_link_sharing_policy_t policy); - void updateState(tmgr_trace_event_t event_type, double value, double date); -}; - - -/********** - * Action * - **********/ - -class NetworkCm02ActionLmm : public NetworkActionLmm { - friend ActionPtr NetworkCm02Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate); - -public: - NetworkCm02ActionLmm(ModelPtr model, double cost, bool failed) - : Action(model, cost, failed) {}; - void updateRemainingLazy(double now); - void recycle(); -}; +} #endif /* SURF_NETWORK_CM02_HPP_ */