X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0753f73209089c7573361567dfe25851dab20a70..dac676c1180a5ea95897072e55f698433a857d90:/src/surf/cpu_interface.hpp diff --git a/src/surf/cpu_interface.hpp b/src/surf/cpu_interface.hpp index daae9a4f4a..b0ff040f28 100644 --- a/src/surf/cpu_interface.hpp +++ b/src/surf/cpu_interface.hpp @@ -1,25 +1,17 @@ -/* Copyright (c) 2004-2015. 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. */ -#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/kernel/lmm/maxmin.hpp" +#include "src/kernel/model/Resource.hpp" + +#include + /*********** * Classes * ***********/ @@ -27,10 +19,6 @@ namespace simgrid { namespace surf { -class CpuModel; -class Cpu; -class CpuAction; - /** @ingroup SURF_cpu_interface * @brief SURF cpu model interface class * @details A model is an object which handle the interactions between its Resources and its Actions @@ -58,7 +46,8 @@ public: * @brief SURF cpu resource interface class * @details A Cpu represent a cpu associated to a host */ -XBT_PUBLIC_CLASS Cpu : public simgrid::surf::Resource { +XBT_PUBLIC_CLASS Cpu : public simgrid::kernel::resource::Resource +{ public: /** * @brief Cpu constructor @@ -69,8 +58,8 @@ public: * @param speedPerPstate Processor speed (in flop per second) for each pstate * @param core The number of core of this Cpu */ - Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint, - std::vector *speedPerPstate, int core); + Cpu(simgrid::surf::Model * model, simgrid::s4u::Host * host, kernel::lmm::Constraint * constraint, + std::vector * speedPerPstate, int core); /** * @brief Cpu constructor @@ -80,7 +69,7 @@ public: * @param speedPerPstate Processor speed (in flop per second) for each pstate * @param core The number of core of this Cpu */ - Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, std::vector *speedPerPstate, int core); + Cpu(simgrid::surf::Model* model, simgrid::s4u::Host* host, std::vector* speedPerPstate, int core); ~Cpu(); @@ -92,6 +81,19 @@ public: */ virtual simgrid::surf::Action *execution_start(double size)=0; + /** + * @brief Execute some quantity of computation on more than one core + * + * @param size The value of the processing amount (in flop) needed to process + * @param requestedCores The desired amount of cores. Must be >= 1 + * @return The CpuAction corresponding to the processing + */ + virtual simgrid::surf::Action* execution_start(double size, int requestedCores) + { + THROW_UNIMPLEMENTED; + return nullptr; + } + /** * @brief Make a process sleep for duration (in seconds) * @@ -115,7 +117,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,19 +125,17 @@ 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) */ - tmgr_trace_iterator_t stateEvent_ = nullptr; - s_surf_metric_t speed_ = {1.0, 0, nullptr}; + tmgr_trace_event_t stateEvent_ = nullptr; + Metric speed_ = {1.0, 0, nullptr}; }; /********** @@ -147,26 +146,31 @@ public: * @brief A CpuAction represents the execution of code on one or several Cpus */ XBT_PUBLIC_CLASS CpuAction : public simgrid::surf::Action { -friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action); + friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction* action); + public: -/** @brief Signal emitted when the action state changes (ready/running/done, etc) - * Signature: `void(CpuAction *action, simgrid::surf::Action::State previous)` - */ -static simgrid::xbt::signal onStateChange; -/** @brief Signal emitted when the action share changes (amount of flops it gets) - * Signature: `void(CpuAction *action)` - */ -static simgrid::xbt::signal onShareChange; + /** @brief Signal emitted when the action state changes (ready/running/done, etc) + * Signature: `void(CpuAction *action, simgrid::surf::Action::State previous)` + */ + static simgrid::xbt::signal onStateChange; + /** @brief Signal emitted when the action share changes (amount of flops it gets) + * Signature: `void(CpuAction *action)` + */ + static simgrid::xbt::signal onShareChange; - CpuAction(simgrid::surf::Model *model, double cost, bool failed) - : Action(model, cost, failed) {} - CpuAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var) - : Action(model, cost, failed, var) {} + CpuAction(simgrid::surf::Model* model, double cost, bool failed) : Action(model, cost, failed) {} + CpuAction(simgrid::surf::Model * model, double cost, bool failed, kernel::lmm::Variable* var) + : Action(model, cost, failed, var) + { + } void setState(simgrid::surf::Action::State state) override; void updateRemainingLazy(double now) override; std::list cpus(); + + void suspend() override; + void resume() override; }; }