Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
kill dead code in the C interface to surf
[simgrid.git] / src / surf / surf_c_bindings.cpp
index 5ab27f2..d9b620d 100644 (file)
@@ -1,16 +1,16 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. 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 "host_interface.hpp"
 #include "surf_interface.hpp"
-#include "workstation_interface.hpp"
-#include "vm_workstation_interface.hpp"
 #include "network_interface.hpp"
 #include "surf_routing_cluster.hpp"
-#include "instr/instr_private.h"
+#include "src/instr/instr_private.h"
 #include "plugins/energy.hpp"
+#include "virtual_machine.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
 
@@ -18,46 +18,26 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
  * TOOLS *
  *********/
 
-static CpuPtr get_casted_cpu(surf_resource_t resource){
-  return static_cast<CpuPtr>(surf_cpu_resource_priv(resource));
+static simgrid::surf::Host *get_casted_host(sg_host_t host){ //FIXME: killme
+  return host->extension<simgrid::surf::Host>();
 }
 
-static WorkstationPtr get_casted_workstation(surf_resource_t resource){
-  return static_cast<WorkstationPtr>(surf_workstation_resource_priv(resource));
+static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t host){
+  return static_cast<simgrid::surf::VirtualMachine*>(host->extension<simgrid::surf::Host>());
 }
 
-static RoutingEdgePtr get_casted_routing(surf_resource_t resource){
-  return static_cast<RoutingEdgePtr>(surf_routing_resource_priv(resource));
-}
-
-static WorkstationVMPtr get_casted_vm_workstation(surf_resource_t resource){
-  return static_cast<WorkstationVMPtr>(surf_workstation_resource_priv(resource));
-}
-
-char *surf_routing_edge_name(sg_routing_edge_t edge){
-  return edge->getName();
-}
-
-#ifdef CONTEXT_THREADS
-//FIXME:keeporremove static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */
-#endif
-
 extern double NOW;
-extern double *surf_mins; /* return value of share_resources for each model */
-extern int surf_min_index;       /* current index in surf_mins */
-extern double surf_min;               /* duration determined by surf_solve */
 
 void surf_presolve(void)
 {
   double next_event_date = -1.0;
-  tmgr_trace_event_t event = NULL;
+  tmgr_trace_iterator_t event = NULL;
   double value = -1.0;
-  ResourcePtr resource = NULL;
-  ModelPtr model = NULL;
+  simgrid::surf::Resource *resource = NULL;
+  simgrid::surf::Model *model = NULL;
   unsigned int iter;
 
-  XBT_DEBUG
-      ("First Run! Let's \"purge\" events and put models in the right state");
+  XBT_DEBUG ("Consume all trace events occurring before the starting time.");
   while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
     if (next_event_date > NOW)
       break;
@@ -70,49 +50,21 @@ void surf_presolve(void)
       }
     }
   }
-  xbt_dynar_foreach(model_list, iter, model)
-      model->updateActionsState(NOW, 0.0);
-}
 
