X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3cd6f2bf8f8015a99c9bb351f568f32fe8429a0f..585eeb393ae78877bab30573f224a2171074a6ca:/src/surf/surf_interface.hpp diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp index 65eea27d30..93cbaf9500 100644 --- a/src/surf/surf_interface.hpp +++ b/src/surf/surf_interface.hpp @@ -8,7 +8,7 @@ #include "xbt/signal.hpp" -#include "src/surf/surf_private.h" +#include "src/surf/surf_private.hpp" #include "surf/surf.h" #include "xbt/str.h" @@ -118,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*/ @@ -223,7 +227,7 @@ 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); @@ -341,11 +345,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_event_t event; /**< The associated trace event associated to the metric */ -} s_surf_metric_t; +}; namespace simgrid { namespace surf {