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

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index 37ed364ebb..74b5554864 100644
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -31,7 +31,7 @@ extern double NOW;
 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;
   simgrid::surf::Resource *resource = NULL;
   simgrid::surf::Model *model = NULL;
@@ -64,7 +64,7 @@ double surf_solve(double max_date)
   double value = -1.0;
   simgrid::surf::Resource *resource = NULL;
   simgrid::surf::Model *model = NULL;
-  tmgr_trace_event_t event = NULL;
+  tmgr_trace_iterator_t event = NULL;
   unsigned int iter;
 
   if(!host_that_restart)
@@ -169,13 +169,6 @@ void routing_get_route_and_latency(sg_netcard_t src, sg_netcard_t dst,
  * MODEL *
  *********/
 
-surf_host_model_t surf_host_get_model(sg_host_t host)
-{
-  simgrid::surf::Host* surf_host =
-    (simgrid::surf::Host*) host->extension<simgrid::surf::Host>();
-  return (surf_host_model_t) surf_host->getModel();
-}
-
 surf_action_t surf_model_extract_done_action_set(surf_model_t model){
   if (model->getDoneActionSet()->empty())
 	return NULL;
@@ -192,36 +185,10 @@ 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_host_model_execute_parallel_task(surf_host_model_t model,
-		                                    int host_nb,
-                                            sg_host_t *host_list,
-                                            double *flops_amount,
-                                            double *bytes_amount,
-                                            double rate){
-  return static_cast<simgrid::surf::Action*>(
-    model->executeParallelTask(host_nb, host_list, flops_amount, bytes_amount, rate));
-}
-
 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;
@@ -245,27 +212,11 @@ surf_action_t surf_host_sleep(sg_host_t host, double duration){
 	return host->pimpl_cpu->sleep(duration);
 }
 
-xbt_dict_t sg_host_get_properties(sg_host_t host) {
-	return get_casted_host(host)->getProperties();
-}
 
 double surf_host_get_available_speed(sg_host_t host){
   return host->pimpl_cpu->getAvailableSpeed();
 }
 
-double surf_host_get_current_power_peak(sg_host_t host){
-  return host->pimpl_cpu->getCurrentPowerPeak();
-}
-
-double surf_host_get_power_peak_at(sg_host_t host, int pstate_index){
-  return host->pimpl_cpu->getPowerPeakAt(pstate_index);
-}
-
-
-xbt_dict_t surf_host_get_mounted_storage_list(sg_host_t host){
-  return get_casted_host(host)->getMountedStorageList();
-}
-
 xbt_dynar_t surf_host_get_attached_storage_list(sg_host_t host){
   return get_casted_host(host)->getAttachedStorageList();
 }
@@ -317,7 +268,7 @@ xbt_dynar_t surf_host_get_vms(sg_host_t host){
   unsigned int cpt;
   simgrid::surf::VirtualMachine *vm;
   xbt_dynar_foreach(vms, cpt, vm) {
-    // TODO, use a backlink from simgrid::surf::Host to simgrid::Host 
+    // 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_);
   }
@@ -406,22 +357,6 @@ double surf_action_get_remains(surf_action_t action){
   return action->getRemains();
 }
 
-void surf_action_suspend(surf_action_t action){
-  action->suspend();
-}
-
-void surf_action_resume(surf_action_t action){
-  action->resume();
-}
-
-void surf_action_cancel(surf_action_t action){
-  action->cancel();
-}
-
-void surf_action_set_priority(surf_action_t action, double priority){
-  action->setPriority(priority);
-}
-
 void surf_action_set_category(surf_action_t action, const char *category){
   action->setCategory(category);
 }
@@ -452,14 +387,10 @@ void surf_cpu_action_set_bound(surf_action_t action, double 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<simgrid::surf::StorageAction*>(action)->p_file;
 }
-
-surf_host_t surf_host_resource_priv(sg_host_t host) {
-  return host->extension<simgrid::surf::Host>();
-}