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
Improve formatting of simcalls.py's output..
[simgrid.git]
/
src
/
simix
/
popping_generated.cpp
diff --git
a/src/simix/popping_generated.cpp
b/src/simix/popping_generated.cpp
index
f24a394
..
f70946c
100644
(file)
--- a/
src/simix/popping_generated.cpp
+++ b/
src/simix/popping_generated.cpp
@@
-4,7
+4,7
@@
/* DO NOT EVER CHANGE THIS FILE */
/* */
/* change simcalls specification in src/simix/simcalls.in */
/* DO NOT EVER CHANGE THIS FILE */
/* */
/* change simcalls specification in src/simix/simcalls.in */
-/* Copyright (c) 2014-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-201
8
. The SimGrid Team. All rights reserved. */
/**********************************************************************/
/*
/**********************************************************************/
/*
@@
-19,6
+19,9
@@
#if SIMGRID_HAVE_MC
#include "src/mc/mc_forward.hpp"
#endif
#if SIMGRID_HAVE_MC
#include "src/mc/mc_forward.hpp"
#endif
+#include "src/kernel/activity/ConditionVariableImpl.hpp"
+#include "src/simix/smx_host_private.hpp"
+#include "src/simix/smx_synchro_private.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);
@@
-48,10
+51,8
@@
const char* simcall_names[] = {
"SIMCALL_MUTEX_TRYLOCK",
"SIMCALL_MUTEX_UNLOCK",
"SIMCALL_COND_INIT",
"SIMCALL_MUTEX_TRYLOCK",
"SIMCALL_MUTEX_UNLOCK",
"SIMCALL_COND_INIT",
- "SIMCALL_COND_SIGNAL",
"SIMCALL_COND_WAIT",
"SIMCALL_COND_WAIT_TIMEOUT",
"SIMCALL_COND_WAIT",
"SIMCALL_COND_WAIT_TIMEOUT",
- "SIMCALL_COND_BROADCAST",
"SIMCALL_SEM_ACQUIRE",
"SIMCALL_SEM_ACQUIRE_TIMEOUT",
"SIMCALL_STORAGE_READ",
"SIMCALL_SEM_ACQUIRE",
"SIMCALL_SEM_ACQUIRE_TIMEOUT",
"SIMCALL_STORAGE_READ",
@@
-74,7
+75,7
@@
void SIMIX_simcall_handle(smx_simcall_t simcall, int value) {
return;
switch (simcall->call) {
case SIMCALL_PROCESS_KILLALL:
return;
switch (simcall->call) {
case SIMCALL_PROCESS_KILLALL:
- simcall_HANDLER_process_killall(simcall
, simgrid::simix::unmarshal<int>(simcall->args[0])
);
+ simcall_HANDLER_process_killall(simcall);
SIMIX_simcall_answer(simcall);
break;
SIMIX_simcall_answer(simcall);
break;
@@
-183,11
+184,6
@@
case SIMCALL_COND_INIT:
SIMIX_simcall_answer(simcall);
break;
SIMIX_simcall_answer(simcall);
break;
-case SIMCALL_COND_SIGNAL:
- SIMIX_cond_signal(simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]));
- SIMIX_simcall_answer(simcall);
- break;
-
case SIMCALL_COND_WAIT:
simcall_HANDLER_cond_wait(simcall, simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]), simgrid::simix::unmarshal<smx_mutex_t>(simcall->args[1]));
break;
case SIMCALL_COND_WAIT:
simcall_HANDLER_cond_wait(simcall, simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]), simgrid::simix::unmarshal<smx_mutex_t>(simcall->args[1]));
break;
@@
-196,11
+192,6
@@
case SIMCALL_COND_WAIT_TIMEOUT:
simcall_HANDLER_cond_wait_timeout(simcall, simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]), simgrid::simix::unmarshal<smx_mutex_t>(simcall->args[1]), simgrid::simix::unmarshal<double>(simcall->args[2]));
break;
simcall_HANDLER_cond_wait_timeout(simcall, simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]), simgrid::simix::unmarshal<smx_mutex_t>(simcall->args[1]), simgrid::simix::unmarshal<double>(simcall->args[2]));
break;
-case SIMCALL_COND_BROADCAST:
- SIMIX_cond_broadcast(simgrid::simix::unmarshal<smx_cond_t>(simcall->args[0]));
- SIMIX_simcall_answer(simcall);
- break;
-
case SIMCALL_SEM_ACQUIRE:
simcall_HANDLER_sem_acquire(simcall, simgrid::simix::unmarshal<smx_sem_t>(simcall->args[0]));
break;
case SIMCALL_SEM_ACQUIRE:
simcall_HANDLER_sem_acquire(simcall, simgrid::simix::unmarshal<smx_sem_t>(simcall->args[0]));
break;