A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:simgrid/simgrid into s_type_cleanup
[simgrid.git]
/
src
/
simix
/
popping_generated.cpp
diff --git
a/src/simix/popping_generated.cpp
b/src/simix/popping_generated.cpp
index 592c22f245ea7d85e810e16fc2ad03f4d64e7595..e52c41f726a028bf511ca18e63972c19ea74fbd1 100644
(file)
--- 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",
/** @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",
"SIMCALL_PROCESS_KILLALL",
"SIMCALL_PROCESS_CLEANUP",
"SIMCALL_PROCESS_SUSPEND",
@@
-49,6
+48,7
@@
const char* simcall_names[] = {
"SIMCALL_COMM_TESTANY",
"SIMCALL_MUTEX_LOCK",
"SIMCALL_MUTEX_TRYLOCK",
"SIMCALL_COMM_TESTANY",
"SIMCALL_MUTEX_LOCK",
"SIMCALL_MUTEX_TRYLOCK",
+ "SIMCALL_MUTEX_UNLOCK",
"SIMCALL_COND_INIT",
"SIMCALL_COND_SIGNAL",
"SIMCALL_COND_WAIT",
"SIMCALL_COND_INIT",
"SIMCALL_COND_SIGNAL",
"SIMCALL_COND_WAIT",
@@
-75,11
+75,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) {
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<smx_actor_t>(simcall->args[0]));
- SIMIX_simcall_answer(simcall);
- break;
-
case SIMCALL_PROCESS_KILLALL:
simcall_HANDLER_process_killall(simcall, simgrid::simix::unmarshal<int>(simcall->args[0]));
SIMIX_simcall_answer(simcall);
case SIMCALL_PROCESS_KILLALL:
simcall_HANDLER_process_killall(simcall, simgrid::simix::unmarshal<int>(simcall->args[0]));
SIMIX_simcall_answer(simcall);
@@
-232,6
+227,11
@@
case SIMCALL_MUTEX_TRYLOCK:
SIMIX_simcall_answer(simcall);
break;
SIMIX_simcall_answer(simcall);
break;
+case SIMCALL_MUTEX_UNLOCK:
+ simcall_HANDLER_mutex_unlock(simcall, simgrid::simix::unmarshal<smx_mutex_t>(simcall->args[0]));
+ SIMIX_simcall_answer(simcall);
+ break;
+
case SIMCALL_COND_INIT:
simgrid::simix::marshal<smx_cond_t>(simcall->result, SIMIX_cond_init());
SIMIX_simcall_answer(simcall);
case SIMCALL_COND_INIT:
simgrid::simix::marshal<smx_cond_t>(simcall->result, SIMIX_cond_init());
SIMIX_simcall_answer(simcall);