X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4f6578bb22ea8413ac5e5cc6fe902ab2c925c577..a34d8237b8267686bbd259670f27da273ff5236e:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index b9f27ee289..61bfdca0d6 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -33,7 +33,12 @@ #define surf_callback_emit(callback, ...) callback(__VA_ARGS__) #endif -extern tmgr_history_t history; +#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 using namespace std; @@ -43,36 +48,27 @@ using namespace std; *********/ /* user-visible parameters */ -extern double sg_tcp_gamma; -extern double sg_sender_gap; -extern double sg_latency_factor; -extern double sg_bandwidth_factor; -extern double sg_weight_S_parameter; -extern int sg_network_crosstraffic; -extern xbt_dynar_t surf_path; +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 "C" { XBT_PUBLIC(double) surf_get_clock(void); } -extern double sg_sender_gap; +extern XBT_PRIVATE double sg_sender_gap; -extern surf_callback(void, void) surfExitCallbacks; +extern XBT_PRIVATE surf_callback(void, void) surfExitCallbacks; -int __surf_is_absolute_file_path(const char *file_path); +int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path); /*********** * Classes * ***********/ -typedef boost::intrusive::list ActionList; -typedef ActionList* ActionListPtr; -typedef boost::intrusive::list_base_hook<> actionHook; - -struct lmmTag; -typedef boost::intrusive::list > > > ActionLmmList; -typedef ActionLmmList* ActionLmmListPtr; -typedef boost::intrusive::list_base_hook > actionLmmHook; - enum heap_action_type{ LATENCY = 100, @@ -92,6 +88,188 @@ 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); + +/** @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) + */ +XBT_PUBLIC_CLASS Action { +public: + boost::intrusive::list_member_hook<> action_hook; + boost::intrusive::list_member_hook<> action_lmm_hook; + 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(Model *model, double cost, bool failed, + lmm_variable_t var = NULL); + +public: + /** + * @brief Action constructor + * + * @param model The Model associated to this Action + * @param cost The cost of the Action + * @param failed If the action is impossible (e.g.: execute something on a switched off host) + */ + Action(Model *model, double cost, bool failed); + + /** + * @brief Action constructor + * + * @param model The Model associated to this Action + * @param cost The cost of the Action + * @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(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 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 bound of the current Action */ + double getBound(); + /** @brief Set the bound of the current Action */ + void setBound(double bound); + + /** @brief Get the start time of the current action */ + double getStartTime(); + /** @brief Get the finish time of the current action */ + double getFinishTime(); + + /** @brief Get the user data associated to the current action */ + void *getData() {return p_data;} + /** @brief Set the user data associated to the current action */ + void setData(void* data); + + /** @brief Get the cost of the current action */ + double getCost() {return m_cost;} + /** @brief Set the cost of the current action */ + void setCost(double cost) {m_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);} + + /** @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);} + + /** @brief Set the remaining time of the current action */ + void setRemains(double value) {m_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(); + + /** @brief Set the finish time of the current action */ + void setFinishTime(double value) {m_finish = value;} + + /**@brief Add a reference to the current action (refcounting) */ + void ref(); + /** @brief Unref that action (and destroy it if refcount reaches 0) + * @return true if the action was destroyed and false if someone still has references on it + */ + virtual int unref(); + + /** @brief Cancel the current Action if running */ + virtual void cancel(); + + /** @brief Suspend the current Action */ + virtual void suspend(); + + /** @brief Resume the current Action */ + virtual void resume(); + + /** @brief Returns true if the current action is running */ + virtual bool isSuspended(); + + /** @brief Get the maximum duration of the current action */ + double getMaxDuration() {return m_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;} + /** @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;}; + /** @brief Set the priority of the current Action */ + virtual void setPriority(double priority); + + /** @brief Get the state set in which the action is */ + ActionList* getStateSet() {return p_stateSet;}; + + s_xbt_swag_hookup_t p_stateHookup; + + Model *getModel() {return p_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 */ + +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; + Model *p_model; + void *p_data; /**< 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(); + +protected: + lmm_variable_t p_variable; + double m_lastValue; + double m_lastUpdate; + int m_suspended; + int m_indexHeap; + enum heap_action_type m_hat; +}; + +typedef Action::ActionList ActionList; + +typedef boost::intrusive::member_hook< + Action, boost::intrusive::list_member_hook<>, &Action::action_lmm_hook> ActionLmmOptions; +typedef boost::intrusive::list ActionLmmList; +typedef ActionLmmList* ActionLmmListPtr; + /********* * Model * *********/ @@ -115,28 +293,28 @@ public: * * @return The set of [actions](@ref Action) in *ready* state */ - virtual ActionListPtr getReadyActionSet() {return p_readyActionSet;} + virtual ActionList* getReadyActionSet() {return p_readyActionSet;} /** * @brief Get the set of [actions](@ref Action) in *running* state * * @return The set of [actions](@ref Action) in *running* state */ - virtual ActionListPtr getRunningActionSet() {return p_runningActionSet;} + virtual ActionList* getRunningActionSet() {return p_runningActionSet;} /** * @brief Get the set of [actions](@ref Action) in *failed* state * * @return The set of [actions](@ref Action) in *failed* state */ - virtual ActionListPtr getFailedActionSet() {return p_failedActionSet;} + virtual ActionList* getFailedActionSet() {return p_failedActionSet;} /** * @brief Get the set of [actions](@ref Action) in *done* state * * @return The set of [actions](@ref Action) in *done* state */ - virtual ActionListPtr getDoneActionSet() {return p_doneActionSet;} + virtual ActionList* getDoneActionSet() {return p_doneActionSet;} /** * @brief Get the set of modified [actions](@ref Action) @@ -178,7 +356,7 @@ public: virtual double shareResources(double now); virtual double shareResourcesLazy(double now); virtual double shareResourcesFull(double now); - double shareResourcesMaxMin(ActionListPtr running_actions, + double shareResourcesMaxMin(ActionList* running_actions, lmm_system_t sys, void (*solve) (lmm_system_t)); @@ -208,10 +386,10 @@ protected: xbt_heap_t p_actionHeap; private: - ActionListPtr p_readyActionSet; /**< Actions in state SURF_ACTION_READY */ - ActionListPtr p_runningActionSet; /**< Actions in state SURF_ACTION_RUNNING */ - ActionListPtr p_failedActionSet; /**< Actions in state SURF_ACTION_FAILED */ - ActionListPtr p_doneActionSet; /**< Actions in state SURF_ACTION_DONE */ + 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 */ }; /************ @@ -358,173 +536,4 @@ private: lmm_constraint_t p_constraint; }; -/********** - * Action * - **********/ -void surf_action_lmm_update_index_heap(void *action, int i); - -/** @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) - */ -XBT_PUBLIC_CLASS Action : public actionHook, public actionLmmHook { -private: - /** - * @brief Common initializations for the constructors - */ - void initialize(Model *model, double cost, bool failed, - lmm_variable_t var = NULL); - -public: - /** - * @brief Action constructor - * - * @param model The Model associated to this Action - * @param cost The cost of the Action - * @param failed If the action is impossible (e.g.: execute something on a switched off host) - */ - Action(Model *model, double cost, bool failed); - - /** - * @brief Action constructor - * - * @param model The Model associated to this Action - * @param cost The cost of the Action - * @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(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 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 bound of the current Action */ - double getBound(); - /** @brief Set the bound of the current Action */ - void setBound(double bound); - - /** @brief Get the start time of the current action */ - double getStartTime(); - /** @brief Get the finish time of the current action */ - double getFinishTime(); - - /** @brief Get the user data associated to the current action */ - void *getData() {return p_data;} - /** @brief Set the user data associated to the current action */ - void setData(void* data); - - /** @brief Get the cost of the current action */ - double getCost() {return m_cost;} - /** @brief Set the cost of the current action */ - void setCost(double cost) {m_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);} - - /** @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);} - - /** @brief Set the remaining time of the current action */ - void setRemains(double value) {m_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(); - - /** @brief Set the finish time of the current action */ - void setFinishTime(double value) {m_finish = value;} - - /**@brief Add a reference to the current action (refcounting) */ - void ref(); - /** @brief Unref that action (and destroy it if refcount reaches 0) - * @return true if the action was destroyed and false if someone still has references on it - */ - virtual int unref(); - - /** @brief Cancel the current Action if running */ - virtual void cancel(); - - /** @brief Suspend the current Action */ - virtual void suspend(); - - /** @brief Resume the current Action */ - virtual void resume(); - - /** @brief Returns true if the current action is running */ - virtual bool isSuspended(); - - /** @brief Get the maximum duration of the current action */ - double getMaxDuration() {return m_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;} - /** @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;}; - /** @brief Set the priority of the current Action */ - virtual void setPriority(double priority); - - /** @brief Get the state set in which the action is */ - ActionListPtr getStateSet() {return p_stateSet;}; - - s_xbt_swag_hookup_t p_stateHookup; - - Model *getModel() {return p_model;} - -protected: - ActionListPtr 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 */ - -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; - Model *p_model; - void *p_data; /**< 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 actionLmmHook::is_linked();} - void gapRemove(); - -protected: - lmm_variable_t p_variable; - double m_lastValue; - double m_lastUpdate; - int m_suspended; - int m_indexHeap; - enum heap_action_type m_hat; -}; - #endif /* SURF_MODEL_H_ */