-/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2020. 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 <xbt/base.h>
-
#include "cpu_interface.hpp"
+#include "xbt/base.h"
/***********
* Classes *
***********/
namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
class XBT_PRIVATE CpuCas01Model;
class XBT_PRIVATE CpuCas01;
* Model *
*********/
-class CpuCas01Model : public simgrid::surf::CpuModel {
+class CpuCas01Model : public CpuModel {
public:
- CpuCas01Model();
- ~CpuCas01Model();
-
- Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak, int pstate,
- double speedScale,
- tmgr_trace_t speedTrace, int core,
- int initiallyOn,
- tmgr_trace_t state_trace) override;
- double shareResourcesFull(double now) override;
- void addTraces() override;
- ActionList *p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
+ explicit CpuCas01Model(Model::UpdateAlgo algo);
+ CpuCas01Model(const CpuCas01Model&) = delete;
+ CpuCas01Model& operator=(const CpuCas01Model&) = delete;
+ ~CpuCas01Model() override;
+
+ Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core) override;
};
/************
************/
class CpuCas01 : public Cpu {
- friend CpuCas01Model;
public:
- CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
- int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
- int initiallyOn, tmgr_trace_t stateTrace) ;
- ~CpuCas01();
- void updateState(tmgr_trace_iterator_t event_type, double value, double date) override;
- CpuAction *execute(double size) override;
- CpuAction *sleep(double duration) override;
+ CpuCas01(CpuCas01Model* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core);
+ CpuCas01(const CpuCas01&) = delete;
+ CpuCas01& operator=(const CpuCas01&) = delete;
+ ~CpuCas01() override;
+ void apply_event(profile::Event* event, double value) override;
+ CpuAction* execution_start(double size) override;
+ CpuAction* execution_start(double size, int requested_cores) override;
+ CpuAction* sleep(double duration) override;
- bool isUsed() override;
-
- xbt_dynar_t getSpeedPeakList(); // FIXME: killme to hide our internals
+ bool is_used() override;
protected:
- void onSpeedChange() override;
-
-private:
-
- tmgr_trace_iterator_t p_stateEvent = nullptr;
- tmgr_trace_iterator_t p_speedEvent = nullptr;
+ void on_speed_change() override;
};
/**********
* Action *
**********/
-class CpuCas01Action: public CpuAction {
- friend CpuAction *CpuCas01::execute(double size);
- friend CpuAction *CpuCas01::sleep(double duration);
+class CpuCas01Action : public CpuAction {
+ friend CpuAction* CpuCas01::execution_start(double size);
+ friend CpuAction* CpuCas01::sleep(double duration);
+
public:
- CpuCas01Action(Model *model, double cost, bool failed, double speed,
- lmm_constraint_t constraint);
+ CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint, int core_count);
+ CpuCas01Action(Model* model, double cost, bool failed, double speed, lmm::Constraint* constraint);
+ CpuCas01Action(const CpuCas01Action&) = delete;
+ CpuCas01Action& operator=(const CpuCas01Action&) = delete;
+ ~CpuCas01Action() override;
+ int requested_core();
- ~CpuCas01Action() {};
+private:
+ int requested_core_ = 1;
};
-}
-}
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid