X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4b597ac2a550a08c142293e59e4c4d2bdad8ff5d..5b52e25dc0e3d17cdbe0323f922d7bb4fc238af3:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 7fe3e71f64..25bc6fceb8 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -6,22 +6,15 @@ #ifndef SURF_MODEL_H_ #define SURF_MODEL_H_ -#include -#include -#include -#include -#include - -#include -#include - -#include +#include "xbt/signal.hpp" -#include "xbt/lib.h" -#include "surf/surf_routing.h" -#include "surf/surf.h" #include "src/surf/surf_private.h" -#include "src/internal_config.h" +#include "surf/surf.h" +#include "surf/surf_routing.h" +#include "xbt/str.h" + +#include +#include #define NO_MAX_DURATION -1.0 @@ -36,11 +29,16 @@ 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 XBT_PRIVATE std::vector surf_path; extern "C" { XBT_PUBLIC(double) surf_get_clock(void); } +/** \ingroup SURF_simulation + * \brief List of hosts that have just restarted and whose autorestart process should be restarted. + */ +XBT_PUBLIC_DATA(std::vector) host_that_restart; + extern XBT_PRIVATE double sg_sender_gap; @@ -54,10 +52,6 @@ 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 * ***********/ @@ -81,7 +75,10 @@ XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list; XBT_PRIVATE void surf_action_lmm_update_index_heap(void *action, int i); -XBT_PUBLIC_DATA(xbt_dynar_t) all_existing_models; +/** \ingroup SURF_models + * \brief List of initialized models + */ +XBT_PUBLIC_DATA(std::vector*) all_existing_models; namespace simgrid { namespace surf { @@ -107,14 +104,6 @@ public: not_in_the_system /**< Not in the system anymore. Why did you ask ? */ }; -private: - /** - * @brief Common initializations for the constructors - */ - void initialize(simgrid::surf::Model *model, double cost, bool failed, - lmm_variable_t var = NULL); - -public: /** * @brief Action constructor * @@ -140,9 +129,9 @@ public: /** @brief Mark that the action is now finished */ void finish(); - /** @brief Get the [state](\ref e_surf_action_state_t) of the current Action */ + /** @brief Get the [state](\ref simgrid::surf::Action::State) of the current Action */ Action::State getState(); /**< get the state*/ - /** @brief Set the [state](\ref e_surf_action_state_t) of the current Action */ + /** @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 */ @@ -220,9 +209,9 @@ public: /** @brief Get the state set in which the action is */ ActionList* getStateSet() {return stateSet_;}; - s_xbt_swag_hookup_t stateHookup_ = {NULL,NULL}; + s_xbt_swag_hookup_t stateHookup_ = {nullptr,nullptr}; - simgrid::surf::Model *getModel() {return model_;} + simgrid::surf::Model* getModel() { return model_; } protected: ActionList* stateSet_; @@ -234,11 +223,11 @@ protected: private: double start_; /**< start time */ - char *category_ = NULL; /**< tracing category for categorized resource utilization monitoring */ + char *category_ = nullptr; /**< tracing category for categorized resource utilization monitoring */ double cost_; simgrid::surf::Model *model_; - void *data_ = NULL; /**< for your convenience */ + void *data_ = nullptr; /**< for your convenience */ /* LMM */ public: @@ -316,11 +305,9 @@ public: * @param now The current time of the simulation * @return The delta of time till the next action will finish */ - 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)); + virtual double nextOccuringEvent(double now); + virtual double nextOccuringEventLazy(double now); + virtual double nextOccuringEventFull(double now); /** * @brief Update action to the current time @@ -337,13 +324,13 @@ 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 next_occuring_event_isIdempotent()=0; + virtual bool nextOccuringEventIsIdempotent() { return true;} protected: ActionLmmListPtr modifiedSet_; lmm_system_t maxminSystem_ = nullptr; e_UM_t updateMechanism_ = UM_UNDEFINED; - int selectiveUpdate_; + bool selectiveUpdate_; xbt_heap_t actionHeap_; private: @@ -378,14 +365,6 @@ namespace surf { */ XBT_PUBLIC_CLASS Resource { public: - /** - * @brief Constructor of non-LMM Resources - * - * @param model Model associated to this Resource - * @param name The name of the Resource - */ - Resource(Model *model, const char *name); - /** * @brief Constructor of LMM Resources * @@ -398,10 +377,10 @@ public: virtual ~Resource(); /** @brief Get the Model of the current Resource */ - Model *getModel() const; + Model* model() const; /** @brief Get the name of the current Resource */ - const char *getName() const; + const char* cname() const; bool operator==(const Resource &other) const; @@ -426,15 +405,16 @@ public: virtual void turnOff(); private: - const char *name_; + std::string name_; Model *model_; bool isOn_ = true; public: /* LMM */ /** @brief Get the lmm constraint associated to this Resource if it is part of a LMM component (or null if none) */ - lmm_constraint_t getConstraint() const; + lmm_constraint_t constraint() const; + protected: - lmm_constraint_t constraint_ = nullptr; + const lmm_constraint_t constraint_ = nullptr; }; } @@ -446,7 +426,7 @@ namespace std { { std::size_t operator()(const simgrid::surf::Resource& r) const { - return (std::size_t) xbt_str_hash(r.getName()); + return (std::size_t) xbt_str_hash(r.cname()); } }; }