XBT_DEBUG("Updating models (min = %g, NOW = %g, next_event_date = %g)", time_delta, NOW, next_event_date);
while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) {
- if (resource->isUsed() || xbt_dict_get_or_null(watched_hosts_lib, resource->getName())) {
+ if (resource->isUsed() || xbt_dict_get_or_null(watched_hosts_lib, resource->cname())) {
time_delta = next_event_date - NOW;
XBT_DEBUG("This event invalidates the next_occuring_event() computation of models. Next event set to %f", time_delta);
}
NOW = next_event_date;
/* update state of the corresponding resource to the new value. Does not touch lmm.
It will be modified if needed when updating actions */
- XBT_DEBUG("Calling update_resource_state for resource %s", resource->getName());
+ XBT_DEBUG("Calling update_resource_state for resource %s", resource->cname());
resource->apply_event(event, value);
NOW = round_start;
}
/*********
* MODEL *
*********/
-
-surf_action_t surf_model_extract_done_action_set(surf_model_t model){
- if (model->getDoneActionSet()->empty())
+static surf_action_t ActionListExtract(simgrid::surf::ActionList* list)
+{
+ if (list->empty())
return nullptr;
- surf_action_t res = &model->getDoneActionSet()->front();
- model->getDoneActionSet()->pop_front();
+ surf_action_t res = &list->front();
+ list->pop_front();
return res;
}
+surf_action_t surf_model_extract_done_action_set(surf_model_t model)
+{
+ return ActionListExtract(model->getDoneActionSet());
+}
+
surf_action_t surf_model_extract_failed_action_set(surf_model_t model){
- if (model->getFailedActionSet()->empty())
- return nullptr;
- surf_action_t res = &model->getFailedActionSet()->front();
- model->getFailedActionSet()->pop_front();
- return res;
+ return ActionListExtract(model->getFailedActionSet());
}
int surf_model_running_action_set_size(surf_model_t model){
return model->getRunningActionSet()->size();
}
-surf_action_t surf_host_sleep(sg_host_t host, double duration){
- return host->pimpl_cpu->sleep(duration);
-}
-
surf_action_t surf_host_open(sg_host_t host, const char* fullpath){
return host->pimpl_->open(fullpath);
}