X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c2505da34e3d93fa429d9f047e56257378901ee4..4a69abcc786d029bd2962537f767d12a0f808d11:/src/surf/surf_c_bindings.cpp

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index 3b323f77ac..94e198025b 100644
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -4,12 +4,9 @@
 /* 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 "VirtualMachineImpl.hpp"
-#include "network_interface.hpp"
-#include "plugins/energy.hpp"
+#include "simgrid/s4u/engine.hpp"
 #include "src/instr/instr_private.h"
-#include "src/surf/HostImpl.hpp"
-#include "surf_interface.hpp"
+#include "src/plugins/vm/VirtualMachineImpl.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
 
@@ -17,15 +14,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
  * TOOLS *
  *********/
 
-static simgrid::surf::HostImpl *get_casted_host(sg_host_t host){ //FIXME: killme
-  return host->pimpl_;
-}
-
-static simgrid::surf::VirtualMachineImpl* get_casted_vm(sg_host_t host)
-{
-  return static_cast<simgrid::surf::VirtualMachineImpl*>(host->pimpl_);
-}
-
 extern double NOW;
 
 void surf_presolve()
@@ -115,7 +103,7 @@ double surf_solve(double max_date)
     XBT_DEBUG("Updating models (min = %g, NOW = %g, next_event_date = %g)", time_delta, NOW, next_event_date);
 
     while ((event = future_evt_set->pop_leq(next_event_date, &value, &resource))) {
-      if (resource->isUsed() || xbt_dict_get_or_null(watched_hosts_lib, resource->getName())) {
+      if (resource->isUsed() || xbt_dict_get_or_null(watched_hosts_lib, resource->cname())) {
         time_delta = next_event_date - NOW;
         XBT_DEBUG("This event invalidates the next_occuring_event() computation of models. Next event set to %f", time_delta);
       }
@@ -124,7 +112,7 @@ double surf_solve(double max_date)
       NOW = next_event_date;
       /* update state of the corresponding resource to the new value. Does not touch lmm.
          It will be modified if needed when updating actions */
-      XBT_DEBUG("Calling update_resource_state for resource %s", resource->getName());
+      XBT_DEBUG("Calling update_resource_state for resource %s", resource->cname());
       resource->apply_event(event, value);
       NOW = round_start;
     }
@@ -133,7 +121,7 @@ double surf_solve(double max_date)
   /* FIXME: Moved this test to here to avoid stopping simulation if there are actions running on cpus and all cpus are with availability = 0.
    * This may cause an infinite loop if one cpu has a trace with periodicity = 0 and the other a trace with periodicity > 0.
    * The options are: all traces with same periodicity(0 or >0) or we need to change the way how the events are managed */
-  if (time_delta == -1.0) {
+  if (time_delta < 0) {
     XBT_DEBUG("No next event at all. Bail out now.");
     return -1.0;
   }
@@ -147,6 +135,7 @@ double surf_solve(double max_date)
   for (auto model : *all_existing_models) {
     model->updateActionsState(NOW, time_delta);
   }
+  simgrid::s4u::onTimeAdvance(time_delta);
 
   TRACE_paje_dump_buffer (0);
 
@@ -156,106 +145,71 @@ double surf_solve(double max_date)
 /*********
  * MODEL *
  *********/
-
-surf_action_t surf_model_extract_done_action_set(surf_model_t model){
-  if (model->getDoneActionSet()->empty())
+static surf_action_t ActionListExtract(simgrid::surf::ActionList* list)
+{
+  if (list->empty())
     return nullptr;
-  surf_action_t res = &model->getDoneActionSet()->front();
-  model->getDoneActionSet()->pop_front();
+  surf_action_t res = &list->front();
+  list->pop_front();
   return res;
 }
 
+surf_action_t surf_model_extract_done_action_set(surf_model_t model)
+{
+  return ActionListExtract(model->getDoneActionSet());
+}
+
 surf_action_t surf_model_extract_failed_action_set(surf_model_t model){
-  if (model->getFailedActionSet()->empty())
-    return nullptr;
-  surf_action_t res = &model->getFailedActionSet()->front();
-  model->getFailedActionSet()->pop_front();
-  return res;
+  return ActionListExtract(model->getFailedActionSet());
 }
 
 int surf_model_running_action_set_size(surf_model_t model){
   return model->getRunningActionSet()->size();
 }
 
-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);
-}
-
-xbt_dict_t surf_storage_get_content(surf_resource_t resource){
-  return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getContent();
+  return host->pimpl_->fileMove(fd, fullpath);
 }
 
 sg_size_t surf_storage_get_size(surf_resource_t resource){
-  return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->getSize();
+  return static_cast<simgrid::surf::Storage*>(surf_storage_resource_priv(resource))->size_;
 }
 
 sg_size_t surf_storage_get_free_size(surf_resource_t resource){