X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0753f73209089c7573361567dfe25851dab20a70..0c9ba8fe774965e25baca201356dd6da90f9bb5d:/src/surf/cpu_interface.hpp?ds=sidebyside diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index daae9a4f4a..ed0aa26a70 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -4,22 +4,12 @@ /* 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. */ -#include - -#include -#include - -#include -#include - -#include "surf/datatypes.h" -#include "surf_interface.hpp" -#include "maxmin_private.hpp" -#include "trace_mgr.hpp" - #ifndef SURF_CPU_INTERFACE_HPP_ #define SURF_CPU_INTERFACE_HPP_ +#include "simgrid/s4u/host.hpp" +#include "src/surf/maxmin_private.hpp" + /*********** * Classes * ***********/ @@ -115,7 +105,6 @@ public: virtual double getAvailableSpeed(); /** @brief Get the current Cpu computational speed */ - virtual double getPstateSpeedCurrent(); virtual double getPstateSpeed(int pstate_index); virtual int getNbPStates(); @@ -124,14 +113,12 @@ public: simgrid::s4u::Host* getHost() { return host_; } -public: int coresAmount_ = 1; simgrid::s4u::Host* host_; std::vector speedPerPstate_; /*< List of supported CPU capacities (pstate related) */ int pstate_ = 0; /*< Current pstate (index in the speedPeakList)*/ -public: virtual void setStateTrace(tmgr_trace_t trace); /*< setup the trace file with states events (ON or OFF). Trace must contain boolean values (0 or 1). */ virtual void setSpeedTrace(tmgr_trace_t trace); /*< setup the trace file with availability events (peak speed changes due to external load). Trace must contain relative values (ratio between 0 and 1) */