(xbt_dynar_length(power_trace->s_list.event_list) + 1));
p_integral = (double*) xbt_malloc0(sizeof(double) *
(xbt_dynar_length(power_trace->s_list.event_list) + 1));
- m_nbPoints = xbt_dynar_length(power_trace->s_list.event_list);
+ m_nbPoints = xbt_dynar_length(power_trace->s_list.event_list) + 1;
xbt_dynar_foreach(power_trace->s_list.event_list, cpt, val) {
p_timePoints[i] = time;
p_integral[i] = integral;
CpuTiModel::CpuTiModel() : CpuModel("cpu_ti")
{
- CpuTiPtr cpu = NULL;
-
p_runningActionSetThatDoesNotNeedBeingChecked = new ActionList();
- p_modifiedCpu =
- xbt_swag_new(xbt_swag_offset(*cpu, p_modifiedCpuHookup));
+ p_modifiedCpu = new CpuTiList();
p_tiActionHeap = xbt_heap_new(8, NULL);
xbt_heap_set_update_callback(p_tiActionHeap,
CpuTiModel::~CpuTiModel()
{
surf_cpu_model_pm = NULL;
-
delete p_runningActionSetThatDoesNotNeedBeingChecked;
- xbt_swag_free(p_modifiedCpu);
+ delete p_modifiedCpu;
xbt_heap_free(p_tiActionHeap);
}
xbt_assert(!surf_cpu_resource_priv(surf_cpu_resource_by_name(name)),
"Host '%s' declared several times in the platform file",
name);
+ xbt_assert(xbt_dynar_getfirst_as(powerPeak, double) > 0.0,
+ "Power has to be >0.0. Did you forget to specify the mandatory power attribute?");
CpuTiPtr cpu = new CpuTi(this, name, powerPeak, pstate, powerScale, powerTrace,
core, stateInitial, stateTrace, cpuProperties);
xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, static_cast<ResourcePtr>(cpu));
double CpuTiModel::shareResources(double now)
{
- void *_cpu, *_cpu_next;
double min_action_duration = -1;
/* iterates over modified cpus to update share resources */
- xbt_swag_foreach_safe(_cpu, _cpu_next, p_modifiedCpu) {
- static_cast<CpuTiPtr>(_cpu)->updateActionsFinishTime(now);
+ for(CpuTiList::iterator it(p_modifiedCpu->begin()), itend(p_modifiedCpu->end())
+ ; it != itend ;) {
+ CpuTiPtr ti = &*it;
+ ++it;
+ ti->updateActionsFinishTime(now);
}
+
/* get the min next event if heap not empty */
if (xbt_heap_size(p_tiActionHeap) > 0)
min_action_duration = xbt_heap_maxkey(p_tiActionHeap) - now;
continue;
}
XBT_DEBUG("Add state trace: %s to CPU(%s)", trace_name, elm);
- cpu->p_stateEvent = tmgr_history_add_trace(history, trace, 0.0, 0, static_cast<ResourcePtr>(cpu));
+ cpu->p_stateEvent = tmgr_history_add_trace(history, trace, 0.0, 0, cpu);
}
xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
empty_trace = tmgr_empty_trace_new();
cpu->p_powerEvent =
tmgr_history_add_trace(history, empty_trace,
- cpu->p_availTrace->m_lastTime, 0, static_cast<ResourcePtr>(cpu));
+ cpu->p_availTrace->m_lastTime, 0, cpu);
}
}
}
XBT_DEBUG("power scale %f", powerScale);
p_availTrace = new CpuTiTgmr(powerTrace, powerScale);
- CpuTiActionPtr action = NULL;
- p_actionSet = xbt_swag_new(xbt_swag_offset(*action, p_cpuListHookup));
+ p_actionSet = new ActionTiList();
m_lastUpdate = 0;
xbt_dynar_get_cpy(powerPeak, 0, &m_powerPeak);
xbt_dynar_free(&powerPeak); /* kill memory leak */
- m_pstate = pstate;
- XBT_DEBUG("CPU create: peak=%f, pstate=%d", m_powerPeak, m_pstate);
-
- p_modifiedCpuHookup.prev = 0;
- p_modifiedCpuHookup.next = 0;
+ XBT_DEBUG("CPU create: peak=%f", m_powerPeak);
if (stateTrace)
- p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, static_cast<ResourcePtr>(this));
+ p_stateEvent = tmgr_history_add_trace(history, stateTrace, 0.0, 0, this);
if (powerTrace && xbt_dynar_length(powerTrace->s_list.event_list) > 1) {
// add a fake trace event if periodicity == 0
xbt_dynar_get_cpy(powerTrace->s_list.event_list,
empty_trace = tmgr_empty_trace_new();
p_powerEvent =
tmgr_history_add_trace(history, empty_trace,
- p_availTrace->m_lastTime, 0, static_cast<ResourcePtr>(this));
+ p_availTrace->m_lastTime, 0, this);
}
}
};
CpuTi::~CpuTi(){
-delete p_availTrace;
-xbt_swag_free(p_actionSet);
+ modified(false);
+ delete p_availTrace;
+ delete p_actionSet;
}
void CpuTi::updateState(tmgr_trace_event_t event_type,
double value, double date)
{
- void *_action;
CpuTiActionPtr action;
if (event_type == p_powerEvent) {
value, date);
/* update remaining of actions and put in modified cpu swag */
updateRemainingAmount(date);
- xbt_swag_insert(this, reinterpret_cast<CpuTiModelPtr>(getModel())->p_modifiedCpu);
+
+ modified(true);
power_trace = p_availTrace->p_powerTrace;
xbt_dynar_get_cpy(power_trace->s_list.event_list,
setState(SURF_RESOURCE_OFF);
/* put all action running on cpu to failed */
- xbt_swag_foreach(_action, p_actionSet) {
- action = static_cast<CpuTiActionPtr>(_action);
+ for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end())
+ ; it != itend ; ++it) {
+ action = &*it;
if (action->getState() == SURF_ACTION_RUNNING
|| action->getState() == SURF_ACTION_READY
|| action->getState() == SURF_ACTION_NOT_IN_THE_SYSTEM) {
action->setState(SURF_ACTION_FAILED);
if (action->m_indexHeap >= 0) {
CpuTiActionPtr heap_act = (CpuTiActionPtr)
- xbt_heap_remove(reinterpret_cast<CpuTiModelPtr>(getModel())->p_tiActionHeap, action->m_indexHeap);
+ xbt_heap_remove(static_cast<CpuTiModelPtr>(getModel())->p_tiActionHeap, action->m_indexHeap);
if (heap_act != action)
DIE_IMPOSSIBLE;
}
void CpuTi::updateActionsFinishTime(double now)
{
- void *_action;
CpuTiActionPtr action;
double sum_priority = 0.0, total_area, min_finish = -1;
/* update remaning amount of actions */
updateRemainingAmount(now);
- xbt_swag_foreach(_action, p_actionSet) {
- action = static_cast<CpuTiActionPtr>(_action);
+ for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end())
+ ; it != itend ; ++it) {
+ action = &*it;
/* action not running, skip it */
if (action->getStateSet() !=
surf_cpu_model_pm->getRunningActionSet())
}
m_sumPriority = sum_priority;
- xbt_swag_foreach(_action, p_actionSet) {
- action = static_cast<CpuTiActionPtr>(_action);
+ for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end())
+ ; it != itend ; ++it) {
+ action = &*it;
min_finish = -1;
/* action not running, skip it */
if (action->getStateSet() !=
XBT_DEBUG("action(%p) index %d", action, action->m_indexHeap);
if (action->m_indexHeap >= 0) {
CpuTiActionPtr heap_act = (CpuTiActionPtr)
- xbt_heap_remove(reinterpret_cast<CpuTiModelPtr>(getModel())->p_tiActionHeap, action->m_indexHeap);
+ xbt_heap_remove(static_cast<CpuTiModelPtr>(getModel())->p_tiActionHeap, action->m_indexHeap);
if (heap_act != action)
DIE_IMPOSSIBLE;
}
if (min_finish != NO_MAX_DURATION)
- xbt_heap_push(reinterpret_cast<CpuTiModelPtr>(getModel())->p_tiActionHeap, action, min_finish);
+ xbt_heap_push(static_cast<CpuTiModelPtr>(getModel())->p_tiActionHeap, action, min_finish);
XBT_DEBUG
("Update finish time: Cpu(%s) Action: %p, Start Time: %f Finish Time: %f Max duration %f",
action->getMaxDuration());
}
/* remove from modified cpu */
- xbt_swag_remove(this, reinterpret_cast<CpuTiModelPtr>(getModel())->p_modifiedCpu);
+ modified(false);
}
bool CpuTi::isUsed()
{
- return xbt_swag_size(p_actionSet);
+ return !p_actionSet->empty();
}
-
-
double CpuTi::getAvailableSpeed()
{
m_powerScale = p_availTrace->getPowerScale(surf_get_clock());
void CpuTi::updateRemainingAmount(double now)
{
double area_total;
- void* _action;
CpuTiActionPtr action;
/* already updated */
XBT_DEBUG("Flops total: %f, Last update %f", area_total,
m_lastUpdate);
- xbt_swag_foreach(_action, p_actionSet) {
- action = static_cast<CpuTiActionPtr>(_action);
+ for(ActionTiList::iterator it(p_actionSet->begin()), itend(p_actionSet->end())
+ ; it != itend ; ++it) {
+ action = &*it;
/* action not running, skip it */
if (action->getStateSet() !=
getModel()->getRunningActionSet())
XBT_IN("(%s,%g)", getName(), size);
CpuTiActionPtr action = new CpuTiAction(static_cast<CpuTiModelPtr>(getModel()), size, getState() != SURF_RESOURCE_ON, this);
- xbt_swag_insert(action, p_actionSet);
+ p_actionSet->push_back(*action);
XBT_OUT();
return action;
/* 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->p_stateSet = reinterpret_cast<CpuTiModelPtr>(getModel())->p_runningActionSetThatDoesNotNeedBeingChecked;
- action->getStateSet()->push_back(*static_cast<ActionPtr>(action));
+ action->p_stateSet = static_cast<CpuTiModelPtr>(getModel())->p_runningActionSetThatDoesNotNeedBeingChecked;
+ action->getStateSet()->push_back(*action);
}
- xbt_swag_insert(action, p_actionSet);
+ p_actionSet->push_back(*action);
XBT_OUT();
return action;
}
+void CpuTi::modified(bool modified){
+ CpuTiListPtr modifiedCpu = static_cast<CpuTiModelPtr>(getModel())->p_modifiedCpu;
+ if (modified) {
+ if (!is_linked()) {
+ modifiedCpu->push_back(*this);
+ }
+ } else {
+ if (is_linked()) {
+ modifiedCpu->erase(modifiedCpu->iterator_to(*this));
+ }
+ }
+}
+
/**********
* Action *
**********/
CpuTiPtr cpu)
: CpuAction(model_, cost, failed)
{
- p_cpuListHookup.next = 0;
- p_cpuListHookup.prev = 0;
-
m_suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
p_cpu = cpu;
m_indexHeap = -1;
- xbt_swag_insert(cpu, reinterpret_cast<CpuTiModelPtr>(getModel())->p_modifiedCpu);
+ p_cpu->modified(true);
}
void CpuTiAction::updateIndexHeap(int i)
void CpuTiAction::setState(e_surf_action_state_t state)
{
CpuAction::setState(state);
- xbt_swag_insert(p_cpu, reinterpret_cast<CpuTiModelPtr>(getModel())->p_modifiedCpu);
+ p_cpu->modified(true);
}
int CpuTiAction::unref()
if (actionHook::is_linked())
getStateSet()->erase(getStateSet()->iterator_to(*this));
/* remove from action_set */
- xbt_swag_remove(this, p_cpu->p_actionSet);
+ if (actionTiHook::is_linked())
+ p_cpu->p_actionSet->erase(p_cpu->p_actionSet->iterator_to(*this));
/* remove from heap */
- xbt_heap_remove(reinterpret_cast<CpuTiModelPtr>(getModel())->p_tiActionHeap, this->m_indexHeap);
- xbt_swag_insert(p_cpu, reinterpret_cast<CpuTiModelPtr>(getModel())->p_modifiedCpu);
+ xbt_heap_remove(static_cast<CpuTiModelPtr>(getModel())->p_tiActionHeap, this->m_indexHeap);
+ p_cpu->modified(true);
delete this;
return 1;
}
{
this->setState(SURF_ACTION_FAILED);
xbt_heap_remove(getModel()->getActionHeap(), this->m_indexHeap);
- xbt_swag_insert(p_cpu, reinterpret_cast<CpuTiModelPtr>(getModel())->p_modifiedCpu);
+ p_cpu->modified(true);
return;
}
if (m_suspended != 2) {
m_suspended = 1;
xbt_heap_remove(getModel()->getActionHeap(), m_indexHeap);
- xbt_swag_insert(p_cpu, reinterpret_cast<CpuTiModelPtr>(getModel())->p_modifiedCpu);
+ p_cpu->modified(true);
}
XBT_OUT();
}
XBT_IN("(%p)", this);
if (m_suspended != 2) {
m_suspended = 0;
- xbt_swag_insert(p_cpu, reinterpret_cast<CpuTiModelPtr>(getModel())->p_modifiedCpu);
+ p_cpu->modified(true);
}
XBT_OUT();
}
{
XBT_IN("(%p,%g)", this, priority);
m_priority = priority;
- xbt_swag_insert(p_cpu, reinterpret_cast<CpuTiModelPtr>(getModel())->p_modifiedCpu);
+ p_cpu->modified(true);
XBT_OUT();
}
