A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
last call to MSG_hosts_as_dynar -> deprecate !
[simgrid.git]
/
src
/
surf
/
cpu_ti.hpp
diff --git
a/src/surf/cpu_ti.hpp
b/src/surf/cpu_ti.hpp
index
61c94fa
..
4ce90e2
100644
(file)
--- a/
src/surf/cpu_ti.hpp
+++ b/
src/surf/cpu_ti.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-20
20
. 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. */
/* 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. */
@@
-6,10
+6,11
@@
#ifndef SURF_MODEL_CPUTI_H_
#define SURF_MODEL_CPUTI_H_
#ifndef SURF_MODEL_CPUTI_H_
#define SURF_MODEL_CPUTI_H_
-#include "src/kernel/resource/profile/
trace_mgr
.hpp"
+#include "src/kernel/resource/profile/
Profile
.hpp"
#include "src/surf/cpu_interface.hpp"
#include <boost/intrusive/list.hpp>
#include "src/surf/cpu_interface.hpp"
#include <boost/intrusive/list.hpp>
+#include <memory>
namespace simgrid {
namespace kernel {
namespace simgrid {
namespace kernel {
@@
-26,7
+27,7
@@
class XBT_PRIVATE CpuTi;
*********/
class CpuTiProfile {
public:
*********/
class CpuTiProfile {
public:
- explicit CpuTiProfile(profile::Profile* profile);
+ explicit CpuTiProfile(
const
profile::Profile* profile);
double integrate_simple(double a, double b);
double integrate_simple_point(double a);
double integrate_simple(double a, double b);
double integrate_simple_point(double a);
@@
-44,26
+45,25
@@
class CpuTiTmgr {
};
public:
};
public:
- explicit CpuTiTmgr(double value) :
type_(Type::FIXED),
value_(value){};
+ explicit CpuTiTmgr(double value) : value_(value){};
CpuTiTmgr(profile::Profile* speed_profile, double value);
CpuTiTmgr(const CpuTiTmgr&) = delete;
CpuTiTmgr& operator=(const CpuTiTmgr&) = delete;
CpuTiTmgr(profile::Profile* speed_profile, double value);
CpuTiTmgr(const CpuTiTmgr&) = delete;
CpuTiTmgr& operator=(const CpuTiTmgr&) = delete;
- ~CpuTiTmgr();
double integrate(double a, double b);
double solve(double a, double amount);
double get_power_scale(double a);
private:
double integrate(double a, double b);
double solve(double a, double amount);
double get_power_scale(double a);
private:
- Type type_;
+ Type type_
= Type::FIXED
;
double value_; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
/* Dynamic */
double last_time_ = 0.0; /*< Integral interval last point (discrete time) */
double value_; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
/* Dynamic */
double last_time_ = 0.0; /*< Integral interval last point (discrete time) */
- double total_
= 0.0; /*< Integral total between 0 and last_pointn
*/
+ double total_
= 0.0; /*< Integral total between 0 and last point
*/
-
CpuTiProfile* profile_
= nullptr;
- profile::Profile* speed_profile_
= nullptr;
+
std::unique_ptr<CpuTiProfile> profile_
= nullptr;
+ profile::Profile* speed_profile_ = nullptr;
};
/**********
};
/**********
@@
-83,7
+83,7
@@
public:
void suspend() override;
void resume() override;
void set_max_duration(double duration) override;
void suspend() override;
void resume() override;
void set_max_duration(double duration) override;
- void set_
priority(double priori
ty) override;
+ void set_
sharing_penalty(double sharing_penal
ty) override;
double get_remains() override;
CpuTi *cpu_;
double get_remains() override;
CpuTi *cpu_;
@@
-112,7
+112,7
@@
public:
bool is_used() override;
CpuAction* execution_start(double size) override;
bool is_used() override;
CpuAction* execution_start(double size) override;
- Action* execution_start(double, int) override
+
Cpu
Action* execution_start(double, int) override
{
THROW_UNIMPLEMENTED;
return nullptr;
{
THROW_UNIMPLEMENTED;
return nullptr;
@@
-145,7
+145,7
@@
public:
CpuTiModel& operator=(const CpuTiModel&) = delete;
~CpuTiModel() override;
Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core) override;
CpuTiModel& operator=(const CpuTiModel&) = delete;
~CpuTiModel() override;
Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core) override;
- double next_occuring_event(double now) override;
+ double next_occur
r
ing_event(double now) override;
void update_actions_state(double now, double delta) override;
CpuTiList modified_cpus_;
void update_actions_state(double now, double delta) override;
CpuTiList modified_cpus_;