don't destroy synchro in a simcall, this drives the JVM nuts

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

diff --git a/src/simix/popping_generated.cpp b/src/simix/popping_generated.cpp
index 7ff297f..418256c 100644 (file)
--- a/src/simix/popping_generated.cpp
+++ b/src/simix/popping_generated.cpp
@@ -23,61 +23,31 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);
 
 /** @brief Simcalls' names (generated from src/simix/simcalls.in) */
 const char* simcall_names[] = {
-   "SIMCALL_NONE",  "SIMCALL_HOST_ON",
-  "SIMCALL_HOST_OFF",
-  "SIMCALL_HOST_GET_PROPERTIES",
-  "SIMCALL_HOST_GET_PROCESS_LIST",
-  "SIMCALL_HOST_GET_CURRENT_POWER_PEAK",
-  "SIMCALL_HOST_GET_POWER_PEAK_AT",
-  "SIMCALL_HOST_GET_WATTMIN_AT",
-  "SIMCALL_HOST_GET_WATTMAX_AT",
-  "SIMCALL_HOST_SET_PSTATE",
-  "SIMCALL_HOST_GET_MOUNTED_STORAGE_LIST",
-  "SIMCALL_HOST_GET_ATTACHED_STORAGE_LIST",
-  "SIMCALL_HOST_GET_PARAMS",
-  "SIMCALL_HOST_SET_PARAMS",
-  "SIMCALL_VM_CREATE",
-  "SIMCALL_VM_START",
-  "SIMCALL_VM_GET_STATE",
-  "SIMCALL_VM_MIGRATE",
-  "SIMCALL_VM_GET_PM",
-  "SIMCALL_VM_SET_BOUND",
-  "SIMCALL_VM_SET_AFFINITY",
-  "SIMCALL_VM_DESTROY",
-  "SIMCALL_VM_SUSPEND",
+   "SIMCALL_NONE",  "SIMCALL_VM_SUSPEND",
   "SIMCALL_VM_RESUME",
   "SIMCALL_VM_SHUTDOWN",
   "SIMCALL_VM_SAVE",
   "SIMCALL_VM_RESTORE",
-  "SIMCALL_VM_MIGRATEFROM_RESUMETO",
   "SIMCALL_PROCESS_CREATE",
   "SIMCALL_PROCESS_KILL",
   "SIMCALL_PROCESS_KILLALL",
   "SIMCALL_PROCESS_CLEANUP",
   "SIMCALL_PROCESS_SUSPEND",
   "SIMCALL_PROCESS_RESUME",
-  "SIMCALL_PROCESS_COUNT",
-  "SIMCALL_PROCESS_GET_PID",
-  "SIMCALL_PROCESS_GET_PPID",
-  "SIMCALL_PROCESS_GET_DATA",
-  "SIMCALL_PROCESS_SET_DATA",
   "SIMCALL_PROCESS_SET_HOST",
-  "SIMCALL_PROCESS_GET_HOST",
-  "SIMCALL_PROCESS_GET_NAME",
   "SIMCALL_PROCESS_IS_SUSPENDED",
-  "SIMCALL_PROCESS_GET_PROPERTIES",
   "SIMCALL_PROCESS_JOIN",
   "SIMCALL_PROCESS_SLEEP",
-  "SIMCALL_PROCESS_EXECUTE",
-  "SIMCALL_PROCESS_PARALLEL_EXECUTE",
-  "SIMCALL_PROCESS_EXECUTION_DESTROY",
-  "SIMCALL_PROCESS_EXECUTION_CANCEL",
-  "SIMCALL_PROCESS_EXECUTION_GET_REMAINS",
-  "SIMCALL_PROCESS_EXECUTION_GET_STATE",
-  "SIMCALL_PROCESS_EXECUTION_SET_PRIORITY",
-  "SIMCALL_PROCESS_EXECUTION_SET_BOUND",
-  "SIMCALL_PROCESS_EXECUTION_SET_AFFINITY",
-  "SIMCALL_PROCESS_EXECUTION_WAIT",
+  "SIMCALL_EXECUTION_START",
+  "SIMCALL_EXECUTION_PARALLEL_START",
+  "SIMCALL_EXECUTION_DESTROY",
+  "SIMCALL_EXECUTION_CANCEL",
+  "SIMCALL_EXECUTION_GET_REMAINS",
+  "SIMCALL_EXECUTION_GET_STATE",
+  "SIMCALL_EXECUTION_SET_PRIORITY",
+  "SIMCALL_EXECUTION_SET_BOUND",
+  "SIMCALL_EXECUTION_SET_AFFINITY",
+  "SIMCALL_EXECUTION_WAIT",
   "SIMCALL_PROCESS_ON_EXIT",
   "SIMCALL_PROCESS_AUTO_RESTART_SET",
   "SIMCALL_PROCESS_RESTART",
@@ -104,18 +74,15 @@ const char* simcall_names[] = {
   "SIMCALL_COMM_GET_SRC_PROC",
   "SIMCALL_COMM_GET_DST_PROC",
   "SIMCALL_MUTEX_INIT",
-  "SIMCALL_MUTEX_DESTROY",
   "SIMCALL_MUTEX_LOCK",
   "SIMCALL_MUTEX_TRYLOCK",
   "SIMCALL_MUTEX_UNLOCK",
   "SIMCALL_COND_INIT",
-  "SIMCALL_COND_DESTROY",
   "SIMCALL_COND_SIGNAL",
   "SIMCALL_COND_WAIT",
   "SIMCALL_COND_WAIT_TIMEOUT",
   "SIMCALL_COND_BROADCAST",
   "SIMCALL_SEM_INIT",
-  "SIMCALL_SEM_DESTROY",
   "SIMCALL_SEM_RELEASE",
   "SIMCALL_SEM_WOULD_BLOCK",
   "SIMCALL_SEM_ACQUIRE",
@@ -138,6 +105,7 @@ const char* simcall_names[] = {
   "SIMCALL_ASR_GET_PROPERTIES",
   "SIMCALL_MC_RANDOM",
   "SIMCALL_SET_CATEGORY",
+  "SIMCALL_RUN_KERNEL",
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   "SIMCALL_COMM_IS_LATENCY_BOUNDED",
 #endif
@@ -159,111 +127,6 @@ void SIMIX_simcall_handle(smx_simcall_t simcall, int value) {
   if (simcall->issuer->context->iwannadie && simcall->call != SIMCALL_PROCESS_CLEANUP)
     return;
   switch (simcall->call) {
-case SIMCALL_HOST_ON:
-       SIMIX_host_on((sg_host_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_HOST_OFF:
-       simcall_HANDLER_host_off(simcall , (sg_host_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_HOST_GET_PROPERTIES:
-      simcall->result.dp = SIMIX_host_get_properties((sg_host_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_HOST_GET_PROCESS_LIST:
-      simcall->result.dp = SIMIX_host_get_process_list((sg_host_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_HOST_GET_CURRENT_POWER_PEAK:
-      simcall->result.d = SIMIX_host_get_current_power_peak((sg_host_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_HOST_GET_POWER_PEAK_AT:
-      simcall->result.d = SIMIX_host_get_power_peak_at((sg_host_t) simcall->args[0].dp, simcall->args[1].i);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_HOST_GET_WATTMIN_AT:
-      simcall->result.d = SIMIX_host_get_wattmin_at((sg_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((sg_host_t) simcall->args[0].dp, simcall->args[1].i);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_HOST_SET_PSTATE:
-       SIMIX_host_set_pstate((sg_host_t) simcall->args[0].dp, simcall->args[1].i);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_HOST_GET_MOUNTED_STORAGE_LIST:
-      simcall->result.dp = SIMIX_host_get_mounted_storage_list((sg_host_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_HOST_GET_ATTACHED_STORAGE_LIST:
-      simcall->result.dp = SIMIX_host_get_attached_storage_list((sg_host_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_HOST_GET_PARAMS:
-       SIMIX_host_get_params((sg_host_t) simcall->args[0].dp,(vm_params_t) simcall->args[1].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_HOST_SET_PARAMS:
-       SIMIX_host_set_params((sg_host_t) simcall->args[0].dp,(vm_params_t) simcall->args[1].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_VM_CREATE:
-      simcall->result.dp = SIMIX_vm_create( simcall->args[0].cc,(sg_host_t) simcall->args[1].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_VM_START:
-       SIMIX_vm_start((sg_host_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_VM_GET_STATE:
-      simcall->result.i = SIMIX_vm_get_state((sg_host_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_VM_MIGRATE:
-       SIMIX_vm_migrate((sg_host_t) simcall->args[0].dp,(sg_host_t) simcall->args[1].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_VM_GET_PM:
-      simcall->result.dp = SIMIX_vm_get_pm((sg_host_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_VM_SET_BOUND:
-       SIMIX_vm_set_bound((sg_host_t) simcall->args[0].dp, simcall->args[1].d);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_VM_SET_AFFINITY:
-       SIMIX_vm_set_affinity((sg_host_t) simcall->args[0].dp,(sg_host_t) simcall->args[1].dp, simcall->args[2].ul);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_VM_DESTROY:
-       SIMIX_vm_destroy((sg_host_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
 case SIMCALL_VM_SUSPEND:
        simcall_HANDLER_vm_suspend(simcall , (sg_host_t) simcall->args[0].dp);
       SIMIX_simcall_answer(simcall);
@@ -289,11 +152,6 @@ case SIMCALL_VM_RESTORE:
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_VM_MIGRATEFROM_RESUMETO:
-       SIMIX_vm_migratefrom_resumeto((sg_host_t) simcall->args[0].dp,(sg_host_t) simcall->args[1].dp,(sg_host_t) simcall->args[2].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
 case SIMCALL_PROCESS_CREATE:
       simcall->result.dp = simcall_HANDLER_process_create(simcall ,  simcall->args[0].cc, (xbt_main_func_t) simcall->args[1].fp,  simcall->args[2].dp,  simcall->args[3].cc,  simcall->args[4].d,  simcall->args[5].i, (char**) simcall->args[6].dp, (xbt_dict_t) simcall->args[7].dp,  simcall->args[8].i);
       SIMIX_simcall_answer(simcall);
@@ -323,56 +181,16 @@ case SIMCALL_PROCESS_RESUME:
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_PROCESS_COUNT:
-      simcall->result.i = SIMIX_process_count();
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_PROCESS_GET_PID:
-      simcall->result.i = SIMIX_process_get_PID((smx_process_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_PROCESS_GET_PPID:
-      simcall->result.i = SIMIX_process_get_PPID((smx_process_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_PROCESS_GET_DATA:
-      simcall->result.dp = SIMIX_process_get_data((smx_process_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_PROCESS_SET_DATA:
-       SIMIX_process_set_data((smx_process_t) simcall->args[0].dp, simcall->args[1].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
 case SIMCALL_PROCESS_SET_HOST:
        simcall_HANDLER_process_set_host(simcall , (smx_process_t) simcall->args[0].dp, (sg_host_t) simcall->args[1].dp);
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_PROCESS_GET_HOST:
-      simcall->result.dp = SIMIX_process_get_host((smx_process_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
-case SIMCALL_PROCESS_GET_NAME:
-      simcall->result.cc = SIMIX_process_get_name((smx_process_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
 case SIMCALL_PROCESS_IS_SUSPENDED:
       simcall->result.i = SIMIX_process_is_suspended((smx_process_t) simcall->args[0].dp);
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_PROCESS_GET_PROPERTIES:
-      simcall->result.dp = SIMIX_process_get_properties((smx_process_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
 case SIMCALL_PROCESS_JOIN:
        simcall_HANDLER_process_join(simcall , (smx_process_t) simcall->args[0].dp,  simcall->args[1].d);
        break;  
@@ -381,53 +199,53 @@ case SIMCALL_PROCESS_SLEEP:
        simcall_HANDLER_process_sleep(simcall ,  simcall->args[0].d);
        break;  
 
-case SIMCALL_PROCESS_EXECUTE:
-      simcall->result.dp = simcall_HANDLER_process_execute(simcall ,  simcall->args[0].cc,  simcall->args[1].d,  simcall->args[2].d,  simcall->args[3].d,  simcall->args[4].ul);
+case SIMCALL_EXECUTION_START:
+      simcall->result.dp = simcall_HANDLER_execution_start(simcall ,  simcall->args[0].cc,  simcall->args[1].d,  simcall->args[2].d,  simcall->args[3].d,  simcall->args[4].ul);
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_PROCESS_PARALLEL_EXECUTE:
-      simcall->result.dp = SIMIX_process_parallel_execute( simcall->args[0].cc, simcall->args[1].i,(sg_host_t*) simcall->args[2].dp,(double*) simcall->args[3].dp,(double*) simcall->args[4].dp, simcall->args[5].d, simcall->args[6].d);
+case SIMCALL_EXECUTION_PARALLEL_START:
+      simcall->result.dp = SIMIX_execution_parallel_start( simcall->args[0].cc, simcall->args[1].i,(sg_host_t*) simcall->args[2].dp,(double*) simcall->args[3].dp,(double*) simcall->args[4].dp, simcall->args[5].d, simcall->args[6].d);
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_PROCESS_EXECUTION_DESTROY:
-       SIMIX_process_execution_destroy((smx_synchro_t) simcall->args[0].dp);
+case SIMCALL_EXECUTION_DESTROY:
+       SIMIX_execution_destroy((smx_synchro_t) simcall->args[0].dp);
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_PROCESS_EXECUTION_CANCEL:
-       SIMIX_process_execution_cancel((smx_synchro_t) simcall->args[0].dp);
+case SIMCALL_EXECUTION_CANCEL:
+       SIMIX_execution_cancel((smx_synchro_t) simcall->args[0].dp);
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_PROCESS_EXECUTION_GET_REMAINS:
-      simcall->result.d = SIMIX_process_execution_get_remains((smx_synchro_t) simcall->args[0].dp);
+case SIMCALL_EXECUTION_GET_REMAINS:
+      simcall->result.d = SIMIX_execution_get_remains((smx_synchro_t) simcall->args[0].dp);
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_PROCESS_EXECUTION_GET_STATE:
-      simcall->result.i = SIMIX_process_execution_get_state((smx_synchro_t) simcall->args[0].dp);
+case SIMCALL_EXECUTION_GET_STATE:
+      simcall->result.i = SIMIX_execution_get_state((smx_synchro_t) simcall->args[0].dp);
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_PROCESS_EXECUTION_SET_PRIORITY:
-       SIMIX_process_execution_set_priority((smx_synchro_t) simcall->args[0].dp, simcall->args[1].d);
+case SIMCALL_EXECUTION_SET_PRIORITY:
+       SIMIX_execution_set_priority((smx_synchro_t) simcall->args[0].dp, simcall->args[1].d);
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_PROCESS_EXECUTION_SET_BOUND:
-       SIMIX_process_execution_set_bound((smx_synchro_t) simcall->args[0].dp, simcall->args[1].d);
+case SIMCALL_EXECUTION_SET_BOUND:
+       SIMIX_execution_set_bound((smx_synchro_t) simcall->args[0].dp, simcall->args[1].d);
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_PROCESS_EXECUTION_SET_AFFINITY:
-       SIMIX_process_execution_set_affinity((smx_synchro_t) simcall->args[0].dp,(sg_host_t) simcall->args[1].dp, simcall->args[2].ul);
+case SIMCALL_EXECUTION_SET_AFFINITY:
+       SIMIX_execution_set_affinity((smx_synchro_t) simcall->args[0].dp,(sg_host_t) simcall->args[1].dp, simcall->args[2].ul);
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_PROCESS_EXECUTION_WAIT:
-       simcall_HANDLER_process_execution_wait(simcall , (smx_synchro_t) simcall->args[0].dp);
+case SIMCALL_EXECUTION_WAIT:
+       simcall_HANDLER_execution_wait(simcall , (smx_synchro_t) simcall->args[0].dp);
        break;  
 
 case SIMCALL_PROCESS_ON_EXIT:
@@ -554,11 +372,6 @@ case SIMCALL_MUTEX_INIT:
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_MUTEX_DESTROY:
-       SIMIX_mutex_destroy((smx_mutex_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
 case SIMCALL_MUTEX_LOCK:
        simcall_HANDLER_mutex_lock(simcall , (smx_mutex_t) simcall->args[0].dp);
        break;  
@@ -578,11 +391,6 @@ case SIMCALL_COND_INIT:
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_COND_DESTROY:
-       SIMIX_cond_destroy((smx_cond_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
 case SIMCALL_COND_SIGNAL:
        SIMIX_cond_signal((smx_cond_t) simcall->args[0].dp);
       SIMIX_simcall_answer(simcall);
@@ -606,11 +414,6 @@ case SIMCALL_SEM_INIT:
       SIMIX_simcall_answer(simcall);
       break;  
 
-case SIMCALL_SEM_DESTROY:
-       SIMIX_sem_destroy((smx_sem_t) simcall->args[0].dp);
-      SIMIX_simcall_answer(simcall);
-      break;  
-
 case SIMCALL_SEM_RELEASE:
        simcall_HANDLER_sem_release(simcall , (smx_sem_t) simcall->args[0].dp);
       SIMIX_simcall_answer(simcall);
@@ -715,6 +518,11 @@ case SIMCALL_SET_CATEGORY:
       SIMIX_simcall_answer(simcall);
       break;  
 
+case SIMCALL_RUN_KERNEL:
+       SIMIX_run_kernel( simcall->args[0].dp);
+      SIMIX_simcall_answer(simcall);
+      break;  
+
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 case SIMCALL_COMM_IS_LATENCY_BOUNDED:
       simcall->result.i = SIMIX_comm_is_latency_bounded((smx_synchro_t) simcall->args[0].dp);
@@ -740,7 +548,7 @@ case SIMCALL_MC_COMPARE_SNAPSHOTS:
     case SIMCALL_NONE:
       THROWF(arg_error,0,"Asked to do the noop syscall on %s@%s",
           SIMIX_process_get_name(simcall->issuer),
-          SIMIX_host_get_name(SIMIX_process_get_host(simcall->issuer))
+          sg_host_get_name(SIMIX_process_get_host(simcall->issuer))
           );
       break;