X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8639295f6bedeb3c9e1a60a1056925c4fe892fa4..21f39f6eed6ee5e5346c9f1da16de87702e6eae1:/src/simix/popping_generated.cpp diff --git a/src/simix/popping_generated.cpp b/src/simix/popping_generated.cpp index 69010c2676..7f4fc93b45 100644 --- a/src/simix/popping_generated.cpp +++ b/src/simix/popping_generated.cpp @@ -25,7 +25,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping); /** @brief Simcalls' names (generated from src/simix/simcalls.in) */ const char* simcall_names[] = { "SIMCALL_NONE", - "SIMCALL_PROCESS_KILL", "SIMCALL_PROCESS_KILLALL", "SIMCALL_PROCESS_CLEANUP", "SIMCALL_PROCESS_SUSPEND", @@ -33,12 +32,8 @@ const char* simcall_names[] = { "SIMCALL_PROCESS_SLEEP", "SIMCALL_EXECUTION_START", "SIMCALL_EXECUTION_PARALLEL_START", - "SIMCALL_EXECUTION_CANCEL", - "SIMCALL_EXECUTION_SET_PRIORITY", - "SIMCALL_EXECUTION_SET_BOUND", "SIMCALL_EXECUTION_WAIT", "SIMCALL_PROCESS_ON_EXIT", - "SIMCALL_PROCESS_RESTART", "SIMCALL_COMM_IPROBE", "SIMCALL_COMM_SEND", "SIMCALL_COMM_ISEND", @@ -48,20 +43,16 @@ const char* simcall_names[] = { "SIMCALL_COMM_WAIT", "SIMCALL_COMM_TEST", "SIMCALL_COMM_TESTANY", - "SIMCALL_MUTEX_INIT", "SIMCALL_MUTEX_LOCK", "SIMCALL_MUTEX_TRYLOCK", + "SIMCALL_MUTEX_UNLOCK", "SIMCALL_COND_INIT", "SIMCALL_COND_SIGNAL", "SIMCALL_COND_WAIT", "SIMCALL_COND_WAIT_TIMEOUT", "SIMCALL_COND_BROADCAST", - "SIMCALL_SEM_INIT", - "SIMCALL_SEM_RELEASE", - "SIMCALL_SEM_WOULD_BLOCK", "SIMCALL_SEM_ACQUIRE", "SIMCALL_SEM_ACQUIRE_TIMEOUT", - "SIMCALL_SEM_GET_CAPACITY", "SIMCALL_FILE_READ", "SIMCALL_FILE_WRITE", "SIMCALL_MC_RANDOM", @@ -81,11 +72,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_PROCESS_KILL: - simcall_HANDLER_process_kill(simcall, simgrid::simix::unmarshal(simcall->args[0])); - SIMIX_simcall_answer(simcall); - break; - case SIMCALL_PROCESS_KILLALL: simcall_HANDLER_process_killall(simcall, simgrid::simix::unmarshal(simcall->args[0])); SIMIX_simcall_answer(simcall); @@ -129,26 +115,6 @@ case SIMCALL_EXECUTION_PARALLEL_START: SIMIX_simcall_answer(simcall); break; -case SIMCALL_EXECUTION_CANCEL: - SIMIX_execution_cancel( - simgrid::simix::unmarshal>(simcall->args[0])); - SIMIX_simcall_answer(simcall); - break; - -case SIMCALL_EXECUTION_SET_PRIORITY: - SIMIX_execution_set_priority( - simgrid::simix::unmarshal>(simcall->args[0]), - simgrid::simix::unmarshal(simcall->args[1])); - SIMIX_simcall_answer(simcall); - break; - -case SIMCALL_EXECUTION_SET_BOUND: - SIMIX_execution_set_bound( - simgrid::simix::unmarshal>(simcall->args[0]), - simgrid::simix::unmarshal(simcall->args[1])); - SIMIX_simcall_answer(simcall); - break; - case SIMCALL_EXECUTION_WAIT: simcall_HANDLER_execution_wait( simcall, @@ -160,11 +126,6 @@ case SIMCALL_PROCESS_ON_EXIT: SIMIX_simcall_answer(simcall); break; -case SIMCALL_PROCESS_RESTART: - simgrid::simix::marshal(simcall->result, simcall_HANDLER_process_restart(simcall, simgrid::simix::unmarshal(simcall->args[0]))); - SIMIX_simcall_answer(simcall); - break; - case SIMCALL_COMM_IPROBE: simgrid::simix::marshal>( simcall->result, simcall_HANDLER_comm_iprobe(simcall, simgrid::simix::unmarshal(simcall->args[0]), @@ -234,11 +195,6 @@ case SIMCALL_COMM_TESTANY: simgrid::simix::unmarshal(simcall->args[1])); break; -case SIMCALL_MUTEX_INIT: - simgrid::simix::marshal(simcall->result, simcall_HANDLER_mutex_init(simcall)); - SIMIX_simcall_answer(simcall); - break; - case SIMCALL_MUTEX_LOCK: simcall_HANDLER_mutex_lock(simcall, simgrid::simix::unmarshal(simcall->args[0])); break; @@ -248,6 +204,11 @@ case SIMCALL_MUTEX_TRYLOCK: SIMIX_simcall_answer(simcall); break; +case SIMCALL_MUTEX_UNLOCK: + simcall_HANDLER_mutex_unlock(simcall, simgrid::simix::unmarshal(simcall->args[0])); + SIMIX_simcall_answer(simcall); + break; + case SIMCALL_COND_INIT: simgrid::simix::marshal(simcall->result, SIMIX_cond_init()); SIMIX_simcall_answer(simcall); @@ -271,21 +232,6 @@ case SIMCALL_COND_BROADCAST: SIMIX_simcall_answer(simcall); break; -case SIMCALL_SEM_INIT: - simgrid::simix::marshal(simcall->result, SIMIX_sem_init(simgrid::simix::unmarshal(simcall->args[0]))); - SIMIX_simcall_answer(simcall); - break; - -case SIMCALL_SEM_RELEASE: - simcall_HANDLER_sem_release(simcall, simgrid::simix::unmarshal(simcall->args[0])); - SIMIX_simcall_answer(simcall); - break; - -case SIMCALL_SEM_WOULD_BLOCK: - simgrid::simix::marshal(simcall->result, simcall_HANDLER_sem_would_block(simcall, simgrid::simix::unmarshal(simcall->args[0]))); - SIMIX_simcall_answer(simcall); - break; - case SIMCALL_SEM_ACQUIRE: simcall_HANDLER_sem_acquire(simcall, simgrid::simix::unmarshal(simcall->args[0])); break; @@ -294,11 +240,6 @@ case SIMCALL_SEM_ACQUIRE_TIMEOUT: simcall_HANDLER_sem_acquire_timeout(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1])); break; -case SIMCALL_SEM_GET_CAPACITY: - simgrid::simix::marshal(simcall->result, simcall_HANDLER_sem_get_capacity(simcall, simgrid::simix::unmarshal(simcall->args[0]))); - SIMIX_simcall_answer(simcall); - break; - case SIMCALL_FILE_READ: simcall_HANDLER_file_read(simcall, simgrid::simix::unmarshal(simcall->args[0]), simgrid::simix::unmarshal(simcall->args[1]));