-/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-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. */
-#include <xbt/base.h>
-
#include "cpu_interface.hpp"
+#include "xbt/base.h"
/***********
* Classes *
class CpuCas01Model : public simgrid::surf::CpuModel {
public:
- CpuCas01Model();
+ explicit CpuCas01Model(kernel::resource::Model::UpdateAlgo algo);
~CpuCas01Model() override;
- Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core) override;
- double next_occuring_event_full(double now) override;
- ActionList *p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
+ Cpu* create_cpu(simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core) override;
};
/************
class CpuCas01 : public Cpu {
public:
- CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core);
+ CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core);
~CpuCas01() override;
- void apply_event(tmgr_trace_iterator_t event, double value) override;
- CpuAction *execution_start(double size) override;
- CpuAction *sleep(double duration) override;
-
- bool isUsed() override;
+ void apply_event(tmgr_trace_event_t event, double value) override;
+ CpuAction* execution_start(double size) override;
+ CpuAction* execution_start(double size, int requested_cores) override;
+ CpuAction* sleep(double duration) override;
- xbt_dynar_t getSpeedPeakList(); // FIXME: killme to hide our internals
+ bool is_used() override;
protected:
- void onSpeedChange() override;
+ void on_speed_change() override;
};
/**********
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(kernel::resource::Model* model, double cost, bool failed, double speed,
+ kernel::lmm::Constraint* constraint, int core_count);
+ CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
+ kernel::lmm::Constraint* constraint);
~CpuCas01Action() override;
+ int requested_core();
+
+private:
+ int requested_core_ = 1;
};
}