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_ti.cpp
diff --git
a/src/surf/cpu_ti.cpp
b/src/surf/cpu_ti.cpp
index
1d6ea1e
..
d309542
100644
(file)
--- a/
src/surf/cpu_ti.cpp
+++ b/
src/surf/cpu_ti.cpp
@@
-515,7
+515,7
@@
void CpuTiModel::addTraces()
continue;
}
XBT_DEBUG("Add state trace: %s to CPU(%s)", trace_name, elm);
continue;
}
XBT_DEBUG("Add state trace: %s to CPU(%s)", trace_name, elm);
- cpu->p_stateEvent = future_evt_set->add_trace(trace, 0.0,
0,
cpu);
+ cpu->p_stateEvent = future_evt_set->add_trace(trace, 0.0, cpu);
}
xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
}
xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
@@
-538,7
+538,7
@@
void CpuTiModel::addTraces()
xbt_dynar_length(trace->s_list.event_list) - 1, &val);
if (val.delta == 0) {
cpu->p_speedEvent =
xbt_dynar_length(trace->s_list.event_list) - 1, &val);
if (val.delta == 0) {
cpu->p_speedEvent =
- future_evt_set->add_trace(tmgr_empty_trace_new(), cpu->p_availTrace->m_lastTime,
0,
cpu);
+ future_evt_set->add_trace(tmgr_empty_trace_new(), cpu->p_availTrace->m_lastTime, cpu);
}
}
}
}
}
}
@@
-564,7
+564,7
@@
CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
XBT_DEBUG("CPU create: peak=%f", m_speedPeak);
if (stateTrace)
XBT_DEBUG("CPU create: peak=%f", m_speedPeak);
if (stateTrace)
- p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0,
0,
this);
+ p_stateEvent = future_evt_set->add_trace(stateTrace, 0.0, this);
if (speedTrace && xbt_dynar_length(speedTrace->s_list.event_list) > 1) {
s_tmgr_event_t val;
if (speedTrace && xbt_dynar_length(speedTrace->s_list.event_list) > 1) {
s_tmgr_event_t val;
@@
-573,7
+573,7
@@
CpuTi::CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
xbt_dynar_length(speedTrace->s_list.event_list) - 1, &val);
if (val.delta == 0) {
p_speedEvent =
xbt_dynar_length(speedTrace->s_list.event_list) - 1, &val);
if (val.delta == 0) {
p_speedEvent =
- future_evt_set->add_trace(tmgr_empty_trace_new(), p_availTrace->m_lastTime,
0,
this);
+ future_evt_set->add_trace(tmgr_empty_trace_new(), p_availTrace->m_lastTime, this);
}
}
}
}
}
}
@@
-614,8
+614,7
@@
void CpuTi::updateState(tmgr_trace_iterator_t event_type,
p_availTrace = trace;
p_availTrace = trace;
- if (tmgr_trace_event_free(event_type))
- p_speedEvent = NULL;
+ tmgr_trace_event_unref(&p_speedEvent);
} else if (event_type == p_stateEvent) {
if (value > 0) {
} else if (event_type == p_stateEvent) {
if (value > 0) {
@@
-643,14
+642,10
@@
void CpuTi::updateState(tmgr_trace_iterator_t event_type,
}
}
}
}
}
}
- 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;
}
void CpuTi::updateActionsFinishTime(double now)
}
void CpuTi::updateActionsFinishTime(double now)
@@
-791,7
+786,7
@@
void CpuTi::updateRemainingAmount(double now)
m_lastUpdate = now;
}
m_lastUpdate = now;
}
-CpuAction *CpuTi::execut
e
(double size)
+CpuAction *CpuTi::execut
ion_start
(double size)
{
XBT_IN("(%s,%g)", getName(), size);
CpuTiAction *action = new CpuTiAction(static_cast<CpuTiModel*>(getModel()), size, isOff(), this);
{
XBT_IN("(%s,%g)", getName(), size);
CpuTiAction *action = new CpuTiAction(static_cast<CpuTiModel*>(getModel()), size, isOff(), this);