delete model;
delete all_existing_models;
- simgrid::surf::surfExitCallbacks();
if (future_evt_set) {
delete future_evt_set;
continue;
/* bogus priority, skip it */
- if (action->getPriority() <= 0 || action->getHat()==LATENCY)
+ if (action->getPriority() <= 0 || action->getHat() == Action::Type::LATENCY)
continue;
action->updateRemainingLazy(now);
action->getMaxDuration());
if (min > -1) {
- action->heapUpdate(actionHeap_, min, max_dur_flag ? MAX_DURATION : NORMAL);
+ action->heapUpdate(actionHeap_, min, max_dur_flag ? Action::Type::MAX_DURATION : Action::Type::NORMAL);
XBT_DEBUG("Insert at heap action(%p) min %f now %f", action, min, now);
} else
DIE_IMPOSSIBLE;
namespace simgrid {
namespace surf {
-Resource::Resource(Model* model, const std::string& name, lmm_constraint_t constraint)
+Resource::Resource(Model* model, const std::string& name, kernel::lmm::Constraint* constraint)
: name_(name), model_(model), constraint_(constraint)
{}
return name_ == other.name_;
}
-lmm_constraint_t Resource::constraint() const
+kernel::lmm::Constraint* Resource::constraint() const
{
- return constraint_;
+ return const_cast<kernel::lmm::Constraint*>(constraint_);
}
}
{
}
-Action::Action(simgrid::surf::Model* model, double cost, bool failed, lmm_variable_t var)
+Action::Action(simgrid::surf::Model* model, double cost, bool failed, kernel::lmm::Variable* var)
: remains_(cost), start_(surf_get_clock()), cost_(cost), model_(model), variable_(var)
{
if (failed)
* LATENCY = this is a heap entry to warn us when the latency is payed
* MAX_DURATION =this is a heap entry to warn us when the max_duration limit is reached
*/
-void Action::heapInsert(heap_type& heap, double key, enum heap_action_type hat)
+void Action::heapInsert(heap_type& heap, double key, Action::Type hat)
{
hat_ = hat;
heapHandle_ = heap.emplace(std::make_pair(key, this));
void Action::heapRemove(heap_type& heap)
{
- hat_ = NOTSET;
+ hat_ = Action::Type::NOTSET;
if (heapHandle_) {
heap.erase(*heapHandle_);
clearHeapHandle();
}
}
-void Action::heapUpdate(heap_type& heap, double key, enum heap_action_type hat)
+void Action::heapUpdate(heap_type& heap, double key, Action::Type hat)
{
hat_ = hat;
if (heapHandle_) {