X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d18e17592e7aabd2cb96fd154858e0a3987d2800..665b37c47175d0abd08d1252180d4d37bf9a342a:/src/surf/surf_c_bindings.cpp

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index b99ded5a68..cbbd1a0271 100644
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -27,14 +27,12 @@ static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t host){
 
 extern double NOW;
 
-void surf_presolve(void)
+void surf_presolve()
 {
   double next_event_date = -1.0;
   tmgr_trace_iterator_t event = nullptr;
   double value = -1.0;
   simgrid::surf::Resource *resource = nullptr;
-  simgrid::surf::Model *model = nullptr;
-  unsigned int iter;
 
   XBT_DEBUG ("Consume all trace events occurring before the starting time.");
   while ((next_event_date = future_evt_set->next_date()) != -1.0) {
@@ -49,7 +47,7 @@ void surf_presolve(void)
   }
 
   XBT_DEBUG ("Set every models in the right state by updating them to 0.");
-  xbt_dynar_foreach(all_existing_models, iter, model)
+  for (auto model : *all_existing_models)
       model->updateActionsState(NOW, 0.0);
 }
 
@@ -60,9 +58,7 @@ double surf_solve(double max_date)
   double model_next_action_end = -1.0;
   double value = -1.0;
   simgrid::surf::Resource *resource = nullptr;
-  simgrid::surf::Model *model = nullptr;
   tmgr_trace_iterator_t event = nullptr;
-  unsigned int iter;
 
   if (max_date > 0.0) {
     xbt_assert(max_date > NOW,"You asked to simulate up to %f, but that's in the past already", max_date);
@@ -147,7 +143,7 @@ double surf_solve(double max_date)
   NOW = NOW + time_delta;
 
   // Inform the models of the date change
-  xbt_dynar_foreach(all_existing_models, iter, model) {
+  for (auto model : *all_existing_models) {
     model->updateActionsState(NOW, time_delta);
   }
 
@@ -180,10 +176,6 @@ int surf_model_running_action_set_size(surf_model_t model){
   return model->getRunningActionSet()->size();
 }
 
-void surf_vm_model_create(const char *name, sg_host_t ind_phys_host){
-  surf_vm_model->createVM(name, ind_phys_host);
-}
-
 surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_host_t src, sg_host_t dst, double size, double rate){
   return model->communicate(src->pimpl_netcard, dst->pimpl_netcard, size, rate);
 }
@@ -233,11 +225,6 @@ int surf_host_file_move(sg_host_t host, surf_file_t fd, const char* fullpath){
   return get_casted_host(host)->fileMove(fd, fullpath);
 }
 
-void surf_vm_destroy(sg_host_t vm){ // FIXME:DEADCODE
-  vm->pimpl_cpu = nullptr;
-  vm->pimpl_netcard = nullptr;
-}
-
 void surf_vm_suspend(sg_host_t vm){
   get_casted_vm(vm)->suspend();
 }
@@ -266,10 +253,6 @@ void surf_vm_set_bound(sg_host_t vm, double bound){
   get_casted_vm(vm)->setBound(bound);
 }
 
-void surf_vm_set_affinity(sg_host_t vm, sg_host_t host, unsigned long mask){
-  get_casted_vm(vm)->setAffinity(host->pimpl_cpu, mask);
-}
-
 xbt_dict_t surf_storage_get_content(surf_resource_t resource){
   return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getContent();
 }
@@ -291,7 +274,7 @@ xbt_dict_t surf_storage_get_properties(surf_resource_t resource){
 }
 
 const char* surf_storage_get_host(surf_resource_t resource){
-  return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->p_attach;
+  return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->attach_;
 }
 
 void surf_cpu_action_set_bound(surf_action_t action, double bound) {