X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3a5d9c005d8ff9357133dbf65af9743e49b1bb6f..55633c554b60455d85885816b1b73e9698b73a14:/src/surf/surf_c_bindings.cpp

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index bd807adb75..803c9349b1 100644
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -4,7 +4,7 @@
 /* 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 "src/surf/HostImpl.hpp"
 #include "surf_interface.hpp"
 #include "network_interface.hpp"
 #include "surf_routing_cluster.hpp"
@@ -18,12 +18,12 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
  * TOOLS *
  *********/
 
-static simgrid::surf::Host *get_casted_host(sg_host_t host){ //FIXME: killme
-  return host->extension<simgrid::surf::Host>();
+static simgrid::surf::HostImpl *get_casted_host(sg_host_t host){ //FIXME: killme
+  return host->extension<simgrid::surf::HostImpl>();
 }
 
 static simgrid::surf::VirtualMachine *get_casted_vm(sg_host_t host){
-  return static_cast<simgrid::surf::VirtualMachine*>(host->extension<simgrid::surf::Host>());
+  return static_cast<simgrid::surf::VirtualMachine*>(host->extension<simgrid::surf::HostImpl>());
 }
 
 extern double NOW;
@@ -181,13 +181,6 @@ int surf_model_running_action_set_size(surf_model_t model){
   return model->getRunningActionSet()->size();
 }
 
-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(src->pimpl_netcard, dst->pimpl_netcard, &route, NULL);
-  return route;
-}
-
 void surf_vm_model_create(const char *name, sg_host_t ind_phys_host){
   surf_vm_model->createVM(name, ind_phys_host);
 }
@@ -209,10 +202,6 @@ double surf_host_get_available_speed(sg_host_t host){
   return host->pimpl_cpu->getAvailableSpeed();
 }
 
-xbt_dynar_t surf_host_get_attached_storage_list(sg_host_t host){
-  return get_casted_host(host)->getAttachedStorageList();
-}
-
 surf_action_t surf_host_open(sg_host_t host, const char* fullpath){
   return get_casted_host(host)->open(fullpath);
 }
@@ -254,27 +243,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);
 }
 
-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;
-  simgrid::surf::VirtualMachine *vm;
-  xbt_dynar_foreach(vms, cpt, vm) {
-    sg_host_t cpy_ = vm->getHost();
-    xbt_dynar_push(vms_, &cpy_);
-  }
-  xbt_dynar_free(&vms);
-  return vms_;
-}
-
-void surf_host_get_params(sg_host_t host, vm_params_t params){
-  get_casted_host(host)->getParams(params);
-}
-
-void surf_host_set_params(sg_host_t host, vm_params_t params){
-  get_casted_host(host)->setParams(params);
-}
-
 void surf_vm_destroy(sg_host_t vm){ // FIXME:DEADCODE
   vm->pimpl_cpu = nullptr;
   vm->pimpl_netcard = nullptr;
@@ -336,42 +304,6 @@ 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){
-  return action->getStartTime();
-}
-
-double surf_action_get_finish_time(surf_action_t action){
-  return action->getFinishTime();
-}
-
-double surf_action_get_remains(surf_action_t action){
-  return action->getRemains();
-}
-
-void surf_action_set_category(surf_action_t action, const char *category){
-  action->setCategory(category);
-}
-
-void *surf_action_get_data(surf_action_t action){
-  return action->getData();
-}
-
-void surf_action_set_data(surf_action_t action, void *data){
-  action->setData(data);
-}
-
-e_surf_action_state_t surf_action_get_state(surf_action_t action){
-  return action->getState();
-}
-
-double surf_action_get_cost(surf_action_t action){
-  return action->getCost();
-}
-
-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<simgrid::surf::CpuAction*>(action)->setBound(bound);
 }