X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d67dd902c1ba20335b3446d7462d046f984ad3e4..e3b7b40594af0c6cae13e79ace27da724740fcf6:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 1ace36da3f..8b16ee0294 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -7,13 +7,16 @@ #define SURF_MODEL_H_ #include "xbt/signal.hpp" +#include "xbt/utility.hpp" #include "src/surf/surf_private.hpp" #include "surf/surf.hpp" -#include "xbt/heap.h" #include "xbt/str.h" +#include #include +#include +#include #include #include #include @@ -25,6 +28,10 @@ *********/ /* 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_latency_factor; extern XBT_PRIVATE double sg_bandwidth_factor; @@ -34,6 +41,28 @@ 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); +} + +static inline int double_equals(double value1, double value2, double precision) +{ + return (fabs(value1 - value2) < precision); +} + extern "C" { XBT_PUBLIC(double) surf_get_clock(); } @@ -66,8 +95,6 @@ enum heap_action_type{ * Action * **********/ -XBT_PRIVATE void surf_action_lmm_update_index_heap(void *action, int i); - /** \ingroup SURF_models * \brief List of initialized models */ @@ -76,6 +103,11 @@ 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) @@ -97,6 +129,12 @@ public: 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 * @@ -104,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 @@ -114,7 +152,7 @@ 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(); @@ -127,27 +165,27 @@ public: void finish(Action::State state); /** @brief Get the [state](\ref simgrid::surf::Action::State) of the current Action */ - Action::State getState(); /**< get the state*/ + 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 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 cost_;} + double getCost() const { return cost_; } /** @brief Set the cost of the current action */ void setCost(double cost) {cost_ = cost;} @@ -164,7 +202,7 @@ public: /** @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) {finishTime_ = value;} @@ -189,27 +227,25 @@ public: virtual bool isSuspended(); /** @brief Get the maximum duration of the current action */ - double getMaxDuration() {return 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 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 sharingWeight_; }; + double getPriority() const { return sharingWeight_; }; /** @brief Set the priority of the current Action */ virtual void setSharingWeight(double priority); void setSharingWeightNoUpdate(double weight) { sharingWeight_ = weight; } /** @brief Get the state set in which the action is */ - ActionList* getStateSet() {return stateSet_;}; + ActionList* getStateSet() const { return stateSet_; }; - s_xbt_swag_hookup_t stateHookup_ = {nullptr,nullptr}; - - simgrid::surf::Model* getModel() { return model_; } + simgrid::surf::Model* getModel() const { return model_; } protected: ActionList* stateSet_; @@ -229,29 +265,28 @@ private: void *data_ = nullptr; /**< for your convenience */ /* LMM */ - double lastUpdate_ = 0; - double lastValue_ = 0; - lmm_variable_t variable_ = nullptr; - enum heap_action_type hat_ = NOTSET; - int indexHeap_; + 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(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 variable_;} + 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() {return lastUpdate_;} + double getLastUpdate() const { return lastUpdate_; } void refreshLastUpdate() {lastUpdate_ = surf_get_clock();} - double getLastValue() { return lastValue_; } + double getLastValue() const { return lastValue_; } void setLastValue(double val) { lastValue_ = val; } - enum heap_action_type getHat() { return hat_; } - bool is_linked() {return action_lmm_hook.is_linked();} - int getIndexHeap() { return indexHeap_; } + enum heap_action_type getHat() const { return hat_; } + bool is_linked() const { return action_lmm_hook.is_linked(); } protected: - int suspended_ = 0; + Action::SuspendStates suspended_ = Action::SuspendStates::not_suspended; }; typedef Action::ActionList ActionList; @@ -275,32 +310,36 @@ public: virtual ~Model(); /** @brief Get the set of [actions](@ref Action) in *ready* state */ - virtual ActionList* getReadyActionSet() {return readyActionSet_;} + virtual ActionList* getReadyActionSet() const { return readyActionSet_; } /** @brief Get the set of [actions](@ref Action) in *running* state */ - virtual ActionList* getRunningActionSet() {return runningActionSet_;} + virtual ActionList* getRunningActionSet() const { return runningActionSet_; } /** @brief Get the set of [actions](@ref Action) in *failed* state */ - virtual ActionList* getFailedActionSet() {return failedActionSet_;} + virtual ActionList* getFailedActionSet() const { return failedActionSet_; } /** @brief Get the set of [actions](@ref Action) in *done* state */ - virtual ActionList* getDoneActionSet() {return doneActionSet_;} + virtual ActionList* getDoneActionSet() const { return doneActionSet_; } /** @brief Get the set of modified [actions](@ref Action) */ - virtual ActionLmmListPtr getModifiedSet() {return modifiedSet_;} + virtual ActionLmmListPtr getModifiedSet() const { return modifiedSet_; } /** @brief Get the maxmin system of the current Model */ - lmm_system_t getMaxminSystem() {return 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 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 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 @@ -340,7 +379,7 @@ private: ActionList* runningActionSet_; /**< Actions in state SURF_ACTION_RUNNING */ ActionList* failedActionSet_; /**< Actions in state SURF_ACTION_FAILED */ ActionList* doneActionSet_; /**< Actions in state SURF_ACTION_DONE */ - xbt_heap_t actionHeap_; + heap_type actionHeap_; }; } @@ -400,6 +439,9 @@ public: /** @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 */ virtual bool isOn() const; /** @brief Check if the current Resource is shut down */