Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / simix / libsmx.cpp

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 3058bad..7924a4f 100644 (file)
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -40,57 +40,7 @@ void simcall_call(smx_process_t process)
   }
 }
 
-// ***** Host simcalls
-// Those functions are replaced by methods on the Host object.
-
-/** \ingroup simix_host_management
- * \deprecated */
-xbt_swag_t simcall_host_get_process_list(sg_host_t host)
-{
-  return host->processes();
-}
-
-/** \ingroup simix_host_management
- * \deprecated */
-double simcall_host_get_current_power_peak(sg_host_t host)
-{
-  return host->currentPowerPeak();
-}
-
-/** \ingroup simix_host_management
- * \deprecated */
-double simcall_host_get_power_peak_at(sg_host_t host, int pstate_index)
-{
-  return host->powerPeakAt(pstate_index);
-}
-
-/** \deprecated */
-void simcall_host_get_params(sg_host_t vm, vm_params_t params)
-{
-  vm->parameters(params);
-}
-
-/** \deprecated */
-void simcall_host_set_params(sg_host_t vm, vm_params_t params)
-{
-  vm->setParameters(params);
-}
-
-/** \ingroup simix_storage_management
- *  \deprecated */
-xbt_dict_t simcall_host_get_mounted_storage_list(sg_host_t host)
-{
-  return host->mountedStoragesAsDict();
-}
-
-/** \ingroup simix_storage_management
- *  \deprecated */
-xbt_dynar_t simcall_host_get_attached_storage_list(sg_host_t host)
-{
-  return host->attachedStorages();
-}
-
-// ***** Other simcalls
+// ***** AS simcalls
 
 /**
  * \ingroup simix_host_management
@@ -603,9 +553,11 @@ void simcall_process_set_data(smx_process_t process, void *data)
   simgrid::simix::kernel(std::bind(SIMIX_process_set_data, process, data));
 }
 
-static void kill_process(void* arg)
+static void kill_process_from_timer(void* arg)
 {
-  simix_global->kill_process_function((smx_process_t) arg);
+  smx_process_t process = (smx_process_t) arg;
+  simix_global->kill_process_function(process);
+  process->kill_timer=NULL;
 }
 
 /**
@@ -619,7 +571,7 @@ void simcall_process_set_kill_time(smx_process_t process, double kill_time)
     if (simix_global->kill_process_function) {
       XBT_DEBUG("Set kill time %f for process %s(%s)",kill_time, process->name,
           sg_host_get_name(process->host));
-      process->kill_timer = SIMIX_timer_set(kill_time, kill_process, process);
+      process->kill_timer = SIMIX_timer_set(kill_time, kill_process_from_timer, process);
     }
   }
 }