X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5b3677b425b9cc6949c1573d59ac772540cbf4b2..b4b78f6684f68475ec9c7b63af21f733ff04a435:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 8628bda367..1bcc47f1d9 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -135,7 +135,7 @@ double surf_solve(double max_date) next_event_date = tmgr_history_next_date(history); - if(!strcmp(surf_network_model->getName(), "network NS3")){//FIXME: add surf_network_model->m_name && + if(!strcmp(surf_network_model->getName(), "network NS3")){ if(next_event_date!=-1.0 && surf_min!=-1.0) { surf_min = MIN(next_event_date - NOW, surf_min); } else{ @@ -171,7 +171,7 @@ double surf_solve(double max_date) } /* update state of model_obj according to new value. Does not touch lmm. It will be modified if needed when updating actions */ - XBT_DEBUG("Calling update_resource_state for resource %s with min %lf", + XBT_DEBUG("Calling update_resource_state for resource %s with min %f", resource->getName(), surf_min); resource->updateState(event, value, next_event_date); } @@ -529,7 +529,7 @@ e_surf_action_state_t surf_action_get_state(surf_action_t action){ return action->getState(); } -int surf_action_get_cost(surf_action_t action){ +double surf_action_get_cost(surf_action_t action){ return action->getCost(); } @@ -541,6 +541,12 @@ void surf_cpu_action_set_bound(surf_action_t action, double bound) { static_cast(action)->setBound(bound); } +#ifdef HAVE_LATENCY_BOUND_TRACKING +double surf_network_action_get_latency_limited(surf_action_t action) { + return static_cast(action)->getLatencyLimited(); +} +#endif + surf_file_t surf_storage_action_get_file(surf_action_t action){ return static_cast(action)->p_file; }