-/**
- * Computes when the next action executed in a
- * specific model terminates; this is important,
- * because we can safely skip the amount of time
- * in which no model (read: not even a single one)
- * changes its state; so, if for instance network,
- * cpu, storage don't change (and if we assume they're
- * the only models we use... simple example here :) )
- * for 2s, 1s, 3s then we can skip 1s as after this
- * amount of time the new state needs to be considered.
- *
- */
-static void surf_share_resources(surf_model_t model)
-{
-  double next_action_end = -1.0;
-  int i = __sync_fetch_and_add(&surf_min_index, 1);
-  if (strcmp(model->getName(), "network NS3")) {
-    XBT_DEBUG("Running for Resource [%s]", model->getName());
-    next_action_end = model->shareResources(NOW);
-    XBT_DEBUG("Resource [%s] : next action end = %f",
-        model->getName(), next_action_end);
-  }
-  surf_mins[i] = next_action_end;
-}
-
-static void surf_update_actions_state(surf_model_t model)
-{
-  model->updateActionsState(NOW, surf_min);
+  XBT_DEBUG ("Set every models in the right state by updating them to 0.");
+  xbt_dynar_foreach(all_existing_models, iter, model)
+      model->updateActionsState(NOW, 0.0);
 }
 
 double surf_solve(double max_date)
 {
-  surf_min = -1.0; /* duration */
+  double surf_min = -1.0; /* duration */
   double next_event_date = -1.0;
   double model_next_action_end = -1.0;
   double value = -1.0;
-  ResourcePtr resource = NULL;
-  ModelPtr model = NULL;
-  tmgr_trace_event_t event = NULL;
+  simgrid::surf::Resource *resource = NULL;
+  simgrid::surf::Model *model = NULL;
+  tmgr_trace_iterator_t event = NULL;
   unsigned int iter;
 
   if(!host_that_restart)
@@ -122,24 +74,17 @@ double surf_solve(double max_date)
     surf_min = max_date - NOW;
   }
 
