-/* Copyright (c) 2013-2015. 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();
- ~CpuCas01Model();
-
- double (CpuCas01Model::*shareResources)(double now);
- void (CpuCas01Model::*updateActionsState)(double now, double delta);
+ explicit CpuCas01Model(kernel::resource::Model::UpdateAlgo algo);
+ ~CpuCas01Model() override;
- Cpu *createCpu(simgrid::Host *host, xbt_dynar_t speedPeak, int pstate,
- double speedScale,
- tmgr_trace_t speedTrace, int core,
- e_surf_resource_state_t state_initial,
- tmgr_trace_t state_trace);
- double shareResourcesFull(double now);
- void addTraces();
- 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::Host *host, xbt_dynar_t speedPeak,
- int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
- e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace) ;
- ~CpuCas01();
- void updateState(tmgr_trace_event_t event_type, double value, double date);
- CpuAction *execute(double size);
- CpuAction *sleep(double duration);
+ CpuCas01(CpuCas01Model* model, simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core);
+ ~CpuCas01() 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;
- double getCurrentPowerPeak();
- bool isUsed() override;
- void setStateEvent(tmgr_trace_event_t stateEvent);
- void setPowerEvent(tmgr_trace_event_t stateEvent);
- xbt_dynar_t getSpeedPeakList();
+ bool is_used() override;
-private:
- tmgr_trace_event_t p_stateEvent;
- tmgr_trace_event_t p_speedEvent;
+protected:
+ void on_speed_change() override;
};
/**********
* Action *
**********/
class CpuCas01Action: public CpuAction {
- friend CpuAction *CpuCas01::execute(double size);
+ 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();
- ~CpuCas01Action() {};
+private:
+ int requested_core_ = 1;
};
}