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
assert when you should!
[simgrid.git]
/
src
/
surf
/
cpu_cas01.cpp
diff --git
a/src/surf/cpu_cas01.cpp
b/src/surf/cpu_cas01.cpp
index
9893b57
..
5c7bc6e
100644
(file)
--- a/
src/surf/cpu_cas01.cpp
+++ b/
src/surf/cpu_cas01.cpp
@@
-8,6
+8,7
@@
#include "cpu_ti.hpp"
#include "maxmin_private.hpp"
#include "simgrid/sg_config.h"
#include "cpu_ti.hpp"
#include "maxmin_private.hpp"
#include "simgrid/sg_config.h"
+#include "src/surf/platform.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu,
"Logging specific to the SURF CPU IMPROVED module");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu,
"Logging specific to the SURF CPU IMPROVED module");
@@
-32,7
+33,9
@@
void surf_cpu_model_init_Cas01()
surf_cpu_model_vm = new simgrid::surf::CpuCas01Model();
xbt_dynar_push(all_existing_models, &surf_cpu_model_vm);
surf_cpu_model_vm = new simgrid::surf::CpuCas01Model();
xbt_dynar_push(all_existing_models, &surf_cpu_model_vm);
- sg_platf_postparse_add_cb(simgrid::surf::cpu_add_traces);
+ simgrid::surf::on_postparse.connect([]() {
+ surf_cpu_model_pm->addTraces();
+ });
}
namespace simgrid {
}
namespace simgrid {
@@
-84,7
+87,7
@@
CpuCas01Model::~CpuCas01Model()
delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
}
delete p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
}
-Cpu *CpuCas01Model::createCpu(simgrid::Host *host, xbt_dynar_t speedPeak,
+Cpu *CpuCas01Model::createCpu(simgrid::
s4u::
Host *host, xbt_dynar_t speedPeak,
int pstate, double speedScale,
tmgr_trace_t speedTrace, int core,
int initiallyOn,
int pstate, double speedScale,
tmgr_trace_t speedTrace, int core,
int initiallyOn,
@@
-137,7
+140,7
@@
void CpuCas01Model::addTraces()
/************
* Resource *
************/
/************
* Resource *
************/
-CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::Host *host, xbt_dynar_t speedPeak,
+CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::
s4u::
Host *host, xbt_dynar_t speedPeak,
int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
int initiallyOn, tmgr_trace_t stateTrace)
: Cpu(model, host,
int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
int initiallyOn, tmgr_trace_t stateTrace)
: Cpu(model, host,
@@
-163,12
+166,12
@@
CpuCas01::~CpuCas01()
xbt_dynar_free(&p_speedPeakList);
}
xbt_dynar_free(&p_speedPeakList);
}
-void CpuCas01::setStateEvent(tmgr_trace_
event
_t stateEvent)
+void CpuCas01::setStateEvent(tmgr_trace_
iterator
_t stateEvent)
{
p_stateEvent = stateEvent;
}
{
p_stateEvent = stateEvent;
}
-void CpuCas01::setPowerEvent(tmgr_trace_
event
_t powerEvent)
+void CpuCas01::setPowerEvent(tmgr_trace_
iterator
_t powerEvent)
{
p_speedEvent = powerEvent;
}
{
p_speedEvent = powerEvent;
}
@@
-201,14
+204,14
@@
void CpuCas01::onSpeedChange() {
Cpu::onSpeedChange();
}
Cpu::onSpeedChange();
}
-void CpuCas01::updateState(tmgr_trace_
event
_t event_type, double value, double date)
+void CpuCas01::updateState(tmgr_trace_
iterator
_t event_type, double value, double date)
{
lmm_variable_t var = NULL;
lmm_element_t elem = NULL;
if (event_type == p_speedEvent) {
{
lmm_variable_t var = NULL;
lmm_element_t elem = NULL;
if (event_type == p_speedEvent) {
-
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
-
xbt_assert(m_core == 1, "FIXME: add speed scaling code also for constraint_core[i]");
+ /* TODO (Hypervisor): do the same thing for constraint_core[i] */
+ xbt_assert(m_core == 1, "FIXME: add speed scaling code also for constraint_core[i]");
m_speedScale = value;
onSpeedChange();
m_speedScale = value;
onSpeedChange();
@@
-216,7
+219,7
@@
void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d
if (tmgr_trace_event_free(event_type))
p_speedEvent = NULL;
} else if (event_type == p_stateEvent) {
if (tmgr_trace_event_free(event_type))
p_speedEvent = NULL;
} else if (event_type == p_stateEvent) {
-
/* TODO (Hypervisor): do the same thing for constraint_core[i] */
+ /* TODO (Hypervisor): do the same thing for constraint_core[i] */
xbt_assert(m_core == 1, "FIXME: add state change code also for constraint_core[i]");
if (value > 0) {
xbt_assert(m_core == 1, "FIXME: add state change code also for constraint_core[i]");
if (value > 0) {
@@
-254,7
+257,7
@@
CpuAction *CpuCas01::execute(double size)
XBT_IN("(%s,%g)", getName(), size);
CpuCas01Action *action = new CpuCas01Action(getModel(), size, isOff(),
XBT_IN("(%s,%g)", getName(), size);
CpuCas01Action *action = new CpuCas01Action(getModel(), size, isOff(),
-
m_speedScale * m_speedPeak, getConstraint());
+ m_speedScale * m_speedPeak, getConstraint());
XBT_OUT();
return action;
XBT_OUT();
return action;
@@
-267,7
+270,7
@@
CpuAction *CpuCas01::sleep(double duration)
XBT_IN("(%s,%g)", getName(), duration);
CpuCas01Action *action = new CpuCas01Action(getModel(), 1.0, isOff(),
XBT_IN("(%s,%g)", getName(), duration);
CpuCas01Action *action = new CpuCas01Action(getModel(), 1.0, isOff(),
-
m_speedScale * m_speedPeak, getConstraint());
+ m_speedScale * m_speedPeak, getConstraint());
// FIXME: sleep variables should not consume 1.0 in lmm_expand
// FIXME: sleep variables should not consume 1.0 in lmm_expand
@@
-276,13
+279,13
@@
CpuAction *CpuCas01::sleep(double duration)
if (duration == NO_MAX_DURATION) {
/* Move to the *end* of the corresponding action set. This convention
is used to speed up update_resource_state */
if (duration == NO_MAX_DURATION) {
/* Move to the *end* of the corresponding action set. This convention
is used to speed up update_resource_state */
-
action->getStateSet()->erase(action->getStateSet()->iterator_to(*action));
+ action->getStateSet()->erase(action->getStateSet()->iterator_to(*action));
action->p_stateSet = static_cast<CpuCas01Model*>(getModel())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
action->getStateSet()->push_back(*action);
}
lmm_update_variable_weight(getModel()->getMaxminSystem(),
action->p_stateSet = static_cast<CpuCas01Model*>(getModel())->p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
action->getStateSet()->push_back(*action);
}
lmm_update_variable_weight(getModel()->getMaxminSystem(),
-
action->getVariable(), 0.0);
+ action->getVariable(), 0.0);
if (getModel()->getUpdateMechanism() == UM_LAZY) { // remove action from the heap
action->heapRemove(getModel()->getActionHeap());
// this is necessary for a variable with weight 0 since such
if (getModel()->getUpdateMechanism() == UM_LAZY) { // remove action from the heap
action->heapRemove(getModel()->getActionHeap());
// this is necessary for a variable with weight 0 since such