X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/638b21d2071c77f39da2f322156f05f75bf91517..29cedcb0af274d0dd82224451767e8d01162d734:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 3bccf4d1eb..f51e48b690 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-2016. 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. */ @@ -15,64 +14,15 @@ #include #include -#include "surf/trace_mgr.h" + +#include + #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 - -// Deprecated: -#define surf_callback(arg1, ...) ::simgrid::surf::signal -#define surf_callback_connect(callback, fun_ptr) callback.connect(fun_ptr) -#define surf_callback_emit(callback, ...) callback(__VA_ARGS__) - -#ifdef _MSC_VER -#pragma warning( disable : 4251) -// 4251: needs to have dll-interface to be used by clients of class -#endif - -extern XBT_PRIVATE tmgr_history_t history; #define NO_MAX_DURATION -1.0 /********* @@ -97,13 +47,17 @@ extern XBT_PRIVATE double sg_sender_gap; namespace simgrid { namespace surf { -extern XBT_PRIVATE surf_callback(void, void) surfExitCallbacks; +extern XBT_PRIVATE simgrid::xbt::signal surfExitCallbacks; } } int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path); +static inline char* sg_storage_name(sg_storage_t storage) { + return storage->key; +} + /*********** * Classes * ***********/ @@ -120,11 +74,6 @@ enum heap_action_type{ *********/ /* 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 * @@ -148,6 +97,16 @@ public: typedef boost::intrusive::member_hook< Action, boost::intrusive::list_member_hook<>, &Action::action_hook> ActionOptions; typedef boost::intrusive::list ActionList; + + 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 ? */ + }; + private: /** * @brief Common initializations for the constructors @@ -182,9 +141,9 @@ public: void finish(); /** @brief Get the [state](\ref e_surf_action_state_t) of the current Action */ - e_surf_action_state_t getState(); /**< get the state*/ + Action::State 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); + virtual void setState(Action::State state); /** @brief Get the bound of the current Action */ double getBound(); @@ -261,28 +220,25 @@ public: /** @brief Get the state set in which the action is */ ActionList* getStateSet() {return p_stateSet;}; - s_xbt_swag_hookup_t p_stateHookup; + s_xbt_swag_hookup_t p_stateHookup = {NULL,NULL}; simgrid::surf::Model *getModel() {return p_model;} protected: ActionList* p_stateSet; - double m_priority; /**< priority (1.0 by default) */ - int m_refcount; + double m_priority = 1.0; /**< priority (1.0 by default) */ + int m_refcount = 1; 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 */ + double m_maxDuration = NO_MAX_DURATION; /*< max_duration (may fluctuate until the task is completed) */ + double m_finish = -1; /**< finish time : this is modified during the run and fluctuates until the task is completed */ private: double m_start; /**< start time */ - char *p_category; /**< tracing category for categorized resource utilization monitoring */ + char *p_category = NULL; /**< 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 */ + void *p_data = NULL; /**< for your convenience */ /* LMM */ public: @@ -300,11 +256,11 @@ public: protected: lmm_variable_t p_variable; - double m_lastValue; - double m_lastUpdate; - int m_suspended; + double m_lastValue = 0; + double m_lastUpdate = 0; + int m_suspended = 0; int m_indexHeap; - enum heap_action_type m_hat; + enum heap_action_type m_hat = NOTSET; }; typedef Action::ActionList ActionList; @@ -327,34 +283,32 @@ 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() {return readyActionSet_;} /** @brief Get the set of [actions](@ref Action) in *running* state */ - virtual ActionList* getRunningActionSet() {return p_runningActionSet;} + virtual ActionList* getRunningActionSet() {return runningActionSet_;} /** @brief Get the set of [actions](@ref Action) in *failed* state */ - virtual ActionList* getFailedActionSet() {return p_failedActionSet;} + virtual ActionList* getFailedActionSet() {return failedActionSet_;} /** @brief Get the set of [actions](@ref Action) in *done* state */ - virtual ActionList* getDoneActionSet() {return p_doneActionSet;} + virtual ActionList* getDoneActionSet() {return doneActionSet_;} /** @brief Get the set of modified [actions](@ref Action) */ - virtual ActionLmmListPtr getModifiedSet() {return p_modifiedSet;} + virtual ActionLmmListPtr getModifiedSet() {return modifiedSet_;} /** @brief Get the maxmin system of the current Model */ - lmm_system_t getMaxminSystem() {return p_maxminSystem;} + lmm_system_t getMaxminSystem() {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() {return updateMechanism_;} /** @brief Get Action heap */ - xbt_heap_t getActionHeap() {return p_actionHeap;} + xbt_heap_t getActionHeap() {return actionHeap_;} /** * @brief Share the resources between the actions @@ -362,12 +316,11 @@ 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); + virtual double next_occuring_event(double now); + virtual double next_occuring_event_lazy(double now); + virtual double next_occuring_event_full(double now); double shareResourcesMaxMin(ActionList* running_actions, - lmm_system_t sys, - void (*solve) (lmm_system_t)); + lmm_system_t sys, void (*solve) (lmm_system_t)); /** * @brief Update action to the current time @@ -384,20 +337,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 next_occuring_event_isIdempotent()=0; 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; + e_UM_t updateMechanism_ = UM_UNDEFINED; + int selectiveUpdate_; + xbt_heap_t actionHeap_; 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 */ + 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 */ }; } @@ -413,7 +366,7 @@ private: typedef struct { 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 */ + tmgr_trace_iterator_t event; /**< The associated trace event associated to the metric */ } s_surf_metric_t; namespace simgrid { @@ -425,38 +378,33 @@ namespace surf { */ 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 - * @param props Dictionary of properties associated to this Resource */ - Resource(Model *model, const char *name, xbt_dict_t props); + Resource(Model *model, const char *name); /** * @brief Constructor of LMM Resources * * @param model Model associated to this Resource * @param name The name of the Resource - * @param props Dictionary of properties associated to this Resource * @param constraint The lmm constraint associated to this Resource if it is part of a LMM component */ - Resource(Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint); + Resource(Model *model, const char *name, lmm_constraint_t constraint); - Resource(Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint, e_surf_resource_state_t stateInit); + Resource(Model *model, const char *name, lmm_constraint_t constraint, int initiallyOn); /** * @brief Resource constructor * * @param model Model associated to this Resource * @param name The name of the Resource - * @param props Dictionary of properties associated to this Resource - * @param stateInit the initial state of the Resource + * @param initiallyOn the initial state of the Resource */ - Resource(Model *model, const char *name, xbt_dict_t props, e_surf_resource_state_t stateInit); + Resource(Model *model, const char *name, int initiallyOn); virtual ~Resource(); @@ -466,47 +414,36 @@ public: /** @brief Get the name of the current Resource */ const char *getName(); - /** @brief Get the properties of the current Resource */ - virtual xbt_dict_t getProperties(); - /** - * @brief Update the state of the current Resource - * @details [TODO] + * @brief Apply an event of external load event to that storage * - * @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_iterator_t event, double value)=0; /** @brief Check if the current Resource is used (if it currently serves an action) */ virtual bool isUsed()=0; /** @brief Check if the current Resource is active */ - bool isOn(); + virtual bool isOn(); + /** @brief Check if the current Resource is shut down */ + virtual bool isOff(); /** @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); + virtual void turnOff(); private: const char *p_name; - xbt_dict_t p_properties; Model *p_model; - bool m_running; - e_surf_resource_state_t m_stateCurrent; - + bool m_isOn; 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; +protected: + lmm_constraint_t p_constraint = nullptr; }; }