X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0946e187d72b37589478b0b6ee0d1f193df7f14d..d2d941a9e68e4389cd4148ccbe1cb35da63e54e4:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index de1665d759..8599ee8ae4 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -62,21 +62,9 @@ namespace surf { } #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 -using namespace std; - /********* * Utils * *********/ @@ -96,7 +84,13 @@ XBT_PUBLIC(double) surf_get_clock(void); extern XBT_PRIVATE double sg_sender_gap; -extern XBT_PRIVATE surf_callback(void, void) surfExitCallbacks; +namespace simgrid { +namespace surf { + +extern XBT_PRIVATE simgrid::surf::signal surfExitCallbacks; + +} +} int XBT_PRIVATE __surf_is_absolute_file_path(const char *file_path); @@ -125,8 +119,14 @@ 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; + +namespace simgrid { +namespace surf { + /** @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) @@ -142,7 +142,7 @@ private: /** * @brief Common initializations for the constructors */ - void initialize(Model *model, double cost, bool failed, + void initialize(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var = NULL); public: @@ -153,7 +153,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(Model *model, double cost, bool failed); + Action(simgrid::surf::Model *model, double cost, bool failed); /** * @brief Action constructor @@ -163,7 +163,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(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(); @@ -253,7 +253,7 @@ public: s_xbt_swag_hookup_t p_stateHookup; - Model *getModel() {return p_model;} + simgrid::surf::Model *getModel() {return p_model;} protected: ActionList* p_stateSet; @@ -271,7 +271,7 @@ private: int m_latencyLimited; /**< Set to 1 if is limited by latency, 0 otherwise */ #endif double m_cost; - Model *p_model; + simgrid::surf::Model *p_model; void *p_data; /**< for your convenience */ /* LMM */ @@ -307,7 +307,6 @@ typedef ActionLmmList* ActionLmmListPtr; /********* * Model * *********/ -XBT_PUBLIC_DATA(xbt_dynar_t) all_existing_models; /** @ingroup SURF_interface * @brief SURF model interface class @@ -391,6 +390,9 @@ private: ActionList* p_doneActionSet; /**< Actions in state SURF_ACTION_DONE */ }; +} +} + /************ * Resource * ************/ @@ -399,76 +401,58 @@ private: * @brief Resource which have a metric handled by a maxmin system */ typedef struct { - double scale; /**< The scale of the metric */ - double peak; /**< The peak of the metric */ + 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) */ XBT_PUBLIC_CLASS Resource { public: - /** - * @brief Resource constructor - */ Resource(); /** - * @brief Resource constructor + * @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 Resource constructor + * @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, 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 props Dictionary of properties associated to this Resource * @param stateInit 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, e_surf_resource_state_t stateInit); - /** - * @brief Resource destructor - */ virtual ~Resource(); - /** - * @brief Get the Model of the current Resource - * - * @return The Model of the current Resource - */ + /** @brief Get the Model of the current Resource */ Model *getModel(); - /** - * @brief Get the name of the current Resource - * - * @return The name of the current Resource - */ + /** @brief Get the name of the current Resource */ const char *getName(); - /** - * @brief Get the properties of the current Resource - * - * @return The properties of the current Resource - */ - virtual xbt_dict_t getProperties(); - /** * @brief Update the state of the current Resource * @details [TODO] @@ -479,60 +463,36 @@ public: */ virtual void updateState(tmgr_trace_event_t event_type, double value, double date)=0; - /** - * @brief Check if the current Resource is used - * @return true if the current Resource is used, false otherwise - */ + /** @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 - * - * @return true if the current Resource is active, false otherwise - */ + /** @brief Check if the current Resource is active */ bool isOn(); - - /** - * @brief Turn on the current Resource - */ + /** @brief Turn on the current Resource */ void turnOn(); - - /** - * @brief Turn off the current Resource - */ + /** @brief Turn off the current Resource */ void turnOff(); - /** - * @brief Get the [state](\ref e_surf_resource_state_t) of the current Resource - * - * @return The state of the currenrt Resource - */ + /** @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 - * - * @param state The new state of the current Resource - */ + /** @brief Set the [state](\ref e_surf_resource_state_t) of the current Resource */ virtual void setState(e_surf_resource_state_t state); private: const char *p_name; - xbt_dict_t p_properties; Model *p_model; bool m_running; e_surf_resource_state_t m_stateCurrent; - /* LMM */ -public: - /** - * @brief Get the lmm constraint associated to this Resource if it is part of a LMM component - * - * @return The lmm constraint associated to this Resource - */ + +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; }; +} +} + #endif /* SURF_MODEL_H_ */