X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5c43aef2965152efda04e73ef38c90f8ee5d1401..e3b7b40594af0c6cae13e79ace27da724740fcf6:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 695fe11cc7..8b16ee0294 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2004-2015. 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. */ @@ -7,62 +6,21 @@ #ifndef SURF_MODEL_H_ #define SURF_MODEL_H_ -#include -#include -#include -#include -#include +#include "xbt/signal.hpp" +#include "xbt/utility.hpp" + +#include "src/surf/surf_private.hpp" +#include "surf/surf.hpp" +#include "xbt/str.h" -#include +#include #include -#include "surf/trace_mgr.h" -#include "xbt/lib.h" -#include "surf/surf_routing.h" -#include "simgrid/platf_interface.h" -#include "surf/surf.h" -#include "src/surf/surf_private.h" -#include "src/internal_config.h" - -#ifdef LIBSIGC -#include -namespace simgrid { -namespace surf { - // Wraps sigc++ signals with the interface of boost::signals2: - template class signal; - template - class signal { - private: - sigc::signal sig_; - public: - template XBT_ALWAYS_INLINE - void connect(T&& slot) - { - sig_.connect(std::forward(slot)); - } - template XBT_ALWAYS_INLINE - void connect(Res(*slot)(Args...)) - { - sig_.connect(sigc::ptr_fun(slot)); - } - template - R operator()(Args&&... args) const - { - return sig_.emit(std::forward(args)...); - } - }; -} -} -#else -#include -namespace simgrid { -namespace surf { - template - using signal = ::boost::signals2::signal; -} -} -#endif +#include +#include +#include +#include +#include -extern XBT_PRIVATE tmgr_history_t history; #define NO_MAX_DURATION -1.0 /********* @@ -70,25 +28,53 @@ extern XBT_PRIVATE tmgr_history_t history; *********/ /* user-visible parameters */ +XBT_PUBLIC_DATA(double) sg_maxmin_precision; +XBT_PUBLIC_DATA(double) sg_surf_precision; +XBT_PUBLIC_DATA(int) sg_concurrency_limit; + extern XBT_PRIVATE double sg_tcp_gamma; -extern XBT_PRIVATE double sg_sender_gap; extern XBT_PRIVATE double sg_latency_factor; extern XBT_PRIVATE double sg_bandwidth_factor; extern XBT_PRIVATE double sg_weight_S_parameter; extern XBT_PRIVATE int sg_network_crosstraffic; -extern XBT_PRIVATE xbt_dynar_t surf_path; +extern XBT_PRIVATE std::vector surf_path; +extern XBT_PRIVATE std::unordered_map traces_set_list; +extern XBT_PRIVATE std::set watched_hosts; + +static inline void double_update(double* variable, double value, double precision) +{ + // printf("Updating %g -= %g +- %g\n",*variable,value,precision); + // xbt_assert(value==0 || value>precision); + // Check that precision is higher than the machine-dependent size of the mantissa. If not, brutal rounding may + // happen, and the precision mechanism is not active... + // xbt_assert(*variable< (2< precision); } -extern XBT_PRIVATE double sg_sender_gap; +static inline int double_equals(double value1, double value2, double precision) +{ + return (fabs(value1 - value2) < precision); +} + +extern "C" { +XBT_PUBLIC(double) surf_get_clock(); +} +/** \ingroup SURF_simulation + * \brief List of hosts that have just restarted and whose autorestart process should be restarted. + */ +XBT_PUBLIC_DATA(std::vector) host_that_restart; namespace simgrid { namespace surf { -extern XBT_PRIVATE simgrid::surf::signal surfExitCallbacks; - +extern XBT_PRIVATE simgrid::xbt::signal surfExitCallbacks; } } @@ -105,28 +91,23 @@ enum heap_action_type{ NOTSET }; -/********* - * Trace * - *********/ -/* For the trace and trace:connect tag (store their content till the end of the parsing) */ -XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list; -XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_host_avail; -XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_power; -XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_avail; -XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_bandwidth; -XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency; - /********** * Action * **********/ -XBT_PRIVATE void surf_action_lmm_update_index_heap(void *action, int i); - -XBT_PUBLIC_DATA(xbt_dynar_t) all_existing_models; +/** \ingroup SURF_models + * \brief List of initialized models + */ +XBT_PUBLIC_DATA(std::vector*) all_existing_models; namespace simgrid { namespace surf { +typedef std::pair heap_element_type; +typedef boost::heap::pairing_heap, boost::heap::stable, + boost::heap::compare>> + heap_type; + /** @ingroup SURF_interface * @brief SURF action interface class * @details An action is an event generated by a resource (e.g.: a communication for the network) @@ -138,14 +119,22 @@ public: typedef boost::intrusive::member_hook< Action, boost::intrusive::list_member_hook<>, &Action::action_hook> ActionOptions; typedef boost::intrusive::list ActionList; -private: - /** - * @brief Common initializations for the constructors - */ - void initialize(simgrid::surf::Model *model, double cost, bool failed, - lmm_variable_t var = NULL); -public: + enum class State { + ready = 0, /**< Ready */ + running, /**< Running */ + failed, /**< Task Failure */ + done, /**< Completed */ + to_free, /**< Action to free in next cleanup */ + not_in_the_system /**< Not in the system anymore. Why did you ask ? */ + }; + + enum class SuspendStates { + not_suspended = 0, /**< Action currently not suspended **/ + suspended, + sleeping + }; + /** * @brief Action constructor * @@ -153,7 +142,7 @@ public: * @param cost The cost of the Action * @param failed If the action is impossible (e.g.: execute something on a switched off host) */ - Action(simgrid::surf::Model *model, double cost, bool failed); + Action(simgrid::surf::Model* model, double cost, bool failed); /** * @brief Action constructor @@ -163,56 +152,60 @@ public: * @param failed If the action is impossible (e.g.: execute something on a switched off host) * @param var The lmm variable associated to this Action if it is part of a LMM component */ - Action(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var); + Action(simgrid::surf::Model* model, double cost, bool failed, lmm_variable_t var); /** @brief Destructor */ virtual ~Action(); - /** @brief Mark that the action is now finished */ - void finish(); + /** + * @brief Mark that the action is now finished + * + * @param state the new [state](\ref simgrid::surf::Action::State) of the current Action + */ + void finish(Action::State state); - /** @brief Get the [state](\ref e_surf_action_state_t) of the current Action */ - e_surf_action_state_t getState(); /**< get the state*/ - /** @brief Set the [state](\ref e_surf_action_state_t) of the current Action */ - virtual void setState(e_surf_action_state_t state); + /** @brief Get the [state](\ref simgrid::surf::Action::State) of the current Action */ + Action::State getState() const; /**< get the state*/ + /** @brief Set the [state](\ref simgrid::surf::Action::State) of the current Action */ + virtual void setState(Action::State state); /** @brief Get the bound of the current Action */ - double getBound(); + double getBound() const; /** @brief Set the bound of the current Action */ void setBound(double bound); /** @brief Get the start time of the current action */ - double getStartTime(); + double getStartTime() const { return start_; } /** @brief Get the finish time of the current action */ - double getFinishTime(); + double getFinishTime() const { return finishTime_; } /** @brief Get the user data associated to the current action */ - void *getData() {return p_data;} + void* getData() const { return data_; } /** @brief Set the user data associated to the current action */ - void setData(void* data); + void setData(void* data) { data_ = data; } /** @brief Get the cost of the current action */ - double getCost() {return m_cost;} + double getCost() const { return cost_; } /** @brief Set the cost of the current action */ - void setCost(double cost) {m_cost = cost;} + void setCost(double cost) {cost_ = cost;} /** @brief Update the maximum duration of the current action * @param delta Amount to remove from the MaxDuration */ - void updateMaxDuration(double delta) {double_update(&m_maxDuration, delta,sg_surf_precision);} + void updateMaxDuration(double delta) {double_update(&maxDuration_, delta,sg_surf_precision);} /** @brief Update the remaining time of the current action * @param delta Amount to remove from the remaining time */ - void updateRemains(double delta) {double_update(&m_remains, delta, sg_maxmin_precision*sg_surf_precision);} + void updateRemains(double delta) {double_update(&remains_, delta, sg_maxmin_precision*sg_surf_precision);} /** @brief Set the remaining time of the current action */ - void setRemains(double value) {m_remains = value;} + void setRemains(double value) {remains_ = value;} /** @brief Get the remaining time of the current action after updating the resource */ virtual double getRemains(); /** @brief Get the remaining time of the current action without updating the resource */ - double getRemainsNoUpdate(); + double getRemainsNoUpdate() const { return remains_; } /** @brief Set the finish time of the current action */ - void setFinishTime(double value) {m_finish = value;} + void setFinishTime(double value) {finishTime_ = value;} /**@brief Add a reference to the current action (refcounting) */ void ref(); @@ -234,67 +227,66 @@ public: virtual bool isSuspended(); /** @brief Get the maximum duration of the current action */ - double getMaxDuration() {return m_maxDuration;} + double getMaxDuration() const { return maxDuration_; } /** @brief Set the maximum duration of the current Action */ virtual void setMaxDuration(double duration); /** @brief Get the tracing category associated to the current action */ - char *getCategory() {return p_category;} + char* getCategory() const { return category_; } /** @brief Set the tracing category of the current Action */ void setCategory(const char *category); /** @brief Get the priority of the current Action */ - double getPriority() {return m_priority;}; + double getPriority() const { return sharingWeight_; }; /** @brief Set the priority of the current Action */ - virtual void setPriority(double priority); + virtual void setSharingWeight(double priority); + void setSharingWeightNoUpdate(double weight) { sharingWeight_ = weight; } /** @brief Get the state set in which the action is */ - ActionList* getStateSet() {return p_stateSet;}; - - s_xbt_swag_hookup_t p_stateHookup; + ActionList* getStateSet() const { return stateSet_; }; - simgrid::surf::Model *getModel() {return p_model;} + simgrid::surf::Model* getModel() const { return model_; } protected: - ActionList* p_stateSet; - double m_priority; /**< priority (1.0 by default) */ - int m_refcount; - double m_remains; /**< How much of that cost remains to be done in the currently running task */ - double m_maxDuration; /*< max_duration (may fluctuate until the task is completed) */ - double m_finish; /**< finish time : this is modified during the run and fluctuates until the task is completed */ + ActionList* stateSet_; + int refcount_ = 1; private: - double m_start; /**< start time */ - char *p_category; /**< tracing category for categorized resource utilization monitoring */ - - #ifdef HAVE_LATENCY_BOUND_TRACKING - int m_latencyLimited; /**< Set to 1 if is limited by latency, 0 otherwise */ - #endif - double m_cost; - simgrid::surf::Model *p_model; - void *p_data; /**< for your convenience */ + double sharingWeight_ = 1.0; /**< priority (1.0 by default) */ + double maxDuration_ = NO_MAX_DURATION; /*< max_duration (may fluctuate until the task is completed) */ + double remains_; /**< How much of that cost remains to be done in the currently running task */ + double start_; /**< start time */ + char *category_ = nullptr; /**< tracing category for categorized resource utilization monitoring */ + double finishTime_ = + -1; /**< finish time : this is modified during the run and fluctuates until the task is completed */ + + double cost_; + simgrid::surf::Model *model_; + void *data_ = nullptr; /**< for your convenience */ /* LMM */ -public: - virtual void updateRemainingLazy(double now); - void heapInsert(xbt_heap_t heap, double key, enum heap_action_type hat); - void heapRemove(xbt_heap_t heap); - void heapUpdate(xbt_heap_t heap, double key, enum heap_action_type hat); - void updateIndexHeap(int i); - lmm_variable_t getVariable() {return p_variable;} - double getLastUpdate() {return m_lastUpdate;} - void refreshLastUpdate() {m_lastUpdate = surf_get_clock();} - enum heap_action_type getHat() {return m_hat;} - bool is_linked() {return action_lmm_hook.is_linked();} - void gapRemove(); + double lastUpdate_ = 0; + double lastValue_ = 0; + lmm_variable_t variable_ = nullptr; + enum heap_action_type hat_ = NOTSET; + boost::optional heapHandle_ = boost::none; +public: + virtual void updateRemainingLazy(double now) { THROW_IMPOSSIBLE; }; + void heapInsert(heap_type& heap, double key, enum heap_action_type hat); + void heapRemove(heap_type& heap); + void heapUpdate(heap_type& heap, double key, enum heap_action_type hat); + void clearHeapHandle() { heapHandle_ = boost::none; } + lmm_variable_t getVariable() const { return variable_; } + void setVariable(lmm_variable_t var) { variable_ = var; } + double getLastUpdate() const { return lastUpdate_; } + void refreshLastUpdate() {lastUpdate_ = surf_get_clock();} + double getLastValue() const { return lastValue_; } + void setLastValue(double val) { lastValue_ = val; } + enum heap_action_type getHat() const { return hat_; } + bool is_linked() const { return action_lmm_hook.is_linked(); } protected: - lmm_variable_t p_variable; - double m_lastValue; - double m_lastUpdate; - int m_suspended; - int m_indexHeap; - enum heap_action_type m_hat; + Action::SuspendStates suspended_ = Action::SuspendStates::not_suspended; }; typedef Action::ActionList ActionList; @@ -317,34 +309,37 @@ public: Model(); virtual ~Model(); - virtual void addTraces() =0; - /** @brief Get the set of [actions](@ref Action) in *ready* state */ - virtual ActionList* getReadyActionSet() {return p_readyActionSet;} + virtual ActionList* getReadyActionSet() const { return readyActionSet_; } /** @brief Get the set of [actions](@ref Action) in *running* state */ - virtual ActionList* getRunningActionSet() {return p_runningActionSet;} + virtual ActionList* getRunningActionSet() const { return runningActionSet_; } /** @brief Get the set of [actions](@ref Action) in *failed* state */ - virtual ActionList* getFailedActionSet() {return p_failedActionSet;} + virtual ActionList* getFailedActionSet() const { return failedActionSet_; } /** @brief Get the set of [actions](@ref Action) in *done* state */ - virtual ActionList* getDoneActionSet() {return p_doneActionSet;} + virtual ActionList* getDoneActionSet() const { return doneActionSet_; } /** @brief Get the set of modified [actions](@ref Action) */ - virtual ActionLmmListPtr getModifiedSet() {return p_modifiedSet;} + virtual ActionLmmListPtr getModifiedSet() const { return modifiedSet_; } /** @brief Get the maxmin system of the current Model */ - lmm_system_t getMaxminSystem() {return p_maxminSystem;} + lmm_system_t getMaxminSystem() const { return maxminSystem_; } /** * @brief Get the update mechanism of the current Model * @see e_UM_t */ - e_UM_t getUpdateMechanism() {return p_updateMechanism;} + e_UM_t getUpdateMechanism() const { return updateMechanism_; } + void setUpdateMechanism(e_UM_t mechanism) { updateMechanism_ = mechanism; } /** @brief Get Action heap */ - xbt_heap_t getActionHeap() {return p_actionHeap;} + heap_type& getActionHeap() { return actionHeap_; } + + double actionHeapTopDate() const { return actionHeap_.top().first; } + Action* actionHeapPop(); + bool actionHeapIsEmpty() const { return actionHeap_.empty(); } /** * @brief Share the resources between the actions @@ -352,12 +347,9 @@ public: * @param now The current time of the simulation * @return The delta of time till the next action will finish */ - virtual double shareResources(double now); - virtual double shareResourcesLazy(double now); - virtual double shareResourcesFull(double now); - double shareResourcesMaxMin(ActionList* running_actions, - lmm_system_t sys, - void (*solve) (lmm_system_t)); + virtual double nextOccuringEvent(double now); + virtual double nextOccuringEventLazy(double now); + virtual double nextOccuringEventFull(double now); /** * @brief Update action to the current time @@ -374,20 +366,20 @@ public: * The only model that is not is NS3: computing the next timestamp moves the model up to that point, * so we need to call it only when the next timestamp of other sources is computed. */ - virtual bool shareResourcesIsIdempotent()=0; + virtual bool nextOccuringEventIsIdempotent() { return true;} protected: - ActionLmmListPtr p_modifiedSet; - lmm_system_t p_maxminSystem; - e_UM_t p_updateMechanism = UM_UNDEFINED; - int m_selectiveUpdate; - xbt_heap_t p_actionHeap; + ActionLmmListPtr modifiedSet_; + lmm_system_t maxminSystem_ = nullptr; + bool selectiveUpdate_; private: - ActionList* p_readyActionSet; /**< Actions in state SURF_ACTION_READY */ - ActionList* p_runningActionSet; /**< Actions in state SURF_ACTION_RUNNING */ - ActionList* p_failedActionSet; /**< Actions in state SURF_ACTION_FAILED */ - ActionList* p_doneActionSet; /**< Actions in state SURF_ACTION_DONE */ + e_UM_t updateMechanism_ = UM_UNDEFINED; + ActionList* readyActionSet_; /**< Actions in state SURF_ACTION_READY */ + ActionList* runningActionSet_; /**< Actions in state SURF_ACTION_RUNNING */ + ActionList* failedActionSet_; /**< Actions in state SURF_ACTION_FAILED */ + ActionList* doneActionSet_; /**< Actions in state SURF_ACTION_DONE */ + heap_type actionHeap_; }; } @@ -400,31 +392,21 @@ private: /** @ingroup SURF_interface * @brief Resource which have a metric handled by a maxmin system */ -typedef struct { +struct s_surf_metric_t { double peak; /**< The peak of the metric, ie its max value */ double scale; /**< Current availability of the metric according to the traces, in [0,1] */ tmgr_trace_event_t event; /**< The associated trace event associated to the metric */ -} s_surf_metric_t; +}; namespace simgrid { namespace surf { /** @ingroup SURF_interface * @brief SURF resource interface class - * @details A resource represent an element of a component (e.g.: a link for the network) + * @details This is the ancestor class of every resources in SimGrid, such as links, CPU or storage */ XBT_PUBLIC_CLASS Resource { public: - Resource(); - - /** - * @brief Constructor of non-LMM Resources - * - * @param model Model associated to this Resource - * @param name The name of the Resource - */ - Resource(Model *model, const char *name); - /** * @brief Constructor of LMM Resources * @@ -432,72 +414,64 @@ public: * @param name The name of the Resource * @param constraint The lmm constraint associated to this Resource if it is part of a LMM component */ - Resource(Model *model, const char *name, lmm_constraint_t constraint); - - Resource(Model *model, const char *name, lmm_constraint_t constraint, e_surf_resource_state_t stateInit); - - /** - * @brief Resource constructor - * - * @param model Model associated to this Resource - * @param name The name of the Resource - * @param stateInit the initial state of the Resource - */ - Resource(Model *model, const char *name, e_surf_resource_state_t stateInit); + Resource(Model * model, const std::string& name, lmm_constraint_t constraint); virtual ~Resource(); /** @brief Get the Model of the current Resource */ - Model *getModel(); + Model* model() const; /** @brief Get the name of the current Resource */ - const char *getName(); + const std::string& getName() const; + /** @brief Get the name of the current Resource */ + const char* getCname() const; + + bool operator==(const Resource &other) const; /** - * @brief Update the state of the current Resource - * @details [TODO] + * @brief Apply an event of external load event to that resource * - * @param event_type [TODO] + * @param event What happened * @param value [TODO] - * @param date [TODO] */ - virtual void updateState(tmgr_trace_event_t event_type, double value, double date)=0; + virtual void apply_event(tmgr_trace_event_t event, double value) = 0; /** @brief Check if the current Resource is used (if it currently serves an action) */ virtual bool isUsed()=0; + /** @brief returns the current load (in flops per second, byte per second or similar) */ + virtual double getLoad(); + /** @brief Check if the current Resource is active */ - bool isOn(); + virtual bool isOn() const; + /** @brief Check if the current Resource is shut down */ + virtual bool isOff() const; /** @brief Turn on the current Resource */ - void turnOn(); + virtual void turnOn(); /** @brief Turn off the current Resource */ - void turnOff(); - - /** @brief Get the [state](\ref e_surf_resource_state_t) of the current Resource */ - virtual e_surf_resource_state_t getState(); - /** @brief Set the [state](\ref e_surf_resource_state_t) of the current Resource */ - virtual void setState(e_surf_resource_state_t state); - -protected: - void die(); - virtual void onDie(); + virtual void turnOff(); private: - bool alive_ = true; - const char *p_name; - Model *p_model; - bool m_running; - e_surf_resource_state_t m_stateCurrent; - + std::string name_; + Model *model_; + bool isOn_ = true; public: /* LMM */ - /** @brief Get the lmm constraint associated to this Resource if it is part of a LMM component */ - lmm_constraint_t getConstraint(); -private: - lmm_constraint_t p_constraint; + /** @brief Get the lmm constraint associated to this Resource if it is part of a LMM component (or null if none) */ + lmm_constraint_t constraint() const; + +protected: + const lmm_constraint_t constraint_ = nullptr; }; } } +namespace std { +template <> class hash { +public: + std::size_t operator()(const simgrid::surf::Resource& r) const { return (std::size_t)xbt_str_hash(r.getCname()); } +}; +} + #endif /* SURF_MODEL_H_ */