X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3e2e56a1ff8c65d47e0cf4e458eac56e08a2b528..682027cc097d0a94e9bf2c7dc819db2f2c24f440:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 228c06d69c..0e2b5cad2a 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,16 @@ #ifndef SURF_MODEL_H_ #define SURF_MODEL_H_ -#include +#include "xbt/signal.hpp" -#include -#include -#include +#include "src/surf/surf_private.h" +#include "surf/surf.h" +#include "xbt/str.h" #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 #define NO_MAX_DURATION -1.0 @@ -30,38 +25,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,12 +61,6 @@ 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 * **********/ @@ -114,14 +96,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 +118,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,20 +198,20 @@ 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); /** @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) */ + double sharingWeight_ = 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) */ @@ -249,17 +227,16 @@ private: /* LMM */ public: - virtual void updateRemainingLazy(double now); + 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); + virtual void updateIndexHeap(int i); lmm_variable_t getVariable() {return variable_;} double getLastUpdate() {return lastUpdate_;} void refreshLastUpdate() {lastUpdate_ = surf_get_clock();} enum heap_action_type getHat() {return hat_;} bool is_linked() {return action_lmm_hook.is_linked();} - void gapRemove(); protected: lmm_variable_t variable_ = nullptr; @@ -342,13 +319,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: @@ -371,7 +348,7 @@ private: typedef struct { 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 */ + tmgr_trace_event_t event; /**< The associated trace event associated to the metric */ } s_surf_metric_t; namespace simgrid { @@ -383,14 +360,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,15 +367,15 @@ 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 char* cname() const; bool operator==(const Resource &other) const; @@ -416,7 +385,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; @@ -431,28 +400,25 @@ 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.cname()); } }; }