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
Update copyright lines with new year.
[simgrid.git]
/
examples
/
msg
/
mc
/
bugged2.c
diff --git
a/examples/msg/mc/bugged2.c
b/examples/msg/mc/bugged2.c
index
4cda68c
..
c659568
100644
(file)
--- a/
examples/msg/mc/bugged2.c
+++ b/
examples/msg/mc/bugged2.c
@@
-1,5
+1,4
@@
-/* Copyright (c) 2010-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2019. 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. */
/* 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. */
@@
-15,44
+14,40
@@
XBT_LOG_NEW_DEFAULT_CATEGORY(example, "this example");
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 task1 = NULL;
msg_task_t task2 = NULL;
{
msg_task_t task1 = NULL;
msg_task_t task2 = NULL;
- long val1, val2;
MSG_task_receive(&task1, "mymailbox");
MSG_task_receive(&task1, "mymailbox");
- val1 = xbt_str_parse_int(MSG_task_get_name(task1), "Task name is not a numerical ID: %s");
+
long
val1 = xbt_str_parse_int(MSG_task_get_name(task1), "Task name is not a numerical ID: %s");
MSG_task_destroy(task1);
task1 = NULL;
MSG_task_destroy(task1);
task1 = NULL;
- XBT_INFO("Received %l
u
", val1);
+ XBT_INFO("Received %l
d
", val1);
MSG_task_receive(&task2, "mymailbox");
MSG_task_receive(&task2, "mymailbox");
- val2 = xbt_str_parse_int(MSG_task_get_name(task2), "Task name is not a numerical ID: %s");
+
long
val2 = xbt_str_parse_int(MSG_task_get_name(task2), "Task name is not a numerical ID: %s");
MSG_task_destroy(task2);
task2 = NULL;
MSG_task_destroy(task2);
task2 = NULL;
- XBT_INFO("Received %l
u
", val2);
+ XBT_INFO("Received %l
d
", val2);
MC_assert(MIN(val1, val2) == 1);
MSG_task_receive(&task1, "mymailbox");
val1 = xbt_str_parse_int(MSG_task_get_name(task1), "Task name is not a numerical ID: %s");
MSG_task_destroy(task1);
MC_assert(MIN(val1, val2) == 1);
MSG_task_receive(&task1, "mymailbox");
val1 = xbt_str_parse_int(MSG_task_get_name(task1), "Task name is not a numerical ID: %s");
MSG_task_destroy(task1);
- XBT_INFO("Received %l
u
", val1);
+ XBT_INFO("Received %l
d
", val1);
MSG_task_receive(&task2, "mymailbox");
val2 = xbt_str_parse_int(MSG_task_get_name(task2), "Task name is not a numerical ID: %s");
MSG_task_destroy(task2);
MSG_task_receive(&task2, "mymailbox");
val2 = xbt_str_parse_int(MSG_task_get_name(task2), "Task name is not a numerical ID: %s");
MSG_task_destroy(task2);
- XBT_INFO("Received %l
u
", val2);
+ XBT_INFO("Received %l
d
", val2);
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 task1 = MSG_task_create(argv[1], 0, 10000, NULL);
msg_task_t task2 = MSG_task_create(argv[1], 0, 10000, NULL);
{
msg_task_t task1 = MSG_task_create(argv[1], 0, 10000, NULL);
msg_task_t task2 = MSG_task_create(argv[1], 0, 10000, NULL);
@@
-77,6
+72,5
@@
int main(int argc, char *argv[])
MSG_launch_application("deploy_bugged2.xml");
MSG_main();
MSG_launch_application("deploy_bugged2.xml");
MSG_main();
-
return 0;
}
return 0;
}