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
Splitted the lmm_constraint swag called element_set into enabled_element_set and...
[simgrid.git]
/
src
/
surf
/
cpu_cas01.cpp
diff --git
a/src/surf/cpu_cas01.cpp
b/src/surf/cpu_cas01.cpp
index
ff1f38b
..
ff78c5c
100644
(file)
--- a/
src/surf/cpu_cas01.cpp
+++ b/
src/surf/cpu_cas01.cpp
@@
-33,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);
- simgrid::surf::on_postparse.connect(simgrid::surf::cpu_add_traces);
+ simgrid::surf::on_postparse.connect([]() {
+ surf_cpu_model_pm->addTraces();
+ });
}
namespace simgrid {
}
namespace simgrid {
@@
-121,7
+123,7
@@
void CpuCas01Model::addTraces()
xbt_assert(host, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
xbt_assert(host, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
- host->
setStateEvent(tmgr_history_add_trace(history, trace, 0.0, 0, host)
);
+ host->
p_stateEvent = future_evt_set->add_trace(trace, 0.0, host
);
}
xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
}
xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
@@
-131,7
+133,7
@@
void CpuCas01Model::addTraces()
xbt_assert(host, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
xbt_assert(host, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
- host->
setPowerEvent(tmgr_history_add_trace(history, trace, 0.0, 0, host)
);
+ host->
p_speedEvent = future_evt_set->add_trace(trace, 0.0, host
);
}
}
}
}
@@
-146,16
+148,15
@@
CpuCas01::CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t s
speedPeak, pstate,
core, xbt_dynar_get_as(speedPeak, pstate, double), speedScale,
initiallyOn) {
speedPeak, pstate,
core, xbt_dynar_get_as(speedPeak, pstate, double), speedScale,
initiallyOn) {
- p_speedEvent = NULL;
XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_speedPeak, m_pstate);
m_core = core;
if (speedTrace)
XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_speedPeak, m_pstate);
m_core = core;
if (speedTrace)
- p_speedEvent =
tmgr_history_add_trace(history, speedTrace, 0.0,
0, this);
+ p_speedEvent =
future_evt_set->add_trace(speedTrace, 0.
0, this);
if (stateTrace)
if (stateTrace)
- p_stateEvent =
tmgr_history_add_trace(history, stateTrace, 0.0,
0, this);
+ p_stateEvent =
future_evt_set->add_trace(stateTrace, 0.
0, this);
}
CpuCas01::~CpuCas01()
}
CpuCas01::~CpuCas01()
@@
-164,16
+165,6
@@
CpuCas01::~CpuCas01()
xbt_dynar_free(&p_speedPeakList);
}
xbt_dynar_free(&p_speedPeakList);
}
-void CpuCas01::setStateEvent(tmgr_trace_event_t stateEvent)
-{
- p_stateEvent = stateEvent;
-}
-
-void CpuCas01::setPowerEvent(tmgr_trace_event_t powerEvent)
-{
- p_speedEvent = powerEvent;
-}
-
xbt_dynar_t CpuCas01::getSpeedPeakList(){
return p_speedPeakList;
}
xbt_dynar_t CpuCas01::getSpeedPeakList(){
return p_speedPeakList;
}
@@
-202,22
+193,21
@@
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();
- if (tmgr_trace_event_free(event_type))
- p_speedEvent = NULL;
+ tmgr_trace_event_unref(&p_speedEvent);
} else if (event_type == p_stateEvent) {
} 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) {
@@
-240,22
+230,20
@@
void CpuCas01::updateState(tmgr_trace_event_t event_type, double value, double d
}
}
}
}
}
}
- if (tmgr_trace_event_free(event_type))
- p_stateEvent = NULL;
+ tmgr_trace_event_unref(&p_stateEvent);
} else {
} else {
- XBT_CRITICAL("Unknown event ! \n");
- xbt_abort();
+ xbt_die("Unknown event!\n");
}
return;
}
}
return;
}
-CpuAction *CpuCas01::execut
e
(double size)
+CpuAction *CpuCas01::execut
ion_start
(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;
@@
-268,7
+256,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
@@
-277,13
+265,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