X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3969bc792f09c7ac4ebd5c1e556704b69269d2f7..1a7954733368fabf12e8e4012c89db88843d9176:/src/surf/surf_c_bindings.cpp?ds=sidebyside

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index b99ded5a68..5ff85aa899 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);
@@ -72,13 +68,13 @@ double surf_solve(double max_date)
 
   /* Physical models MUST be resolved first */
   XBT_DEBUG("Looking for next event in physical models");
-  double next_event_phy = surf_host_model->next_occuring_event(NOW);
+  double next_event_phy = surf_host_model->nextOccuringEvent(NOW);
   if ((time_delta < 0.0 || next_event_phy < time_delta) && next_event_phy >= 0.0) {
     time_delta = next_event_phy;
   }
   if (surf_vm_model != nullptr) {
     XBT_DEBUG("Looking for next event in virtual models");
-    double next_event_virt = surf_vm_model->next_occuring_event(NOW);
+    double next_event_virt = surf_vm_model->nextOccuringEvent(NOW);
     if ((time_delta < 0.0 || next_event_virt < time_delta) && next_event_virt >= 0.0)
       time_delta = next_event_virt;
   }
@@ -91,7 +87,7 @@ double surf_solve(double max_date)
     next_event_date = future_evt_set->next_date();
     XBT_DEBUG("Next TRACE event: %f", next_event_date);
 
-    if(! surf_network_model->next_occuring_event_isIdempotent()){ // NS3, I see you
+    if(! surf_network_model->nextOccuringEventIsIdempotent()){ // NS3, I see you
       if (next_event_date!=-1.0 && time_delta!=-1.0) {
         time_delta = MIN(next_event_date - NOW, time_delta);
       } else {
@@ -100,7 +96,7 @@ double surf_solve(double max_date)
 
       XBT_DEBUG("Run the NS3 network at most %fs", time_delta);
       // run until min or next flow
-      model_next_action_end = surf_network_model->next_occuring_event(time_delta);
+      model_next_action_end = surf_network_model->nextOccuringEvent(time_delta);
 
       XBT_DEBUG("Min for network : %f", model_next_action_end);
       if(model_next_action_end>=0.0)
@@ -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,14 +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);
-}
-
 surf_action_t surf_host_sleep(sg_host_t host, double duration){
   return host->pimpl_cpu->sleep(duration);
 }
@@ -233,11 +221,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 +249,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 +270,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) {