X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0236bbc683363a58fdef428ce7de140909de5db1..5f9b13c6302e914a514168da8ff54818c0ee6787:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index ae7266f778..de6cfa5669 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -1,5 +1,4 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2016. 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. */ @@ -15,7 +14,9 @@ #include #include -#include "surf/trace_mgr.h" + +#include + #include "xbt/lib.h" #include "surf/surf_routing.h" #include "simgrid/platf_interface.h" @@ -23,56 +24,6 @@ #include "src/surf/surf_private.h" #include "src/internal_config.h" -#ifdef LIBSIGC -#include -namespace simgrid { -namespace surf { - // Wraps sigc++ signals with the interface of boost::signals2: - template class signal; - template - class signal { - private: - sigc::signal sig_; - public: - template XBT_ALWAYS_INLINE - void connect(T&& slot) - { - sig_.connect(std::forward(slot)); - } - template XBT_ALWAYS_INLINE - void connect(Res(*slot)(Args...)) - { - sig_.connect(sigc::ptr_fun(slot)); - } - template - R operator()(Args&&... args) const - { - return sig_.emit(std::forward(args)...); - } - }; -} -} -#else -#include -namespace simgrid { -namespace surf { - template - using signal = ::boost::signals2::signal; -} -} -#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 /********* @@ -97,7 +48,7 @@ extern XBT_PRIVATE double sg_sender_gap; namespace simgrid { namespace surf { -extern XBT_PRIVATE surf_callback(void, void) surfExitCallbacks; +extern XBT_PRIVATE simgrid::xbt::signal surfExitCallbacks; } } @@ -120,11 +71,6 @@ enum heap_action_type{ *********/ /* 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; -XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_host_avail; -XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_power; -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 * @@ -261,28 +207,28 @@ public: /** @brief Get the state set in which the action is */ ActionList* getStateSet() {return p_stateSet;}; - s_xbt_swag_hookup_t p_stateHookup; + s_xbt_swag_hookup_t p_stateHookup = {NULL,NULL}; simgrid::surf::Model *getModel() {return p_model;} protected: ActionList* p_stateSet; - double m_priority; /**< priority (1.0 by default) */ - int m_refcount; + double m_priority = 1.0; /**< priority (1.0 by default) */ + int m_refcount = 1; 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 */ + double m_maxDuration = NO_MAX_DURATION; /*< max_duration (may fluctuate until the task is completed) */ + double m_finish = -1; /**< 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 */ + char *p_category = NULL; /**< 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; simgrid::surf::Model *p_model; - void *p_data; /**< for your convenience */ + void *p_data = NULL; /**< for your convenience */ /* LMM */ public: @@ -300,11 +246,11 @@ public: protected: lmm_variable_t p_variable; - double m_lastValue; - double m_lastUpdate; - int m_suspended; + double m_lastValue = 0; + double m_lastUpdate = 0; + int m_suspended = 0; int m_indexHeap; - enum heap_action_type m_hat; + enum heap_action_type m_hat = NOTSET; }; typedef Action::ActionList ActionList; @@ -327,8 +273,6 @@ public: Model(); virtual ~Model(); - virtual void addTraces() =0; - /** @brief Get the set of [actions](@ref Action) in *ready* state */ virtual ActionList* getReadyActionSet() {return p_readyActionSet;} @@ -362,12 +306,11 @@ public: * @param now The current time of the simulation * @return The delta of time till the next action will finish */ - virtual double shareResources(double now); - virtual double shareResourcesLazy(double now); - virtual double shareResourcesFull(double now); + 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)); + lmm_system_t sys, void (*solve) (lmm_system_t)); /** * @brief Update action to the current time @@ -384,11 +327,11 @@ 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 shareResourcesIsIdempotent()=0; + virtual bool next_occuring_event_isIdempotent()=0; protected: ActionLmmListPtr p_modifiedSet; - lmm_system_t p_maxminSystem; + lmm_system_t p_maxminSystem = nullptr; e_UM_t p_updateMechanism = UM_UNDEFINED; int m_selectiveUpdate; xbt_heap_t p_actionHeap; @@ -413,7 +356,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_event_t event; /**< The associated trace event associated to the metric */ + tmgr_trace_iterator_t event; /**< The associated trace event associated to the metric */ } s_surf_metric_t; namespace simgrid { @@ -425,8 +368,6 @@ namespace surf { */ XBT_PUBLIC_CLASS Resource { public: - Resource(); - /** * @brief Constructor of non-LMM Resources * @@ -444,16 +385,16 @@ public: */ 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); + Resource(Model *model, const char *name, lmm_constraint_t constraint, int initiallyOn); /** * @brief Resource constructor * * @param model Model associated to this Resource * @param name The name of the Resource - * @param stateInit the initial state of the Resource + * @param initiallyOn the initial state of the Resource */ - Resource(Model *model, const char *name, e_surf_resource_state_t stateInit); + Resource(Model *model, const char *name, int initiallyOn); virtual ~Resource(); @@ -464,42 +405,35 @@ public: const char *getName(); /** - * @brief Update the state of the current Resource - * @details [TODO] + * @brief Apply an event of external load event to that storage * - * @param event_type [TODO] + * @param event What happened * @param value [TODO] - * @param date [TODO] */ - virtual void updateState(tmgr_trace_event_t event_type, double value, double date)=0; + virtual void apply_event(tmgr_trace_iterator_t event, double value)=0; /** @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 */ - bool isOn(); + virtual bool isOn(); + /** @brief Check if the current Resource is shut down */ + virtual bool isOff(); /** @brief Turn on the current Resource */ - void turnOn(); + virtual void turnOn(); /** @brief Turn off the current Resource */ - void turnOff(); - - /** @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 */ - virtual void setState(e_surf_resource_state_t state); + virtual void turnOff(); private: const char *p_name; Model *p_model; - bool m_running; - e_surf_resource_state_t m_stateCurrent; - + bool m_isOn; 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; +protected: + lmm_constraint_t p_constraint = nullptr; }; }