X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7fb4337fa68b21ac48b0160cc9461c5a87199598..b56f5db19216ad6717f65e0c52383c87bad6e043:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index c397b6bb51..0644588618 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -6,21 +6,18 @@ #ifndef SURF_MODEL_H_ #define SURF_MODEL_H_ -#include +#include "xbt/signal.hpp" -#include -#include -#include +#include "src/surf/surf_private.hpp" +#include "surf/surf.hpp" +#include "xbt/str.h" +#include #include - -#include - -#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 +#include +#include +#include #define NO_MAX_DURATION -1.0 @@ -30,38 +27,31 @@ /* user-visible parameters */ 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 XBT_PRIVATE std::vector surf_path; +extern XBT_PRIVATE std::unordered_map traces_set_list; +extern XBT_PRIVATE std::set watched_hosts; extern "C" { -XBT_PUBLIC(double) surf_get_clock(void); +XBT_PUBLIC(double) surf_get_clock(); } /** \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; - namespace simgrid { namespace surf { -extern XBT_PRIVATE simgrid::xbt::signal surfExitCallbacks; - +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,18 +63,10 @@ enum heap_action_type{ NOTSET }; -/********* - * Trace * - *********/ -/* 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; - /********** * Action * **********/ -XBT_PRIVATE void surf_action_lmm_update_index_heap(void *action, int i); - /** \ingroup SURF_models * \brief List of initialized models */ @@ -93,6 +75,14 @@ XBT_PUBLIC_DATA(std::vector*) all_existing_models; namespace simgrid { namespace surf { +typedef std::pair heap_element_type; +struct heap_element_compare { + bool operator()(const heap_element_type& a, const heap_element_type& b) const { return a.first > b.first; } +}; +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) @@ -114,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 = nullptr); - -public: /** * @brief Action constructor * @@ -144,8 +126,12 @@ public: /** @brief Destructor */ virtual ~Action(); - /** @brief Mark that the action is now finished */ - void finish(); + /** + * @brief Mark that the action is now finished + * + * @param state the new [state](\ref simgrid::surf::Action::State) of the current Action + */ + void finish(Action::State state); /** @brief Get the [state](\ref simgrid::surf::Action::State) of the current Action */ Action::State getState(); /**< get the state*/ @@ -220,54 +206,58 @@ public: void setCategory(const char *category); /** @brief Get the priority of the current Action */ - double getPriority() {return priority_;}; + double getPriority() { return sharingWeight_; }; /** @brief Set the priority of the current Action */ - virtual void setPriority(double priority); + 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_;}; s_xbt_swag_hookup_t stateHookup_ = {nullptr,nullptr}; - simgrid::surf::Model *getModel() {return model_;} + simgrid::surf::Model* getModel() { return model_; } protected: ActionList* stateSet_; - double priority_ = 1.0; /**< priority (1.0 by default) */ int refcount_ = 1; - double remains_; /**< How much of that cost remains to be done in the currently running task */ - double maxDuration_ = NO_MAX_DURATION; /*< max_duration (may fluctuate until the task is completed) */ - double finishTime_ = -1; /**< finish time : this is modified during the run and fluctuates until the task is completed */ private: + double sharingWeight_ = 1.0; /**< priority (1.0 by default) */ + double maxDuration_ = NO_MAX_DURATION; /*< max_duration (may fluctuate until the task is completed) */ + double remains_; /**< How much of that cost remains to be done in the currently running task */ double start_; /**< start time */ char *category_ = nullptr; /**< tracing category for categorized resource utilization monitoring */ + double finishTime_ = + -1; /**< finish time : this is modified during the run and fluctuates until the task is completed */ double cost_; simgrid::surf::Model *model_; void *data_ = nullptr; /**< for your convenience */ /* LMM */ + 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); - 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); + virtual void updateRemainingLazy(double now) { THROW_IMPOSSIBLE; }; + 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() {return variable_;} + void setVariable(lmm_variable_t var) { variable_ = var; } double getLastUpdate() {return lastUpdate_;} void refreshLastUpdate() {lastUpdate_ = surf_get_clock();} - enum heap_action_type getHat() {return hat_;} + double getLastValue() { return lastValue_; } + void setLastValue(double val) { lastValue_ = val; } + enum heap_action_type getHat() { return hat_; } bool is_linked() {return action_lmm_hook.is_linked();} - void gapRemove(); - protected: - lmm_variable_t variable_ = nullptr; - double lastValue_ = 0; - double lastUpdate_ = 0; int suspended_ = 0; - int indexHeap_; - enum heap_action_type hat_ = NOTSET; }; typedef Action::ActionList ActionList; @@ -277,13 +267,6 @@ typedef boost::intrusive::member_hook< typedef boost::intrusive::list ActionLmmList; typedef ActionLmmList* ActionLmmListPtr; -/******************** - * Helper functions * - ********************/ - -double shareResourcesMaxMin(ActionList* runningActions, lmm_system_t sys, void (*solve) (lmm_system_t)); - - /********* * Model * *********/ @@ -320,9 +303,14 @@ public: * @see e_UM_t */ e_UM_t getUpdateMechanism() {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 @@ -330,9 +318,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); + virtual double nextOccuringEvent(double now); + virtual double nextOccuringEventLazy(double now); + virtual double nextOccuringEventFull(double now); /** * @brief Update action to the current time @@ -349,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 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_; - xbt_heap_t actionHeap_; + bool selectiveUpdate_; private: + e_UM_t updateMechanism_ = UM_UNDEFINED; 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 */ + heap_type actionHeap_; }; } @@ -375,11 +363,11 @@ private: /** @ingroup SURF_interface * @brief Resource which have a metric handled by a maxmin system */ -typedef struct { +struct s_surf_metric_t { 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_iterator_t event; /**< The associated trace event associated to the metric */ -} s_surf_metric_t; + tmgr_trace_event_t event; /**< The associated trace event associated to the metric */ +}; namespace simgrid { namespace surf { @@ -390,14 +378,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 * @@ -405,15 +385,17 @@ public: * @param name The name of the Resource * @param constraint The lmm constraint associated to this Resource if it is part of a LMM component */ - Resource(Model *model, const char *name, lmm_constraint_t constraint); + Resource(Model * model, const std::string& name, lmm_constraint_t constraint); 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 std::string& getName() const; + /** @brief Get the name of the current Resource */ + const char* getCname() const; bool operator==(const Resource &other) const; @@ -423,7 +405,7 @@ public: * @param event What happened * @param value [TODO] */ - virtual void apply_event(tmgr_trace_iterator_t event, double value)=0; + virtual void apply_event(tmgr_trace_event_t event, double value) = 0; /** @brief Check if the current Resource is used (if it currently serves an action) */ virtual bool isUsed()=0; @@ -438,29 +420,26 @@ 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; }; } } namespace std { - template <> - struct hash - { - std::size_t operator()(const simgrid::surf::Resource& r) const - { - return (std::size_t) xbt_str_hash(r.getName()); - } - }; +template <> class hash { +public: + std::size_t operator()(const simgrid::surf::Resource& r) const { return (std::size_t)xbt_str_hash(r.getCname()); } +}; } #endif /* SURF_MODEL_H_ */