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 scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
msg
/
msg_global.c
diff --git
a/src/msg/msg_global.c
b/src/msg/msg_global.c
index
99240fd
..
7b0c29e
100644
(file)
--- a/
src/msg/msg_global.c
+++ b/
src/msg/msg_global.c
@@
-67,6
+67,8
@@
void MSG_global_init(int *argc, char **argv)
msg_global->max_channel = 0;
msg_global->PID = 1;
msg_global->sent_msg = 0;
msg_global->max_channel = 0;
msg_global->PID = 1;
msg_global->sent_msg = 0;
+ msg_global->task_copy_callback = NULL;
+ msg_global->process_data_cleanup = NULL;
/* initialization of the action module */
_MSG_action_init();
/* initialization of the action module */
_MSG_action_init();
@@
-110,6
+112,7
@@
void MSG_global_init(int *argc, char **argv)
*/
MSG_error_t MSG_set_channel_number(int number)
{
*/
MSG_error_t MSG_set_channel_number(int number)
{
+ XBT_WARN("DEPRECATED! Now use alias");
xbt_assert((msg_global)
&& (msg_global->max_channel == 0),
"Channel number already set!");
xbt_assert((msg_global)
&& (msg_global->max_channel == 0),
"Channel number already set!");
@@
-128,6
+131,7
@@
MSG_error_t MSG_set_channel_number(int number)
*/
int MSG_get_channel_number(void)
{
*/
int MSG_get_channel_number(void)
{
+ XBT_WARN("DEPRECATED! Now use alias");
xbt_assert((msg_global)
&& (msg_global->max_channel != 0),
"Channel number not set yet!");
xbt_assert((msg_global)
&& (msg_global->max_channel != 0),
"Channel number not set yet!");
@@
-168,29
+172,15
@@
MSG_error_t MSG_main_stateful(void)
return MSG_OK;
}
return MSG_OK;
}
-MSG_error_t MSG_main_liveness_stateful(xbt_automaton_t a)
-{
- /* Clean IO before the run */
- fflush(stdout);
- fflush(stderr);
-
- if (MC_IS_ENABLED) {
- MC_modelcheck_liveness_stateful(a);
- }
- else {
- SIMIX_run();
- }
- return MSG_OK;
-}
-MSG_error_t MSG_main_liveness
_stateless
(xbt_automaton_t a, char *prgm)
+MSG_error_t MSG_main_liveness(xbt_automaton_t a, char *prgm)
{
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
if (MC_IS_ENABLED) {
{
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
if (MC_IS_ENABLED) {
- MC_modelcheck_liveness
_stateless
(a, prgm);
+ MC_modelcheck_liveness(a, prgm);
}
else {
SIMIX_run();
}
else {
SIMIX_run();
@@
-207,7
+197,7
@@
MSG_error_t MSG_main_liveness_stateless(xbt_automaton_t a, char *prgm)
*/
int MSG_process_killall(int reset_PIDs)
{
*/
int MSG_process_killall(int reset_PIDs)
{
-
SIMIX_req
_process_killall();
+
simcall
_process_killall();
if (reset_PIDs > 0) {
msg_global->PID = reset_PIDs;
if (reset_PIDs > 0) {
msg_global->PID = reset_PIDs;