/* 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 <list>
-
-#include <xbt/base.h>
-#include <xbt/dynar.h>
-#include <xbt/signal.hpp>
-
-#include <simgrid/forward.h>
-#include <simgrid/s4u/host.hpp>
-
-#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 *
***********/
class CpuModel;
class Cpu;
class CpuAction;
-class CpuPlugin;// FIXME:DEADCODE
/** @ingroup SURF_cpu_interface
* @brief SURF cpu model interface class
*/
XBT_PUBLIC_CLASS CpuModel : public Model {
public:
- CpuModel() : Model() {};
-
/**
* @brief Create a Cpu
*
* @param speedPerPstate Processor speed (in Flops) of each pstate. This ignores any potential external load coming from a trace.
* @param core The number of core of this Cpu
*/
- virtual Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core)=0;
+ virtual Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core)=0;
- void updateActionsStateLazy(double now, double delta);
- void updateActionsStateFull(double now, double delta);
- bool next_occuring_event_isIdempotent() {return true;}
+ void updateActionsStateLazy(double now, double delta) override;
+ void updateActionsStateFull(double now, double delta) override;
};
/************
* @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, xbt_dynar_t speedPerPstate, int core);
+ Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, lmm_constraint_t constraint,
+ std::vector<double> *speedPerPstate, int core);
/**
* @brief Cpu constructor
* @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, xbt_dynar_t speedPerPstate, int core);
+ Cpu(simgrid::surf::Model *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core);
~Cpu();
virtual simgrid::surf::Action *sleep(double duration)=0;
/** @brief Get the amount of cores */
- virtual int getCore();
+ virtual int coreCount();
/** @brief Get the speed, accounting for the trace load and provided process load instead of the real current one */
virtual double getSpeed(double load);
/** @brief Get the available speed of the current Cpu */
virtual double getAvailableSpeed();
- /** @brief Get the current Cpu power peak */
- virtual double getCurrentPowerPeak();
-
- virtual double getPowerPeakAt(int pstate_index);
+ /** @brief Get the current Cpu computational speed */
+ virtual double getPstateSpeedCurrent();
+ virtual double getPstateSpeed(int pstate_index);
virtual int getNbPStates();
virtual void setPState(int pstate_index);
int coresAmount_ = 1;
simgrid::s4u::Host* host_;
- xbt_dynar_t speedPerPstate_ = NULL; /*< List of supported CPU capacities (pstate related) */
- int pstate_ = 0; /*< Current pstate (index in the speedPeakList)*/
-
- /* Note (hypervisor): */
- lmm_constraint_t *p_constraintCore=NULL;
- void **p_constraintCoreId=NULL;
+ std::vector<double> 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). */
XBT_PUBLIC_CLASS CpuAction : public simgrid::surf::Action {
friend XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action);
public:
- /** @brief Callbacks handler which emit the callbacks after CpuAction State changed *
- * @details Callback functions have the following signature: `void(CpuAction *action, simgrid::surf::Action::State previous)`
- */
- static simgrid::xbt::signal<void(simgrid::surf::CpuAction*, simgrid::surf::Action::State)> onStateChange;
+/** @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<void(simgrid::surf::CpuAction*, simgrid::surf::Action::State)> onStateChange;
+/** @brief Signal emitted when the action share changes (amount of flops it gets)
+ * Signature: `void(CpuAction *action)`
+ */
+static simgrid::xbt::signal<void(simgrid::surf::CpuAction*)> onShareChange;
CpuAction(simgrid::surf::Model *model, double cost, bool failed)
- : Action(model, cost, failed) {} //FIXME:DEADCODE?
+ : Action(model, cost, failed) {}
CpuAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var)
: Action(model, cost, failed, var) {}
- /** @brief Set the affinity of the current CpuAction */
- virtual void setAffinity(Cpu *cpu, unsigned long mask);
-
void setState(simgrid::surf::Action::State state) override;
void updateRemainingLazy(double now) override;