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
VM: getters should not be simcalls
[simgrid.git]
/
examples
/
msg
/
mc
/
bugged1.c
diff --git
a/examples/msg/mc/bugged1.c
b/examples/msg/mc/bugged1.c
index
62539cd
..
e709335
100644
(file)
--- a/
examples/msg/mc/bugged1.c
+++ b/
examples/msg/mc/bugged1.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010-201
4
. The SimGrid Team.
+/* Copyright (c) 2010-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-9,17
+9,14
@@
/* which is incorrect because the message ordering is non-deterministic */
/******************************************************************************/
/* which is incorrect because the message ordering is non-deterministic */
/******************************************************************************/
-#include <
msg
/msg.h>
+#include <
simgrid
/msg.h>
#include <simgrid/modelchecker.h>
#define N 3
XBT_LOG_NEW_DEFAULT_CATEGORY(example, "this example");
#include <simgrid/modelchecker.h>
#define N 3
XBT_LOG_NEW_DEFAULT_CATEGORY(example, "this example");
-int server(int argc, char *argv[]);
-int client(int argc, char *argv[]);
-
-int server(int argc, char *argv[])
+static int server(int argc, char *argv[])
{
msg_task_t task = NULL;
int count = 0;
{
msg_task_t task = NULL;
int count = 0;
@@
-31,18
+28,15
@@
int server(int argc, char *argv[])
MSG_task_receive(&task, "mymailbox");
count++;
}
MSG_task_receive(&task, "mymailbox");
count++;
}
- MC_assert(
atoi(MSG_task_get_name(task)
) == 3);
+ MC_assert(
xbt_str_parse_int(MSG_task_get_name(task), "Task names must be integers, not '%s'"
) == 3);
XBT_INFO("OK");
return 0;
}
XBT_INFO("OK");
return 0;
}
-int client(int argc, char *argv[])
+
static
int client(int argc, char *argv[])
{
{
-
- msg_task_t task =
- MSG_task_create(argv[1], 0 /*comp cost */ , 10000 /*comm size */ ,
- NULL /*arbitrary data */ );
+ msg_task_t task = MSG_task_create(argv[1], 0 /*comp cost */ , 10000 /*comm size */ , NULL /*arbitrary data */ );
MSG_task_send(task, "mymailbox");
MSG_task_send(task, "mymailbox");
@@
-52,19
+46,14
@@
int client(int argc, char *argv[])
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
-
MSG_init(&argc, argv);
MSG_create_environment("platform.xml");
MSG_function_register("server", server);
MSG_init(&argc, argv);
MSG_create_environment("platform.xml");
MSG_function_register("server", server);
-
MSG_function_register("client", client);
MSG_function_register("client", client);
-
MSG_launch_application("deploy_bugged1.xml");
MSG_main();
MSG_launch_application("deploy_bugged1.xml");
MSG_main();
-
return 0;
return 0;
-
}
}