X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bd3b1e9e02dd5662a771c1b382cfa1d1d9a2e08..210348cdfd1477bb19ae82eef936ae55df71203a:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 3ca6f61049..f51e48b690 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -19,13 +19,10 @@ #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/surf/trace_mgr.hpp" #include "src/internal_config.h" -extern XBT_PRIVATE sg_future_evt_set_t future_evt_set; #define NO_MAX_DURATION -1.0 /********* @@ -57,6 +54,10 @@ 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 * ***********/ @@ -73,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 * @@ -101,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 @@ -135,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(); @@ -230,9 +236,6 @@ private: double m_start; /**< start time */ 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 = NULL; /**< for your convenience */ @@ -280,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 @@ -315,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 @@ -337,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 = nullptr; - 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 */ }; } @@ -415,14 +415,12 @@ public: const char *getName(); /** - * @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_iterator_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;