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
model-checker : new examples (with tesh) for verification of liveness properties...
[simgrid.git]
/
examples
/
msg
/
mc
/
bugged3.c
diff --git
a/examples/msg/mc/bugged3.c
b/examples/msg/mc/bugged3.c
index
fa81b63
..
dbf589f
100644
(file)
--- a/
examples/msg/mc/bugged3.c
+++ b/
examples/msg/mc/bugged3.c
@@
-1,3
+1,10
@@
+/* Copyright (c) 2012. The SimGrid Team.
+ * All rights reserved. */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+
/**************** Shared buffer between asynchronous receives *****************/
/* Server process assumes that the data from the second communication comm2 */
/* will overwrite the one from the first communication, because of the order */
/**************** Shared buffer between asynchronous receives *****************/
/* Server process assumes that the data from the second communication comm2 */
/* will overwrite the one from the first communication, because of the order */
@@
-8,53
+15,54
@@
/******************************************************************************/
#include <msg/msg.h>
/******************************************************************************/
#include <msg/msg.h>
-#include <
mc
/modelchecker.h>
+#include <
simgrid
/modelchecker.h>
-XBT_LOG_NEW_DEFAULT_CATEGORY(bugged3,"this example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(bugged3,
"this example");
-int server(int argc,char *argv[]);
-int client(int argc,char *argv[]);
+int server(int argc,
char *argv[]);
+int client(int argc,
char *argv[]);
-int server(int argc,char *argv[])
+int server(int argc,
char *argv[])
{
{
- m_task_t task1;
+ m
sg
_task_t task1;
long val1;
msg_comm_t comm1, comm2;
long val1;
msg_comm_t comm1, comm2;
- comm1 = MSG_task_irecv(&task1,"mymailbox1");
- comm2 = MSG_task_irecv(&task1,"mymailbox2");
+ comm1 = MSG_task_irecv(&task1,
"mymailbox1");
+ comm2 = MSG_task_irecv(&task1,
"mymailbox2");
MSG_comm_wait(comm1, -1);
MSG_comm_wait(comm2, -1);
MSG_comm_wait(comm1, -1);
MSG_comm_wait(comm2, -1);
- val1 = (long)MSG_task_get_data(task1);
-
INFO1
("Received %lu", val1);
-
+ val1 = (long)
MSG_task_get_data(task1);
+
XBT_INFO
("Received %lu", val1);
+
MC_assert(val1 == 2);
MC_assert(val1 == 2);
-
-
INFO0
("OK");
+
+
XBT_INFO
("OK");
return 0;
}
return 0;
}
-int client(int argc,char *argv[])
+int client(int argc,
char *argv[])
{
msg_comm_t comm;
char *mbox;
{
msg_comm_t comm;
char *mbox;
- m_task_t task1 = MSG_task_create("task", 0, 10000, (void *) atol(argv[1]));
+ msg_task_t task1 =
+ MSG_task_create("task", 0, 10000, (void *) atol(argv[1]));
mbox = bprintf("mymailbox%s", argv[1]);
mbox = bprintf("mymailbox%s", argv[1]);
-
-
INFO1
("Send %d!", atoi(argv[1]));
- comm = MSG_task_isend(task1,mbox);
+
+
XBT_INFO
("Send %d!", atoi(argv[1]));
+ comm = MSG_task_isend(task1,
mbox);
MSG_comm_wait(comm, -1);
xbt_free(mbox);
MSG_comm_wait(comm, -1);
xbt_free(mbox);
-
+
return 0;
}
return 0;
}
-int main(int argc,
char*argv[])
+int main(int argc,
char *argv[])
{
{
- MSG_
global_init(&argc,
argv);
+ MSG_
init(&argc,
argv);
MSG_create_environment("platform.xml");
MSG_create_environment("platform.xml");