-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2022. 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 <boost/intrusive/list.hpp>
-
-#include <xbt/base.h>
-
-#include "src/surf/cpu_interface.hpp"
-#include "src/surf/trace_mgr.hpp"
+#ifndef SURF_MODEL_CPUTI_HPP_
+#define SURF_MODEL_CPUTI_HPP_
-/* Epsilon */
-#define EPSILON 0.000000001
+#include "src/kernel/resource/CpuImpl.hpp"
+#include "src/kernel/resource/profile/Profile.hpp"
+#include <boost/intrusive/list.hpp>
+#include <memory>
-namespace simgrid {
-namespace surf {
+namespace simgrid::kernel::resource {
/***********
* Classes *
***********/
-class XBT_PRIVATE CpuTiTrace;
-class XBT_PRIVATE CpuTiTgmr;
class XBT_PRIVATE CpuTiModel;
class XBT_PRIVATE CpuTi;
class XBT_PRIVATE CpuTiAction;
-struct tiTag;
+/***********
+ * Profile *
+ ***********/
+class CpuTiProfile {
+ std::vector<double> time_points_;
+ std::vector<double> integral_;
-/*********
- * Trace *
- *********/
-class CpuTiTrace {
public:
- explicit CpuTiTrace(tmgr_trace_t speedTrace);
- ~CpuTiTrace();
+ explicit CpuTiProfile(const profile::Profile* profile);
- double integrateSimple(double a, double b);
- double integrateSimplePoint(double a);
- double solveSimple(double a, double amount);
-
- double *timePoints_;
- double *integral_;
- int nbPoints_;
- int binarySearch(double *array, double a, int low, int high);
-};
+ const std::vector<double>& get_time_points() const { return time_points_; }
-enum trace_type {
+ double integrate_simple(double a, double b) const;
+ double integrate_simple_point(double a) const;
+ double solve_simple(double a, double amount) const;
- TRACE_FIXED, /*< Trace fixed, no availability file */
- TRACE_DYNAMIC /*< Dynamic, have an availability file */
+ static long binary_search(const std::vector<double>& array, double a);
};
-class CpuTiTgmr {
-public:
- CpuTiTgmr(trace_type type, double value)
- : type_(type), value_(value)
- {};
- CpuTiTgmr(tmgr_trace_t speedTrace, double value);
- ~CpuTiTgmr();
-
- double integrate(double a, double b);
- double solve(double a, double amount);
- double solveSomewhatSimple(double a, double amount);
- double getPowerScale(double a);
-
- trace_type type_;
- double value_; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
+class CpuTiTmgr {
+ enum class Type {
+ FIXED, /*< Trace fixed, no availability file */
+ DYNAMIC /*< Dynamic, have an availability file */
+ };
+ Type type_ = Type::FIXED;
+ double value_ = 0.0; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
/* Dynamic */
- double lastTime_ = 0.0; /*< Integral interval last point (discrete time) */
- double total_ = 0.0; /*< Integral total between 0 and last_pointn */
+ double last_time_ = 0.0; /*< Integral interval last point (discrete time) */
+ double total_ = 0.0; /*< Integral total between 0 and last point */
- CpuTiTrace *trace_ = nullptr;
- tmgr_trace_t speedTrace_ = nullptr;
+ std::unique_ptr<CpuTiProfile> profile_ = nullptr;
+ profile::Profile* speed_profile_ = nullptr;
+
+public:
+ explicit CpuTiTmgr(double value) : value_(value){};
+ CpuTiTmgr(profile::Profile* speed_profile, double value);
+ CpuTiTmgr(const CpuTiTmgr&) = delete;
+ CpuTiTmgr& operator=(const CpuTiTmgr&) = delete;
+
+ double integrate(double a, double b) const;
+ double solve(double a, double amount) const;
+ double get_power_scale(double a) const;
};
/**********
* Action *
**********/
-class CpuTiAction: public CpuAction {
+class XBT_PRIVATE CpuTiAction : public CpuAction {
friend class CpuTi;
public:
- CpuTiAction(CpuTiModel *model, double cost, bool failed, CpuTi *cpu);
+ CpuTiAction(CpuTi* cpu, double cost);
+ CpuTiAction(const CpuTiAction&) = delete;
+ CpuTiAction& operator=(const CpuTiAction&) = delete;
+ ~CpuTiAction() override;
- void setState(simgrid::kernel::resource::Action::State state) override;
- int unref() override;
+ void set_state(Action::State state) override;
void cancel() override;
void suspend() override;
void resume() override;
- void setMaxDuration(double duration) override;
- void setSharingWeight(double priority) override;
- double getRemains() override;
+ void set_sharing_penalty(double sharing_penalty) override;
+ double get_remains() override;
CpuTi *cpu_;
boost::intrusive::list_member_hook<> action_ti_hook;
};
-typedef boost::intrusive::member_hook<CpuTiAction, boost::intrusive::list_member_hook<>, &CpuTiAction::action_ti_hook> ActionTiListOptions;
-typedef boost::intrusive::list<CpuTiAction, ActionTiListOptions > ActionTiList;
+using ActionTiListOptions =
+ boost::intrusive::member_hook<CpuTiAction, boost::intrusive::list_member_hook<>, &CpuTiAction::action_ti_hook>;
+using ActionTiList = boost::intrusive::list<CpuTiAction, ActionTiListOptions>;
/************
* Resource *
************/
-class CpuTi : public Cpu {
+class CpuTi : public CpuImpl {
public:
- CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core);
+ CpuTi(s4u::Host* host, const std::vector<double>& speed_per_pstate);
+ CpuTi(const CpuTi&) = delete;
+ CpuTi& operator&(const CpuTi&) = delete;
~CpuTi() override;
- void setSpeedTrace(tmgr_trace_t trace) override;
+ CpuImpl* set_speed_profile(profile::Profile* profile) override;
- void apply_event(tmgr_trace_event_t event, double value) override;
- void updateActionsFinishTime(double now);
- void updateRemainingAmount(double now);
+ void apply_event(profile::Event* event, double value) override;
+ void update_actions_finish_time(double now);
+ void update_remaining_amount(double now);
- bool isUsed() override;
- CpuAction *execution_start(double size) override;
- simgrid::kernel::resource::Action* execution_start(double size, int requestedCores) override
+ bool is_used() const override;
+ CpuAction* execution_start(double size, double user_bound) override;
+ CpuAction* execution_start(double, int, double) override
{
THROW_UNIMPLEMENTED;
return nullptr;
}
- CpuAction *sleep(double duration) override;
- double getAvailableSpeed() override;
+ CpuAction* sleep(double duration) override;
+ double get_speed_ratio() override;
- void modified(bool modified);
+ void set_modified(bool modified);
- CpuTiTgmr *speedIntegratedTrace_ = nullptr;/*< Structure with data needed to integrate trace file */
- ActionTiList actionSet_; /*< set with all actions running on cpu */
- double sumPriority_ = 0; /*< the sum of actions' priority that are running on cpu */
- double lastUpdate_ = 0; /*< last update of actions' remaining amount done */
-
- double currentFrequency_;
+ CpuTiTmgr* speed_integrated_trace_ = nullptr; /*< Structure with data needed to integrate trace file */
+ ActionTiList action_set_; /*< set with all actions running on cpu */
+ double sum_priority_ = 0; /*< the sum of actions' priority that are running on cpu */
+ double last_update_ = 0; /*< last update of actions' remaining amount done */
boost::intrusive::list_member_hook<> cpu_ti_hook;
};
-typedef boost::intrusive::member_hook<CpuTi, boost::intrusive::list_member_hook<>, &CpuTi::cpu_ti_hook> CpuTiListOptions;
-typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;
+using CpuTiListOptions =
+ boost::intrusive::member_hook<CpuTi, boost::intrusive::list_member_hook<>, &CpuTi::cpu_ti_hook>;
+using CpuTiList = boost::intrusive::list<CpuTi, CpuTiListOptions>;
/*********
* Model *
*********/
class CpuTiModel : public CpuModel {
public:
- CpuTiModel() = default;
- ~CpuTiModel() override;
- Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double>* speedPerPstate, int core) override;
- double nextOccuringEvent(double now) override;
- void updateActionsState(double now, double delta) override;
-
- kernel::resource::ActionList runningActionSetThatDoesNotNeedBeingChecked_;
- CpuTiList modifiedCpu_;
+ static void create_pm_models(); // Make CPU PM model
+
+ using CpuModel::CpuModel;
+ CpuTiModel(const CpuTiModel&) = delete;
+ CpuTiModel& operator=(const CpuTiModel&) = delete;
+ CpuImpl* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate) override;
+ double next_occurring_event(double now) override;
+ void update_actions_state(double now, double delta) override;
+
+ CpuTiList modified_cpus_;
};
-}
-}
+} // namespace simgrid::kernel::resource
+
+#endif /* SURF_MODEL_CPUTI_HPP_ */
