X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5fc777ebb223e63cbaab9c2c78cb9a8f66b019a..7ad85b03568dabade546f7948aaf7279059e9269:/src/simix/libsmx.c

diff --git a/src/simix/libsmx.c b/src/simix/libsmx.c
index 67b8fe88cd..4db1dab4a0 100644
--- a/src/simix/libsmx.c
+++ b/src/simix/libsmx.c
@@ -68,32 +68,6 @@ xbt_dict_t simcall_asr_get_properties(const char *name)
   return simcall_BODY_asr_get_properties(name);
 }
 
-
-/**
- * \ingroup simix_host_management
- * \brief Returns the speed of the processor.
- *
- * The speed returned does not take into account the current load on the machine.
- * \param host A SIMIX host
- * \return The speed of this host (in Mflop/s)
- */
-double simcall_host_get_speed(sg_host_t host)
-{
-  return simcall_BODY_host_get_speed(host);
-}
-
-/**
- * \ingroup simix_host_management
- * \brief Returns the number of core of the processor.
- *
- * \param host A SIMIX host
- * \return The number of core
- */
-int simcall_host_get_core(sg_host_t host)
-{
-  return simcall_BODY_host_get_core(host);
-}
-
 /**
  * \ingroup simix_host_management
  * \brief Returns the list of processes attached to the host.
@@ -106,31 +80,6 @@ xbt_swag_t simcall_host_get_process_list(sg_host_t host)
   return simcall_BODY_host_get_process_list(host);
 }
 
-
-/**
- * \ingroup simix_host_management
- * \brief Returns the available speed of the processor.
- *
- * \return Speed currently available (in Mflop/s)
- */
-double simcall_host_get_available_speed(sg_host_t host)
-{
-  return simcall_BODY_host_get_available_speed(host);
-}
-
-/**
- * \ingroup simix_host_management
- * \brief Returns the state of a host.
- *
- * Two states are possible: 1 if the host is active or 0 if it has crashed.
- * \param host A SIMIX host
- * \return 1 if the host is available, 0 otherwise
- */
-int simcall_host_get_state(sg_host_t host)
-{
-  return simcall_BODY_host_get_state(host);
-}
-
 /**
  * \ingroup simix_host_management
  * \brief Returns the power peak of a host.
@@ -156,18 +105,6 @@ double simcall_host_get_power_peak_at(sg_host_t host, int pstate_index)
   return simcall_BODY_host_get_power_peak_at(host, pstate_index);
 }
 
-/**
- * \ingroup simix_host_management
- * \brief Returns the number of power states for a host.
- *
- * \param host A SIMIX host
- * \return the number of power states
- */
-int simcall_host_get_nb_pstates(sg_host_t host)
-{
-  return simcall_BODY_host_get_nb_pstates(host);
-}
-
 /**
  * \ingroup simix_host_management
  * \brief Sets the pstate at which the host should run
@@ -179,28 +116,7 @@ void simcall_host_set_pstate(sg_host_t host, int pstate_index)
 {
 	simcall_BODY_host_set_pstate(host, pstate_index);
 }
-/**
- * \ingroup simix_host_management
- * \brief Gets the pstate at which that host currently runs.
- *
- * \param host A SIMIX host
- */
-int simcall_host_get_pstate(sg_host_t host)
-{
-	return simcall_BODY_host_get_pstate(host);
-}
 
-/**
- * \ingroup simix_host_management
- * \brief Returns the total energy consumed by the host (in Joules)
- *
- * \param host A SIMIX host
- * \return the energy consumed by the host (double)
- */
-double simcall_host_get_consumed_energy(sg_host_t host)
-{
-  return simcall_BODY_host_get_consumed_energy(host);
-}
 /** \ingroup simix_host_management
  * \brief Returns the amount of watt dissipated at the given pstate when the host is idling
  */
@@ -742,6 +658,11 @@ void simcall_process_set_data(smx_process_t process, void *data)
   }
 }
 
+static void kill_process(void* arg)
+{
+  simix_global->kill_process_function((smx_process_t) arg);
+}
+
 /**
  * \ingroup simix_process_management
  * \brief Set the kill time of a process.
@@ -752,8 +673,8 @@ void simcall_process_set_kill_time(smx_process_t process, double kill_time)
   if (kill_time > SIMIX_get_clock()) {
     if (simix_global->kill_process_function) {
       XBT_DEBUG("Set kill time %f for process %s(%s)",kill_time, process->name,
-          sg_host_name(process->host));
-      process->kill_timer = SIMIX_timer_set(kill_time, simix_global->kill_process_function, process);
+          sg_host_get_name(process->host));
+      process->kill_timer = SIMIX_timer_set(kill_time, kill_process, process);
     }
   }
 }