-/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2018. 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. */
#ifndef SURF_CPU_INTERFACE_HPP_
#define SURF_CPU_INTERFACE_HPP_
+#include "simgrid/kernel/resource/Model.hpp"
+#include "simgrid/kernel/resource/Resource.hpp"
#include "simgrid/s4u/Host.hpp"
-#include "src/surf/maxmin_private.hpp"
+#include "src/kernel/lmm/maxmin.hpp"
#include <list>
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
*/
-XBT_PUBLIC_CLASS CpuModel : public Model {
+class XBT_PUBLIC CpuModel : public kernel::resource::Model {
public:
+ explicit CpuModel(kernel::resource::Model::UpdateAlgo algo) : Model(algo) {}
+
/**
* @brief Create a Cpu
*
*/
virtual Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core)=0;
- void updateActionsStateLazy(double now, double delta) override;
- void updateActionsStateFull(double now, double delta) override;
+ void update_actions_state_lazy(double now, double delta) override;
+ void update_actions_state_full(double now, double delta) override;
};
/************
* @brief SURF cpu resource interface class
* @details A Cpu represent a cpu associated to a host
*/
-XBT_PUBLIC_CLASS Cpu : public simgrid::surf::Resource {
+class XBT_PUBLIC Cpu : public simgrid::kernel::resource::Resource {
public:
/**
* @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, lmm_constraint_t constraint,
- std::vector<double> *speedPerPstate, int core);
+ Cpu(simgrid::kernel::resource::Model * model, simgrid::s4u::Host * host, kernel::lmm::Constraint * 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, std::vector<double> *speedPerPstate, int core);
+ Cpu(simgrid::kernel::resource::Model * model, simgrid::s4u::Host * host, std::vector<double> * speedPerPstate,
+ int core);
~Cpu();
* @param size The value of the processing amount (in flop) needed to process
* @return The CpuAction corresponding to the processing
*/
- virtual simgrid::surf::Action *execution_start(double size)=0;
+ virtual simgrid::kernel::resource::Action* execution_start(double size) = 0;
/**
* @brief Execute some quantity of computation on more than one core
* @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;
- }
+ virtual simgrid::kernel::resource::Action* execution_start(double size, int requestedCores) = 0;
/**
* @brief Make a process sleep for duration (in seconds)
* @param duration The number of seconds to sleep
* @return The CpuAction corresponding to the sleeping
*/
- virtual simgrid::surf::Action *sleep(double duration)=0;
+ virtual simgrid::kernel::resource::Action* sleep(double duration) = 0;
/** @brief Get the amount of cores */
virtual int coreCount();
public:
/** @brief Get the available speed of the current Cpu */
- virtual double getAvailableSpeed();
+ virtual double get_available_speed();
/** @brief Get the current Cpu computational speed */
virtual double getPstateSpeed(int pstate_index);
int pstate_ = 0; /*< Current pstate (index in the speedPeakList)*/
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) */
+ virtual void
+ set_speed_trace(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_event_t stateEvent_ = nullptr;
- s_surf_metric_t speed_ = {1.0, 0, nullptr};
+ Metric speed_ = {1.0, 0, nullptr};
};
/**********
/** @ingroup SURF_cpu_interface
* @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);
+class XBT_PUBLIC CpuAction : public simgrid::kernel::resource::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<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;
+ /** @brief Signal emitted when the action state changes (ready/running/done, etc)
+ * Signature: `void(CpuAction *action, simgrid::kernel::resource::Action::State previous)`
+ */
+ static simgrid::xbt::signal<void(simgrid::surf::CpuAction*, simgrid::kernel::resource::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) {}
- CpuAction(simgrid::surf::Model *model, double cost, bool failed, lmm_variable_t var)
- : Action(model, cost, failed, var) {}
+ CpuAction(simgrid::kernel::resource::Model * model, double cost, bool failed) : Action(model, cost, failed) {}
+ CpuAction(simgrid::kernel::resource::Model * model, double cost, bool failed, kernel::lmm::Variable* var)
+ : Action(model, cost, failed, var)
+ {
+ }
- void setState(simgrid::surf::Action::State state) override;
+ void set_state(simgrid::kernel::resource::Action::State state) override;
- void updateRemainingLazy(double now) override;
+ void update_remains_lazy(double now) override;
std::list<Cpu*> cpus();
void suspend() override;
