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 : fix platform file path in tesh examples
[simgrid.git]
/
examples
/
msg
/
mc
/
centralized_mutex.c
diff --git
a/examples/msg/mc/centralized_mutex.c
b/examples/msg/mc/centralized_mutex.c
index
5cfb74f
..
5b3cd59
100644
(file)
--- a/
examples/msg/mc/centralized_mutex.c
+++ b/
examples/msg/mc/centralized_mutex.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. */
+
+
/***************** Centralized Mutual Exclusion Algorithm *********************/
/* This example implements a centralized mutual exclusion algorithm. */
/* There is no bug on it, it is just provided to test the state space */
/***************** Centralized Mutual Exclusion Algorithm *********************/
/* This example implements a centralized mutual exclusion algorithm. */
/* There is no bug on it, it is just provided to test the state space */
@@
-19,7
+26,7
@@
int coordinator(int argc, char *argv[])
int CS_used = 0; // initially the CS is idle
int todo = AMOUNT_OF_CLIENTS * CS_PER_PROCESS; // amount of releases we are expecting
while (todo > 0) {
int CS_used = 0; // initially the CS is idle
int todo = AMOUNT_OF_CLIENTS * CS_PER_PROCESS; // amount of releases we are expecting
while (todo > 0) {
- m_task_t task = NULL;
+ m
sg
_task_t task = NULL;
MSG_task_receive(&task, "coordinator");
const char *kind = MSG_task_get_name(task); //is it a request or a release?
if (!strcmp(kind, "request")) { // that's a request
MSG_task_receive(&task, "coordinator");
const char *kind = MSG_task_get_name(task); //is it a request or a release?
if (!strcmp(kind, "request")) { // that's a request
@@
-29,7
+36,7
@@
int coordinator(int argc, char *argv[])
xbt_dynar_push(requests, &req);
} else { // can serve it immediatly
XBT_INFO("CS idle. Grant immediatly");
xbt_dynar_push(requests, &req);
} else { // can serve it immediatly
XBT_INFO("CS idle. Grant immediatly");
- m_task_t answer = MSG_task_create("grant", 0, 1000, NULL);
+ m
sg
_task_t answer = MSG_task_create("grant", 0, 1000, NULL);
MSG_task_send(answer, req);
CS_used = 1;
}
MSG_task_send(answer, req);
CS_used = 1;
}
@@
-65,7
+72,7
@@
int client(int argc, char *argv[])
MSG_task_send(MSG_task_create("request", 0, 1000, my_mailbox),
"coordinator");
// wait the answer
MSG_task_send(MSG_task_create("request", 0, 1000, my_mailbox),
"coordinator");
// wait the answer
- m_task_t grant = NULL;
+ m
sg
_task_t grant = NULL;
MSG_task_receive(&grant, my_mailbox);
MSG_task_destroy(grant);
XBT_INFO("got the answer. Sleep a bit and release it");
MSG_task_receive(&grant, my_mailbox);
MSG_task_destroy(grant);
XBT_INFO("got the answer. Sleep a bit and release it");
@@
-80,7
+87,7
@@
int client(int argc, char *argv[])
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
- MSG_
global_
init(&argc, argv);
+ MSG_init(&argc, argv);
MSG_create_environment("../msg_platform.xml");
MSG_function_register("coordinator", coordinator);
MSG_function_register("client", client);
MSG_create_environment("../msg_platform.xml");
MSG_function_register("coordinator", coordinator);
MSG_function_register("client", client);