X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/863adae6473cc1fe177d0c48bc07b752beb83880..3fe150481a6802850ebb47a7f4a1b77c53f2cd99:/src/simix/libsmx.c

diff --git a/src/simix/libsmx.c b/src/simix/libsmx.c
index eb50d4df4c..0e63140dea 100644
--- a/src/simix/libsmx.c
+++ b/src/simix/libsmx.c
@@ -10,10 +10,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 "mc/mc_replay.h"
 #include "smx_private.h"
-#include "mc/mc_interface.h"
+#include "mc/mc_forward.h"
 #include "xbt/ex.h"
 #include <math.h>         /* isfinite() */
+#include "mc/mc.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
 
@@ -191,14 +193,24 @@ int simcall_host_get_nb_pstates(smx_host_t host)
 
 /**
  * \ingroup simix_host_management
- * \brief Sets a new power peak for a host.
+ * \brief Sets the pstate at which the host should run
  *
  * \param host A SIMIX host
  * \param pstate_index The pstate to which the CPU power will be set
  */
-void simcall_host_set_power_peak_at(smx_host_t host, int pstate_index)
+void simcall_host_set_pstate(smx_host_t host, int pstate_index)
 {
-	simcall_BODY_host_set_power_peak_at(host, 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(smx_host_t host)
+{
+	return simcall_BODY_host_get_pstate(host);
 }
 
 /**
@@ -212,6 +224,19 @@ double simcall_host_get_consumed_energy(smx_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
+ */
+double simcall_host_get_wattmin_at(msg_host_t host, int pstate){
+	return simcall_BODY_host_get_wattmin_at(host, pstate);
+}
+/** \ingroup simix_host_management
+ * \brief Returns the amount of watt dissipated at the given pstate when the host burns CPU at 100%
+ */
+double simcall_host_get_wattmax_at(msg_host_t host, int pstate){
+	return simcall_BODY_host_get_wattmax_at(host, pstate);
+}
+
 
 
 /**
@@ -223,21 +248,21 @@ double simcall_host_get_consumed_energy(smx_host_t host)
  *
  * \param name Name of the execution synchro to create
  * \param host SIMIX host where the synchro will be executed
- * \param computation_amount amount Computation amount (in bytes)
+ * \param flops_amount amount Computation amount (in flops)
  * \param priority computation priority
  * \param bound
  * \param affinity_mask
  * \return A new SIMIX execution synchronization
  */
 smx_synchro_t simcall_host_execute(const char *name, smx_host_t host,
-                                    double computation_amount,
+                                    double flops_amount,
                                     double priority, double bound, unsigned long affinity_mask)
 {
   /* checking for infinite values */
-  xbt_assert(isfinite(computation_amount), "computation_amount is not finite!");
+  xbt_assert(isfinite(flops_amount), "flops_amount is not finite!");
   xbt_assert(isfinite(priority), "priority is not finite!");
 
-  return simcall_BODY_host_execute(name, host, computation_amount, priority, bound, affinity_mask);
+  return simcall_BODY_host_execute(name, host, flops_amount, priority, bound, affinity_mask);
 }
 
 /**
@@ -248,8 +273,8 @@ smx_synchro_t simcall_host_execute(const char *name, smx_host_t host,
  * \param name Name of the execution synchro to create
  * \param host_nb Number of hosts where the synchro will be executed
  * \param host_list Array (of size host_nb) of hosts where the synchro will be executed
- * \param computation_amount Array (of size host_nb) of computation amount of hosts (in bytes)
- * \param communication_amount Array (of size host_nb * host_nb) representing the communication
+ * \param flops_amount Array (of size host_nb) of computation amount of hosts (in bytes)
+ * \param bytes_amount Array (of size host_nb * host_nb) representing the communication
  * amount between each pair of hosts
  * \param amount the SURF action amount
  * \param rate the SURF action rate
@@ -258,18 +283,18 @@ smx_synchro_t simcall_host_execute(const char *name, smx_host_t host,
 smx_synchro_t simcall_host_parallel_execute(const char *name,
                                          int host_nb,
                                          smx_host_t *host_list,
-                                         double *computation_amount,
-                                         double *communication_amount,
+                                         double *flops_amount,
+                                         double *bytes_amount,
                                          double amount,
                                          double rate)
 {
   int i,j;
   /* checking for infinite values */
   for (i = 0 ; i < host_nb ; ++i) {
-     xbt_assert(isfinite(computation_amount[i]), "computation_amount[%d] is not finite!", i);
+     xbt_assert(isfinite(flops_amount[i]), "flops_amount[%d] is not finite!", i);
      for (j = 0 ; j < host_nb ; ++j) {
-        xbt_assert(isfinite(communication_amount[i + host_nb * j]),
-             "communication_amount[%d+%d*%d] is not finite!", i, host_nb, j);
+        xbt_assert(isfinite(bytes_amount[i + host_nb * j]),
+             "bytes_amount[%d+%d*%d] is not finite!", i, host_nb, j);
      }
   }
 
@@ -277,8 +302,8 @@ smx_synchro_t simcall_host_parallel_execute(const char *name,
   xbt_assert(isfinite(rate), "rate is not finite!");
 
   return simcall_BODY_host_parallel_execute(name, host_nb, host_list,
-                                            computation_amount,
-                                            communication_amount,
+                                            flops_amount,
+                                            bytes_amount,
                                             amount, rate);
 
 }
@@ -532,6 +557,24 @@ void simcall_vm_destroy(smx_host_t vm)
   simcall_BODY_vm_destroy(vm);
 }
 
+/**
+ * \ingroup simix_vm_management
+ * \brief Encompassing simcall to prevent the removal of the src or the dst node at the end of a VM migration
+ *  The simcall actually invokes the following calls: 
+ *     simcall_vm_set_affinity(vm, src_pm, 0); 
+ *     simcall_vm_migrate(vm, dst_pm); 
+ *     simcall_vm_resume(vm);
+ *
+ * It is called at the end of the migration_rx_fun function from msg/msg_vm.c
+ *
+ * \param vm VM to migrate
+ * \param src_pm  Source physical host
+ * \param dst_pmt Destination physical host
+ */
+void simcall_vm_migratefrom_resumeto(smx_host_t vm, smx_host_t src_pm, smx_host_t dst_pm)
+{
+  simcall_BODY_vm_migratefrom_resumeto(vm, src_pm, dst_pm);
+}
 
 /**
  * \ingroup simix_process_management
@@ -737,7 +780,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_name(process->smx_host));
-      SIMIX_timer_set(kill_time, simix_global->kill_process_function, process);
+      process->kill_timer = SIMIX_timer_set(kill_time, simix_global->kill_process_function, process);
     }
   }
 }
@@ -1048,7 +1091,6 @@ void simcall_comm_wait(smx_synchro_t comm, double timeout)
   simcall_BODY_comm_wait(comm, timeout);
 }
 
-#ifdef HAVE_TRACING
 /**
  * \brief Set the category of an synchro.
  *
@@ -1063,7 +1105,6 @@ void simcall_set_category(smx_synchro_t synchro, const char *category)
   }
   simcall_BODY_set_category(synchro, category);
 }
-#endif
 
 /**
  * \ingroup simix_comm_management