-/* Copyright (c) 2013-2017. 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, std::vector<double> *speedPerPstate, int core) override;
- ActionList p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
+ kernel::resource::Action::StateSet cpuRunningActionSetThatDoesNotNeedBeingChecked_;
};
/************
CpuAction* execution_start(double size, int requestedCore) override;
CpuAction* sleep(double duration) override;
- bool isUsed() override;
+ bool is_used() override;
std::vector<double> * getSpeedPeakList(); // FIXME: killme to hide our internals
friend CpuAction *CpuCas01::execution_start(double size);
friend CpuAction *CpuCas01::sleep(double duration);
public:
- CpuCas01Action(Model* model, double cost, bool failed, double speed, kernel::lmm::Constraint* constraint,
- int coreAmount);
- CpuCas01Action(Model* model, double cost, bool failed, double speed, kernel::lmm::Constraint* constraint);
+ CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
+ kernel::lmm::Constraint* constraint, int coreAmount);
+ CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed,
+ kernel::lmm::Constraint* constraint);
~CpuCas01Action() override;
- int requestedCore();
+ int requested_core();
private:
- int requestedCore_ = 1;
+ int requested_core_ = 1;
};
}