X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9932a0c0d2c44e34633c97a827b2b04d615cb4e9..8734addee4efb8501991834fb99c2da15e9f8482:/src/simix/popping_generated.c

diff --git a/src/simix/popping_generated.c b/src/simix/popping_generated.c
index c8a3c3ca97..d7eb3668c1 100644
--- a/src/simix/popping_generated.c
+++ b/src/simix/popping_generated.c
@@ -15,8 +15,7 @@
 
 #include "smx_private.h"
 #ifdef HAVE_MC
-#include "mc/mc_process.h"
-#include "mc/mc_model_checker.h"
+#include "mc/mc_forward.h"
 #endif
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);
@@ -36,7 +35,10 @@ const char* simcall_names[] = {
   [SIMCALL_HOST_GET_CURRENT_POWER_PEAK] = "SIMCALL_HOST_GET_CURRENT_POWER_PEAK",
   [SIMCALL_HOST_GET_POWER_PEAK_AT] = "SIMCALL_HOST_GET_POWER_PEAK_AT",
   [SIMCALL_HOST_GET_NB_PSTATES] = "SIMCALL_HOST_GET_NB_PSTATES",
-  [SIMCALL_HOST_SET_POWER_PEAK_AT] = "SIMCALL_HOST_SET_POWER_PEAK_AT",
+  [SIMCALL_HOST_GET_WATTMIN_AT] = "SIMCALL_HOST_GET_WATTMIN_AT",
+  [SIMCALL_HOST_GET_WATTMAX_AT] = "SIMCALL_HOST_GET_WATTMAX_AT",
+  [SIMCALL_HOST_SET_PSTATE] = "SIMCALL_HOST_SET_PSTATE",
+  [SIMCALL_HOST_GET_PSTATE] = "SIMCALL_HOST_GET_PSTATE",
   [SIMCALL_HOST_GET_CONSUMED_ENERGY] = "SIMCALL_HOST_GET_CONSUMED_ENERGY",
   [SIMCALL_HOST_EXECUTE] = "SIMCALL_HOST_EXECUTE",
   [SIMCALL_HOST_PARALLEL_EXECUTE] = "SIMCALL_HOST_PARALLEL_EXECUTE",
@@ -65,6 +67,7 @@ const char* simcall_names[] = {
   [SIMCALL_VM_SHUTDOWN] = "SIMCALL_VM_SHUTDOWN",
   [SIMCALL_VM_SAVE] = "SIMCALL_VM_SAVE",
   [SIMCALL_VM_RESTORE] = "SIMCALL_VM_RESTORE",
+  [SIMCALL_VM_MIGRATEFROM_RESUMETO] = "SIMCALL_VM_MIGRATEFROM_RESUMETO",
   [SIMCALL_PROCESS_CREATE] = "SIMCALL_PROCESS_CREATE",
   [SIMCALL_PROCESS_KILL] = "SIMCALL_PROCESS_KILL",
   [SIMCALL_PROCESS_KILLALL] = "SIMCALL_PROCESS_KILLALL",
@@ -161,11 +164,6 @@ const char* simcall_names[] = {
  */
 void SIMIX_simcall_handle(smx_simcall_t simcall, int value) {
   XBT_DEBUG("Handling simcall %p: %s", simcall, SIMIX_simcall_name(simcall->call));
-  #ifdef HAVE_MC
-  if (mc_model_checker) {
-    mc_model_checker->process.cache_flags = 0;
-  }
-  #endif
   SIMCALL_SET_MC_VALUE(simcall, value);
   if (simcall->issuer->context->iwannadie && simcall->call != SIMCALL_PROCESS_CLEANUP)
     return;
@@ -235,8 +233,23 @@ case SIMCALL_HOST_GET_NB_PSTATES:
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_HOST_SET_POWER_PEAK_AT:
-       SIMIX_host_set_power_peak_at((smx_host_t) simcall->args[0].dp, simcall->args[1].i);
+case SIMCALL_HOST_GET_WATTMIN_AT:
+      simcall->result.d = SIMIX_host_get_wattmin_at((smx_host_t) simcall->args[0].dp, simcall->args[1].i);
+      SIMIX_simcall_answer(simcall);
+      break;  
+
+case SIMCALL_HOST_GET_WATTMAX_AT:
+      simcall->result.d = SIMIX_host_get_wattmax_at((smx_host_t) simcall->args[0].dp, simcall->args[1].i);
+      SIMIX_simcall_answer(simcall);
+      break;  
+
+case SIMCALL_HOST_SET_PSTATE:
+       SIMIX_host_set_pstate((smx_host_t) simcall->args[0].dp, simcall->args[1].i);
+      SIMIX_simcall_answer(simcall);
+      break;  
+
+case SIMCALL_HOST_GET_PSTATE:
+      simcall->result.i = SIMIX_host_get_pstate((smx_host_t) simcall->args[0].dp);
       SIMIX_simcall_answer(simcall);
       break;  
 
@@ -379,6 +392,11 @@ case SIMCALL_VM_RESTORE:
       SIMIX_simcall_answer(simcall);
       break;  
 
+case SIMCALL_VM_MIGRATEFROM_RESUMETO:
+       SIMIX_vm_migratefrom_resumeto((smx_host_t) simcall->args[0].dp,(smx_host_t) simcall->args[1].dp,(smx_host_t) simcall->args[2].dp);
+      SIMIX_simcall_answer(simcall);
+      break;  
+
 case SIMCALL_PROCESS_CREATE:
        simcall_HANDLER_process_create(simcall , (smx_process_t*) simcall->args[0].dp,  simcall->args[1].cc, (xbt_main_func_t) simcall->args[2].fp,  simcall->args[3].dp,  simcall->args[4].cc,  simcall->args[5].d,  simcall->args[6].i, (char**) simcall->args[7].dp, (xbt_dict_t) simcall->args[8].dp,  simcall->args[9].i);
       SIMIX_simcall_answer(simcall);