* Callbacks *
*************/
-std::list<Cpu*> getActionCpus(CpuAction *action) {
- std::list<Cpu*> retlist;
- lmm_system_t sys = action->getModel()->getMaxminSystem();
- int llen = lmm_get_number_of_cnst_from_var(sys, action->getVariable());
-
- for(int i = 0; i<llen; i++) {
- retlist.push_back( (Cpu*)(lmm_constraint_id( lmm_get_cnst_from_var(sys, action->getVariable(), i) )) );
- }
- return retlist;
-}
-
-simgrid::xbt::signal<void(CpuAction*, e_surf_action_state_t, e_surf_action_state_t)> cpuActionStateChangedCallbacks;
+simgrid::xbt::signal<void(CpuAction*, Action::State, Action::State)> cpuActionStateChangedCallbacks;
/*********
* Model *
/* set the remains to 0 due to precision problems when updating the remaining amount */
action->setRemains(0);
- action->setState(SURF_ACTION_DONE);
+ action->setState(Action::State::done);
action->heapRemove(getActionHeap()); //FIXME: strange call since action was already popped
}
if (TRACE_is_enabled()) {
if ((action->getRemainsNoUpdate() <= 0) &&
(lmm_get_variable_weight(action->getVariable()) > 0)) {
action->finish();
- action->setState(SURF_ACTION_DONE);
+ action->setState(Action::State::done);
} else if ((action->getMaxDuration() != NO_MAX_DURATION) &&
(action->getMaxDuration() <= 0)) {
action->finish();
- action->setState(SURF_ACTION_DONE);
+ action->setState(Action::State::done);
}
}
}
XBT_OUT();
}
-simgrid::xbt::signal<void(simgrid::surf::CpuAction*, e_surf_action_state_t)> CpuAction::onStateChange;
+simgrid::xbt::signal<void(simgrid::surf::CpuAction*, Action::State)> CpuAction::onStateChange;
-void CpuAction::setState(e_surf_action_state_t state){
- e_surf_action_state_t previous = getState();
+void CpuAction::setState(Action::State state){
+ Action::State previous = getState();
Action::setState(state);
onStateChange(this, previous);
}
+std::list<Cpu*> CpuAction::cpus() {
+ std::list<Cpu*> retlist;
+ lmm_system_t sys = getModel()->getMaxminSystem();
+ int llen = lmm_get_number_of_cnst_from_var(sys, getVariable());
+
+ for(int i = 0; i<llen; i++)
+ retlist.push_back( (Cpu*)(lmm_constraint_id( lmm_get_cnst_from_var(sys, getVariable(), i) )) );
+
+ return retlist;
+}
}
}