-  XBT_DEBUG("Looking for next action end for all models except NS3");
-
-  if (surf_mins == NULL) {
-    surf_mins = xbt_new(double, xbt_dynar_length(model_list_invoke));
+  /* Physical models MUST be resolved first */
+  XBT_DEBUG("Looking for next event in physical models");
+  double next_event_phy = surf_host_model->shareResources(NOW);
+  if ((surf_min < 0.0 || next_event_phy < surf_min) && next_event_phy >= 0.0) {
+         surf_min = next_event_phy;
   }
-  surf_min_index = 0;
-
-  /* sequential version */
-  xbt_dynar_foreach(model_list_invoke, iter, model) {
-    surf_share_resources(static_cast<ModelPtr>(model));
-  }
-
-  unsigned i;
-  for (i = 0; i < xbt_dynar_length(model_list_invoke); i++) {
-    if ((surf_min < 0.0 || surf_mins[i] < surf_min)
-        && surf_mins[i] >= 0.0) {
-      surf_min = surf_mins[i];
-    }
+  if (surf_vm_model != NULL) {
+         XBT_DEBUG("Looking for next event in virtual models");
+         double next_event_virt = surf_vm_model->shareResources(NOW);
+         if ((surf_min < 0.0 || next_event_virt < surf_min) && next_event_virt >= 0.0)
+                 surf_min = next_event_virt;
   }
 
   XBT_DEBUG("Min for resources (remember that NS3 don't update that value) : %f", surf_min);
@@ -151,7 +96,7 @@ double surf_solve(double max_date)
 
     next_event_date = tmgr_history_next_date(history);
 
-    if(!strcmp(surf_network_model->getName(), "network NS3")){
+    if(! surf_network_model->shareResourcesIsIdempotent()){ // NS3, I see you
       if(next_event_date!=-1.0 && surf_min!=-1.0) {
         surf_min = MIN(next_event_date - NOW, surf_min);
       } else{
@@ -206,8 +151,8 @@ double surf_solve(double max_date)
   NOW = NOW + surf_min;
   /* FIXME: model_list or model_list_invoke? revisit here later */
   /* sequential version */
-  xbt_dynar_foreach(model_list, iter, model) {
-    surf_update_actions_state(model);
+  xbt_dynar_foreach(all_existing_models, iter, model) {
+         model->updateActionsState(NOW, surf_min);
   }
 
   TRACE_paje_dump_buffer (0);
@@ -215,7 +160,7 @@ double surf_solve(double max_date)
   return surf_min;
 }
 
-void routing_get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst,
+void routing_get_route_and_latency(sg_netcard_t src, sg_netcard_t dst,
                               xbt_dynar_t * route, double *latency){
   routing_platf->getRouteAndLatency(src, dst, route, latency);
 }
@@ -224,25 +169,6 @@ void routing_get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst,
  * MODEL *
  *********/
 
-surf_model_t surf_resource_model(const void *host, int level) {
-  /* If level is SURF_WKS_LEVEL, ws is a workstation_CLM03 object. It has
-   * surf_resource at the generic_resource field. */
-  ResourcePtr ws = static_cast<ResourcePtr>(xbt_lib_get_level((xbt_dictelm_t) host, level));
-  return ws->getModel();
-}
-
-void *surf_as_cluster_get_backbone(AS_t as){
-  return static_cast<AsClusterPtr>(as)->p_backbone;
-}
-
-void surf_as_cluster_set_backbone(AS_t as, void* backbone){
-  static_cast<AsClusterPtr>(as)->p_backbone = static_cast<NetworkLinkPtr>(backbone);
-}
-
-const char *surf_model_name(surf_model_t model){
-  return model->getName();
-}
-
 surf_action_t surf_model_extract_done_action_set(surf_model_t model){
   if (model->getDoneActionSet()->empty())
        return NULL;
@@ -259,293 +185,164 @@ surf_action_t surf_model_extract_failed_action_set(surf_model_t model){
   return res;
 }
 
-surf_action_t surf_model_extract_ready_action_set(surf_model_t model){
-  if (model->getReadyActionSet()->empty())
-       return NULL;
-  surf_action_t res = &model->getReadyActionSet()->front();
-  model->getReadyActionSet()->pop_front();
-  return res;
-}
-
-surf_action_t surf_model_extract_running_action_set(surf_model_t model){
-  if (model->getRunningActionSet()->empty())
-       return NULL;
-  surf_action_t res = &model->getRunningActionSet()->front();
-  model->getRunningActionSet()->pop_front();
-  return res;
-}
-
 int surf_model_running_action_set_size(surf_model_t model){
   return model->getRunningActionSet()->size();
 }
 
-surf_action_t surf_workstation_model_execute_parallel_task(surf_workstation_model_t model,
-                                                   int workstation_nb,
-                                            void **workstation_list,
-                                            double *flops_amount,
-                                            double *bytes_amount,
-                                            double rate){
-  return static_cast<ActionPtr>(model->executeParallelTask(workstation_nb, workstation_list, flops_amount, bytes_amount, rate));
-}
-
-surf_action_t surf_workstation_model_communicate(surf_workstation_model_t model, surf_resource_t src, surf_resource_t dst, double size, double rate){
-  return model->communicate(get_casted_workstation(src), get_casted_workstation(dst), size, rate);
-}
-
-xbt_dynar_t surf_workstation_model_get_route(surf_workstation_model_t /*model*/,
-                                             surf_resource_t src, surf_resource_t dst){
+xbt_dynar_t surf_host_model_get_route(surf_host_model_t /*model*/,
+                                             sg_host_t src, sg_host_t dst){
   xbt_dynar_t route = NULL;
-  routing_platf->getRouteAndLatency(get_casted_workstation(src)->p_netElm,
-                                           get_casted_workstation(dst)->p_netElm, &route, NULL);
+  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, &route, NULL);
   return route;
 }
 
-void surf_vm_workstation_model_create(const char *name, surf_resource_t ind_phys_host){
-  surf_vm_workstation_model->createWorkstationVM(name, ind_phys_host);
+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_routing_edge_t src, sg_routing_edge_t dst, double size, double rate){
-  return model->communicate(src, dst, size, rate);
+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);
 }
 
 const char *surf_resource_name(surf_cpp_resource_t resource){
   return resource->getName();
 }
 
-xbt_dict_t surf_resource_get_properties(surf_cpp_resource_t resource){
-  return resource->getProperties();
+surf_action_t surf_host_sleep(sg_host_t host, double duration){
+       return host->pimpl_cpu->sleep(duration);
 }
 
-e_surf_resource_state_t surf_resource_get_state(surf_cpp_resource_t resource){
-  return resource->getState();
-}
-
-void surf_resource_set_state(surf_cpp_resource_t resource, e_surf_resource_state_t state){
-  resource->setState(state);
-}
 
-surf_action_t surf_workstation_sleep(surf_resource_t resource, double duration){
-  return get_casted_workstation(resource)->sleep(duration);
+double surf_host_get_available_speed(sg_host_t host){
+  return host->pimpl_cpu->getAvailableSpeed();
 }
 
-double surf_workstation_get_speed(surf_resource_t resource, double load){
-  return get_casted_workstation(resource)->getSpeed(load);
+xbt_dynar_t surf_host_get_attached_storage_list(sg_host_t host){
+  return get_casted_host(host)->getAttachedStorageList();
 }
 
-double surf_workstation_get_available_speed(surf_resource_t resource){
-  return get_casted_workstation(resource)->getAvailableSpeed();
+surf_action_t surf_host_open(sg_host_t host, const char* fullpath){
+  return get_casted_host(host)->open(fullpath);
 }
 
-int surf_workstation_get_core(surf_resource_t resource){
-  return get_casted_workstation(resource)->getCore();
+surf_action_t surf_host_close(sg_host_t host, surf_file_t fd){
+  return get_casted_host(host)->close(fd);
 }
 
-surf_action_t surf_workstation_execute(surf_resource_t resource, double size){
-  return get_casted_workstation(resource)->execute(size);
+int surf_host_unlink(sg_host_t host, surf_file_t fd){
+  return get_casted_host(host)->unlink(fd);
 }
 
-double surf_workstation_get_current_power_peak(surf_resource_t resource){
-  return get_casted_workstation(resource)->getCurrentPowerPeak();
+size_t surf_host_get_size(sg_host_t host, surf_file_t fd){
+  return get_casted_host(host)->getSize(fd);
 }
 
-double surf_workstation_get_power_peak_at(surf_resource_t resource, int pstate_index){
-  return get_casted_workstation(resource)->getPowerPeakAt(pstate_index);
+surf_action_t surf_host_read(sg_host_t host, surf_file_t fd, sg_size_t size){
+  return get_casted_host(host)->read(fd, size);
 }
 
-int surf_workstation_get_nb_pstates(surf_resource_t resource){
-  return get_casted_workstation(resource)->getNbPstates();
+surf_action_t surf_host_write(sg_host_t host, surf_file_t fd, sg_size_t size){
+  return get_casted_host(host)->write(fd, size);
 }
 
-void surf_workstation_set_pstate(surf_resource_t resource, int pstate_index){
-  get_casted_workstation(resource)->setPstate(pstate_index);
-}
-int surf_workstation_get_pstate(surf_resource_t resource){
-  return get_casted_workstation(resource)->getPstate();
-}
-double surf_workstation_get_wattmin_at(surf_resource_t resource, int pstate){
-  xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization.");
-  std::map<CpuPtr, CpuEnergyPtr>::iterator cpuIt = surf_energy->find(get_casted_workstation(resource)->p_cpu);
-  return cpuIt->second->getWattMinAt(pstate);
-}
-double surf_workstation_get_wattmax_at(surf_resource_t resource, int pstate){
-  xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization.");
-  std::map<CpuPtr, CpuEnergyPtr>::iterator cpuIt = surf_energy->find(get_casted_workstation(resource)->p_cpu);
-  return cpuIt->second->getWattMaxAt(pstate);
+xbt_dynar_t surf_host_get_info(sg_host_t host, surf_file_t fd){
+  return get_casted_host(host)->getInfo(fd);
 }
 
-double surf_workstation_get_consumed_energy(surf_resource_t resource){
-  xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization.");
-  std::map<CpuPtr, CpuEnergyPtr>::iterator cpuIt = surf_energy->find(get_casted_workstation(resource)->p_cpu);
-  return cpuIt->second->getConsumedEnergy();
+size_t surf_host_file_tell(sg_host_t host, surf_file_t fd){
+  return get_casted_host(host)->fileTell(fd);
 }
 
-xbt_dict_t surf_workstation_get_mounted_storage_list(surf_resource_t workstation){
-  return get_casted_workstation(workstation)->getMountedStorageList();
-}
-
-xbt_dynar_t surf_workstation_get_attached_storage_list(surf_resource_t workstation){
-  return get_casted_workstation(workstation)->getAttachedStorageList();
-}
-
-surf_action_t surf_workstation_open(surf_resource_t workstation, const char* fullpath){
-  return get_casted_workstation(workstation)->open(fullpath);
-}
-
-surf_action_t surf_workstation_close(surf_resource_t workstation, surf_file_t fd){
-  return get_casted_workstation(workstation)->close(fd);
-}
-
-int surf_workstation_unlink(surf_resource_t workstation, surf_file_t fd){
-  return get_casted_workstation(workstation)->unlink(fd);
-}
-
-size_t surf_workstation_get_size(surf_resource_t workstation, surf_file_t fd){
-  return get_casted_workstation(workstation)->getSize(fd);
-}
-
-surf_action_t surf_workstation_read(surf_resource_t resource, surf_file_t fd, sg_size_t size){
-  return get_casted_workstation(resource)->read(fd, size);
-}
-
-surf_action_t surf_workstation_write(surf_resource_t resource, surf_file_t fd, sg_size_t size){
-  return get_casted_workstation(resource)->write(fd, size);
-}
-
-xbt_dynar_t surf_workstation_get_info(surf_resource_t resource, surf_file_t fd){
-  return get_casted_workstation(resource)->getInfo(fd);
-}
-
-size_t surf_workstation_file_tell(surf_resource_t workstation, surf_file_t fd){
-  return get_casted_workstation(workstation)->fileTell(fd);
-}
-
-int surf_workstation_file_seek(surf_resource_t workstation, surf_file_t fd,
+int surf_host_file_seek(sg_host_t host, surf_file_t fd,
                                sg_offset_t offset, int origin){
-  return get_casted_workstation(workstation)->fileSeek(fd, offset, origin);
+  return get_casted_host(host)->fileSeek(fd, offset, origin);
 }
 
-int surf_workstation_file_move(surf_resource_t workstation, surf_file_t fd, const char* fullpath){
-  return get_casted_workstation(workstation)->fileMove(fd, fullpath);
+int surf_host_file_move(sg_host_t host, surf_file_t fd, const char* fullpath){
+  return get_casted_host(host)->fileMove(fd, fullpath);
 }
 
-xbt_dynar_t surf_workstation_get_vms(surf_resource_t resource){
-  xbt_dynar_t vms = get_casted_workstation(resource)->getVms();
-  xbt_dynar_t vms_ = xbt_dynar_new(sizeof(smx_host_t), NULL);
+xbt_dynar_t surf_host_get_vms(sg_host_t host){
+  xbt_dynar_t vms = get_casted_host(host)->getVms();
+  xbt_dynar_t vms_ = xbt_dynar_new(sizeof(sg_host_t), NULL);
   unsigned int cpt;
-  WorkstationVMPtr vm;
+  simgrid::surf::VirtualMachine *vm;
   xbt_dynar_foreach(vms, cpt, vm) {
-    smx_host_t vm_ = xbt_lib_get_elm_or_null(host_lib, vm->getName());
+    // TODO, use a backlink from simgrid::surf::Host to simgrid::s4u::Host 
+    sg_host_t vm_ = (sg_host_t) xbt_dict_get_elm_or_null(host_list, vm->getName());
     xbt_dynar_push(vms_, &vm_);
   }
   xbt_dynar_free(&vms);
   return vms_;
 }
 
-void surf_workstation_get_params(surf_resource_t resource, ws_params_t params){
-  get_casted_workstation(resource)->getParams(params);
-}
-
-void surf_workstation_set_params(surf_resource_t resource, ws_params_t params){
-  get_casted_workstation(resource)->setParams(params);
-}
-
-void surf_vm_workstation_destroy(surf_resource_t resource){
-  /* ind_phys_workstation equals to smx_host_t */
-  //surf_resource_t ind_vm_workstation = xbt_lib_get_elm_or_null(host_lib, getName());
-
-  /* Before clearing the entries in host_lib, we have to pick up resources. */
-  CpuPtr cpu = get_casted_cpu(resource);
-  WorkstationVMPtr vm = get_casted_vm_workstation(resource);
-  RoutingEdgePtr routing = get_casted_routing(resource);
-  char* name = xbt_dict_get_elm_key(resource);
-  /* We deregister objects from host_lib, without invoking the freeing callback
-   * of each level.
-   *
-   * Do not call xbt_lib_remove() here. It deletes all levels of the key,
-   * including MSG_HOST_LEVEL and others. We should unregister only what we know.
-   */
-  xbt_lib_unset(host_lib, name, SURF_CPU_LEVEL, 0);
-  xbt_lib_unset(host_lib, name, ROUTING_HOST_LEVEL, 0);
-  xbt_lib_unset(host_lib, name, SURF_WKS_LEVEL, 0);
-
-  /* TODO: comment out when VM storage is implemented. */
-  // xbt_lib_unset(host_lib, name, SURF_STORAGE_LEVEL, 0);
-
-  delete cpu;
-  delete vm;
-  delete routing;
-}
-
-void surf_vm_workstation_suspend(surf_resource_t resource){
-  get_casted_vm_workstation(resource)->suspend();
+void surf_host_get_params(sg_host_t host, vm_params_t params){
+  get_casted_host(host)->getParams(params);
 }
 
-void surf_vm_workstation_resume(surf_resource_t resource){
-  get_casted_vm_workstation(resource)->resume();
+void surf_host_set_params(sg_host_t host, vm_params_t params){
+  get_casted_host(host)->setParams(params);
 }
 
-void surf_vm_workstation_save(surf_resource_t resource){
-  get_casted_vm_workstation(resource)->save();
+void surf_vm_destroy(sg_host_t vm){ // FIXME:DEADCODE
+  vm->pimpl_cpu = nullptr;
+  vm->pimpl_netcard = nullptr;
 }
 
-void surf_vm_workstation_restore(surf_resource_t resource){
-  get_casted_vm_workstation(resource)->restore();
+void surf_vm_suspend(sg_host_t vm){
+  get_casted_vm(vm)->suspend();
 }
 
-void surf_vm_workstation_migrate(surf_resource_t resource, surf_resource_t ind_vm_ws_dest){
-  get_casted_vm_workstation(resource)->migrate(ind_vm_ws_dest);
+void surf_vm_resume(sg_host_t vm){
+  get_casted_vm(vm)->resume();
 }
 
-surf_resource_t surf_vm_workstation_get_pm(surf_resource_t resource){
-  return get_casted_vm_workstation(resource)->getPm();
+void surf_vm_save(sg_host_t vm){
+  get_casted_vm(vm)->save();
 }
 
-void surf_vm_workstation_set_bound(surf_resource_t resource, double bound){
-  return get_casted_vm_workstation(resource)->setBound(bound);
+void surf_vm_restore(sg_host_t vm){
+  get_casted_vm(vm)->restore();
 }
 
-void surf_vm_workstation_set_affinity(surf_resource_t resource, surf_resource_t cpu, unsigned long mask){
-  return get_casted_vm_workstation(resource)->setAffinity(get_casted_cpu(cpu), mask);
+void surf_vm_migrate(sg_host_t vm, sg_host_t ind_vm_ws_dest){
+  get_casted_vm(vm)->migrate(ind_vm_ws_dest);
 }
 
-int surf_network_link_is_shared(surf_cpp_resource_t link){
-  return static_cast<NetworkLinkPtr>(link)->isShared();
+sg_host_t surf_vm_get_pm(sg_host_t vm){
+  return get_casted_vm(vm)->getPm();
 }
 
-double surf_network_link_get_bandwidth(surf_cpp_resource_t link){
-  return static_cast<NetworkLinkPtr>(link)->getBandwidth();
+void surf_vm_set_bound(sg_host_t vm, double bound){
+  return get_casted_vm(vm)->setBound(bound);
 }
 
-double surf_network_link_get_latency(surf_cpp_resource_t link){
-  return static_cast<NetworkLinkPtr>(link)->getLatency();
+void surf_vm_set_affinity(sg_host_t vm, sg_host_t host, unsigned long mask){
+  return get_casted_vm(vm)->setAffinity(host->pimpl_cpu, mask);
 }
 
 xbt_dict_t surf_storage_get_content(surf_resource_t resource){
-  return static_cast<StoragePtr>(surf_storage_resource_priv(resource))->getContent();
+  return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getContent();
 }
 
 sg_size_t surf_storage_get_size(surf_resource_t resource){
-  return static_cast<StoragePtr>(surf_storage_resource_priv(resource))->getSize();
+  return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getSize();
 }
 
 sg_size_t surf_storage_get_free_size(surf_resource_t resource){
-  return static_cast<StoragePtr>(surf_storage_resource_priv(resource))->getFreeSize();
+  return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getFreeSize();
 }
 
 sg_size_t surf_storage_get_used_size(surf_resource_t resource){
-  return static_cast<StoragePtr>(surf_storage_resource_priv(resource))->getUsedSize();
-}
-
-const char* surf_storage_get_host(surf_resource_t resource){
-  return static_cast<StoragePtr>(surf_storage_resource_priv(resource))->p_attach;
+  return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getUsedSize();
 }
 
-surf_action_t surf_cpu_execute(surf_resource_t cpu, double size){
-  return get_casted_cpu(cpu)->execute(size);
+xbt_dict_t surf_storage_get_properties(surf_resource_t resource){
+  return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getProperties();
 }
 
-surf_action_t surf_cpu_sleep(surf_resource_t cpu, double duration){
-  return get_casted_cpu(cpu)->sleep(duration);
+const char* surf_storage_get_host(surf_resource_t resource){
+  return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->p_attach;
 }
 
 double surf_action_get_start_time(surf_action_t action){
@@ -560,10 +357,6 @@ double surf_action_get_remains(surf_action_t action){
   return action->getRemains();
 }
 
-void surf_action_unref(surf_action_t action){
-  action->unref();
-}
-
 void surf_action_suspend(surf_action_t action){
   action->suspend();
 }
@@ -600,20 +393,20 @@ double surf_action_get_cost(surf_action_t action){
   return action->getCost();
 }
 
-void surf_cpu_action_set_affinity(surf_action_t action, surf_resource_t cpu, unsigned long mask) {
-  static_cast<CpuActionPtr>(action)->setAffinity(get_casted_cpu(cpu), mask);
+void surf_cpu_action_set_affinity(surf_action_t action, sg_host_t host, unsigned long mask) {
+  static_cast<simgrid::surf::CpuAction*>(action)->setAffinity(host->pimpl_cpu, mask);
 }
 
 void surf_cpu_action_set_bound(surf_action_t action, double bound) {
-  static_cast<CpuActionPtr>(action)->setBound(bound);
+  static_cast<simgrid::surf::CpuAction*>(action)->setBound(bound);
 }
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 double surf_network_action_get_latency_limited(surf_action_t action) {
-  return static_cast<NetworkActionPtr>(action)->getLatencyLimited();
+  return static_cast<simgrid::surf::NetworkAction*>(action)->getLatencyLimited();
 }
 #endif
 
 surf_file_t surf_storage_action_get_file(surf_action_t action){
-  return static_cast<StorageActionPtr>(action)->p_file;
+  return static_cast<simgrid::surf::StorageAction*>(action)->p_file;
 }