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

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index e0c865ba00..d13f01080b 100644
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -4,12 +4,12 @@
 /* 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 "plugins/energy.hpp"
+#include "src/instr/instr_private.h"
+#include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/surf/HostImpl.hpp"
+#include "src/surf/network_interface.hpp"
 #include "surf_interface.hpp"
-#include "network_interface.hpp"
-#include "src/instr/instr_private.h"
-#include "plugins/energy.hpp"
-#include "virtual_machine.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
 
@@ -17,14 +17,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
  * TOOLS *
  *********/
 
-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::HostImpl>());
-}
-
 extern double NOW;
 
 void surf_presolve()
@@ -87,7 +79,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 {
@@ -176,81 +168,49 @@ int surf_model_running_action_set_size(surf_model_t model){
   return model->getRunningActionSet()->size();
 }
 
-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);
 }
 
 surf_action_t surf_host_open(sg_host_t host, const char* fullpath){
-  return get_casted_host(host)->open(fullpath);
+  return host->pimpl_->open(fullpath);
 }
 
 surf_action_t surf_host_close(sg_host_t host, surf_file_t fd){
-  return get_casted_host(host)->close(fd);
+  return host->pimpl_->close(fd);
 }
 
 int surf_host_unlink(sg_host_t host, surf_file_t fd){
-  return get_casted_host(host)->unlink(fd);
+  return host->pimpl_->unlink(fd);
 }
 
 size_t surf_host_get_size(sg_host_t host, surf_file_t fd){
-  return get_casted_host(host)->getSize(fd);
+  return host->pimpl_->getSize(fd);
 }
 
 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);
+  return host->pimpl_->read(fd, size);
 }
 
 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);
+  return host->pimpl_->write(fd, size);
 }
 
 xbt_dynar_t surf_host_get_info(sg_host_t host, surf_file_t fd){
-  return get_casted_host(host)->getInfo(fd);
+  return host->pimpl_->getInfo(fd);
 }
 
 size_t surf_host_file_tell(sg_host_t host, surf_file_t fd){
-  return get_casted_host(host)->fileTell(fd);
+  return host->pimpl_->fileTell(fd);
 }
 
 int surf_host_file_seek(sg_host_t host, surf_file_t fd,
                                sg_offset_t offset, int origin){
-  return get_casted_host(host)->fileSeek(fd, offset, origin);
+  return host->pimpl_->fileSeek(fd, offset, origin);
 }
 
 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_suspend(sg_host_t vm){
-  get_casted_vm(vm)->suspend();
-}
-
-void surf_vm_resume(sg_host_t vm){
-  get_casted_vm(vm)->resume();
-}
-
-void surf_vm_save(sg_host_t vm){
-  get_casted_vm(vm)->save();
-}
-
-void surf_vm_restore(sg_host_t vm){
-  get_casted_vm(vm)->restore();
-}
-
-void surf_vm_migrate(sg_host_t vm, sg_host_t ind_vm_ws_dest){
-  get_casted_vm(vm)->migrate(ind_vm_ws_dest);
-}
-
-sg_host_t surf_vm_get_pm(sg_host_t vm){
-  return get_casted_vm(vm)->getPm();
-}
-
-void surf_vm_set_bound(sg_host_t vm, double bound){
-  get_casted_vm(vm)->setBound(bound);
+  return host->pimpl_->fileMove(fd, fullpath);
 }
 
 xbt_dict_t surf_storage_get_content(surf_resource_t resource){
@@ -282,5 +242,5 @@ void surf_cpu_action_set_bound(surf_action_t action, double bound) {
 }
 
 surf_file_t surf_storage_action_get_file(surf_action_t action){
-  return static_cast<simgrid::surf::StorageAction*>(action)->p_file;
+  return static_cast<simgrid::surf::StorageAction*>(action)->file_;
 }