X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad2e588c6af6cf84b18ba7c1c96f4f9785d93c28..7ccf766b5786740fe24d500b99b0b60bf5c5d6a2:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index be2220250a..ded3bb9ad9 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -1,3 +1,9 @@ +/* Copyright (c) 2013-2014. The SimGrid Team. + * All rights reserved. */ + +/* This program is free software; you can redistribute it and/or modify it + * under the terms of the license (GNU LGPL) which comes with this package. */ + #include "surf_interface.hpp" #include "workstation_interface.hpp" #include "vm_workstation_interface.hpp" @@ -25,7 +31,7 @@ static WorkstationVMPtr get_casted_vm_workstation(surf_resource_t resource){ } char *surf_routing_edge_name(sg_routing_edge_t edge){ - return edge->p_name; + return edge->getName(); } #ifdef CONTEXT_THREADS @@ -129,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{ @@ -523,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(); } @@ -535,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; }