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
Merge branch 'master' of framagit.org:simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
cpu_ti.hpp
diff --git
a/src/surf/cpu_ti.hpp
b/src/surf/cpu_ti.hpp
index
9d3491d
..
457ebcc
100644
(file)
--- a/
src/surf/cpu_ti.hpp
+++ b/
src/surf/cpu_ti.hpp
@@
-1,17
+1,15
@@
-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-2019. 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. */
-#include <xbt/base.h>
+#ifndef SURF_MODEL_CPUTI_H_
+#define SURF_MODEL_CPUTI_H_
#include "src/surf/cpu_interface.hpp"
#include "src/surf/trace_mgr.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/trace_mgr.hpp"
-#include "surf/surf_routing.h"
-/* Epsilon */
-#define EPSILON 0.000000001
+#include <boost/intrusive/list.hpp>
namespace simgrid {
namespace surf {
namespace simgrid {
namespace surf {
@@
-19,86
+17,78
@@
namespace surf {
/***********
* Classes *
***********/
/***********
* Classes *
***********/
-class XBT_PRIVATE CpuTiTrace;
-class XBT_PRIVATE CpuTiTgmr;
class XBT_PRIVATE CpuTiModel;
class XBT_PRIVATE CpuTi;
class XBT_PRIVATE CpuTiModel;
class XBT_PRIVATE CpuTi;
-class XBT_PRIVATE CpuTiAction;
-
-struct tiTag;
/*********
* Trace *
*********/
class CpuTiTrace {
public:
/*********
* Trace *
*********/
class CpuTiTrace {
public:
- CpuTiTrace(tmgr_trace_t speedTrace);
+ explicit CpuTiTrace(tmgr_trace_t speedTrace);
+ CpuTiTrace(const CpuTiTrace&) = delete;
+ CpuTiTrace& operator=(const CpuTiTrace&) = delete;
~CpuTiTrace();
~CpuTiTrace();
- double integrate
S
imple(double a, double b);
- double integrate
SimpleP
oint(double a);
- double solve
S
imple(double a, double amount);
+ double integrate
_s
imple(double a, double b);
+ double integrate
_simple_p
oint(double a);
+ double solve
_s
imple(double a, double amount);
- double
*timeP
oints_;
+ double
* time_p
oints_;
double *integral_;
double *integral_;
- int nb
P
oints_;
- int binary
Search(double *
array, double a, int low, int high);
+ int nb
_p
oints_;
+ int binary
_search(double*
array, double a, int low, int high);
};
};
-
enum trace_type
{
-
-
TRACE_FIXED,
/*< Trace fixed, no availability file */
-
TRACE_DYNAMIC
/*< Dynamic, have an availability file */
-};
+
class CpuTiTmgr
{
+ enum class Type {
+
FIXED,
/*< Trace fixed, no availability file */
+
DYNAMIC
/*< Dynamic, have an availability file */
+
};
-class CpuTiTgmr {
public:
public:
- CpuTiTgmr(trace_type type, double value)
- : type_(type), value_(value)
-
{}
;
- CpuTiT
gmr(tmgr_trace_t speedTrace, double value)
;
- ~CpuTiT
gm
r();
+ explicit CpuTiTmgr(double value) : type_(Type::FIXED), value_(value){};
+ CpuTiTmgr(tmgr_trace_t speed_trace, double value);
+
CpuTiTmgr(const CpuTiTmgr&) = delete
;
+ CpuTiT
mgr& operator=(const CpuTiTmgr&) = delete
;
+ ~CpuTiT
mg
r();
double integrate(double a, double b);
double solve(double a, double amount);
double integrate(double a, double b);
double solve(double a, double amount);
- double solveSomewhatSimple(double a, double amount);
- double getPowerScale(double a);
+ double get_power_scale(double a);
- trace_type type_;
+private:
+ Type type_;
double value_; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
/* Dynamic */
double value_; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
/* Dynamic */
- double last
T
ime_ = 0.0; /*< Integral interval last point (discrete time) */
+ double last
_t
ime_ = 0.0; /*< Integral interval last point (discrete time) */
double total_ = 0.0; /*< Integral total between 0 and last_pointn */
CpuTiTrace *trace_ = nullptr;
double total_ = 0.0; /*< Integral total between 0 and last_pointn */
CpuTiTrace *trace_ = nullptr;
- tmgr_trace_t speed
T
race_ = nullptr;
+ tmgr_trace_t speed
_t
race_ = nullptr;
};
/**********
* Action *
**********/
};
/**********
* Action *
**********/
-class
CpuTiAction
: public CpuAction {
+class
XBT_PRIVATE CpuTiAction
: public CpuAction {
friend class CpuTi;
public:
friend class CpuTi;
public:
- CpuTiAction(CpuTiModel *model, double cost, bool failed, CpuTi *cpu);
+ CpuTiAction(CpuTi* cpu, double cost);
+ ~CpuTiAction();
- void setState(simgrid::surf::Action::State state) override;
- int unref() override;
+ void set_state(kernel::resource::Action::State state) override;
void cancel() override;
void cancel() override;
- void updateIndexHeap(int i);
void suspend() override;
void resume() override;
void suspend() override;
void resume() override;
- void setMaxDuration(double duration) override;
- void setPriority(double priority) override;
- double getRemains() override;
- void setAffinity(Cpu * /*cpu*/, unsigned long /*mask*/) override {};
+ void set_max_duration(double duration) override;
+ void set_priority(double priority) override;
+ double get_remains() override;
CpuTi *cpu_;
CpuTi *cpu_;
- int indexHeap_;
- int suspended_ = 0;
-public:
+
boost::intrusive::list_member_hook<> action_ti_hook;
};
boost::intrusive::list_member_hook<> action_ti_hook;
};
@@
-110,30
+100,32
@@
typedef boost::intrusive::list<CpuTiAction, ActionTiListOptions > ActionTiList;
************/
class CpuTi : public Cpu {
public:
************/
class CpuTi : public Cpu {
public:
- CpuTi(CpuTiModel
*model, simgrid::s4u::Host *host, xbt_dynar_t speedPerP
state, int core);
- ~CpuTi();
+ CpuTi(CpuTiModel
* model, simgrid::s4u::Host* host, std::vector<double>* speed_per_p
state, int core);
+ ~CpuTi()
override
;
- void set
SpeedT
race(tmgr_trace_t trace) override;
+ void set
_speed_t
race(tmgr_trace_t trace) override;
- void apply_event(tmgr_trace_
iterator
_t event, double value) override;
- void update
ActionsFinishT
ime(double now);
- void update
RemainingA
mount(double now);
+ void apply_event(tmgr_trace_
event
_t event, double value) override;
+ void update
_actions_finish_t
ime(double now);
+ void update
_remaining_a
mount(double now);
- bool is
U
sed() override;
+ bool is
_u
sed() override;
CpuAction *execution_start(double size) override;
CpuAction *execution_start(double size) override;
+ simgrid::kernel::resource::Action* execution_start(double size, int requested_cores) override
+ {
+ THROW_UNIMPLEMENTED;
+ return nullptr;
+ }
CpuAction *sleep(double duration) override;
CpuAction *sleep(double duration) override;
- double getAvailableSpeed() override;
-
- void modified(bool modified);
+ double get_speed_ratio() override;
- CpuTiTgmr *speedIntegratedTrace_ = NULL;/*< Structure with data needed to integrate trace file */
- ActionTiList *actionSet_ = NULL; /*< set with all actions running on cpu */
- double sumPriority_ = 0; /*< the sum of actions' priority that are running on cpu */
- double lastUpdate_ = 0; /*< last update of actions' remaining amount done */
+ void set_modified(bool modified);
- double currentFrequency_;
+ CpuTiTmgr* speed_integrated_trace_ = nullptr; /*< Structure with data needed to integrate trace file */
+ ActionTiList action_set_; /*< set with all actions running on cpu */
+ double sum_priority_ = 0; /*< the sum of actions' priority that are running on cpu */
+ double last_update_ = 0; /*< last update of actions' remaining amount done */
-public:
boost::intrusive::list_member_hook<> cpu_ti_hook;
};
boost::intrusive::list_member_hook<> cpu_ti_hook;
};
@@
-145,24
+137,18
@@
typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;
*********/
class CpuTiModel : public CpuModel {
public:
*********/
class CpuTiModel : public CpuModel {
public:
+ static void create_pm_vm_models(); // Make both models be TI models
+
CpuTiModel();
CpuTiModel();
- ~CpuTiModel();
- Cpu
*createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerP
state, int core) override;
+ ~CpuTiModel()
override
;
+ Cpu
* create_cpu(simgrid::s4u::Host* host, std::vector<double>* speed_per_p
state, int core) override;
double next_occuring_event(double now) override;
double next_occuring_event(double now) override;
- void updateActionsState(double now, double delta) override;
-
- ActionList *runningActionSetThatDoesNotNeedBeingChecked_;
- CpuTiList *modifiedCpu_;
- xbt_heap_t tiActionHeap_;
+ void update_actions_state(double now, double delta) override;
-protected:
- void NotifyResourceTurnedOn(simgrid::surf::Resource*){};
- void NotifyResourceTurnedOff(simgrid::surf::Resource*){};
-
- void NotifyActionCancel(Action*){};
- void NotifyActionResume(Action*){};
- void NotifyActionSuspend(Action*){};
+ CpuTiList modified_cpus_;
};
}
}
};
}
}
+
+#endif /* SURF_MODEL_CPUTI_H_ */