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
[trace] fix tesh'es due to change of link values
[simgrid.git]
/
examples
/
msg
/
tracing
/
categories.c
diff --git
a/examples/msg/tracing/categories.c
b/examples/msg/tracing/categories.c
index
1c581c1
..
19d993c
100644
(file)
--- a/
examples/msg/tracing/categories.c
+++ b/
examples/msg/tracing/categories.c
@@
-40,25
+40,25
@@
int master(int argc, char *argv[])
int i;
for (i = 0; i < number_of_tasks; i++) {
int i;
for (i = 0; i < number_of_tasks; i++) {
- m_task_t task = NULL;
+ m
sg
_task_t task = NULL;
//creating task and setting its category
if (i % 2) {
task = MSG_task_create("task_compute", 10000000, 0, NULL);
//creating task and setting its category
if (i % 2) {
task = MSG_task_create("task_compute", 10000000, 0, NULL);
-
TRACE_msg_set_task
_category(task, "compute");
+
MSG_task_set
_category(task, "compute");
} else if (i % 3) {
task = MSG_task_create("task_request", 10, 10, NULL);
} else if (i % 3) {
task = MSG_task_create("task_request", 10, 10, NULL);
-
TRACE_msg_set_task
_category(task, "request");
+
MSG_task_set
_category(task, "request");
} else {
task = MSG_task_create("task_data", 10, 10000000, NULL);
} else {
task = MSG_task_create("task_data", 10, 10000000, NULL);
-
TRACE_msg_set_task
_category(task, "data");
+
MSG_task_set
_category(task, "data");
}
MSG_task_send(task, "master_mailbox");
}
for (i = 0; i < slaves_count; i++) {
}
MSG_task_send(task, "master_mailbox");
}
for (i = 0; i < slaves_count; i++) {
- m_task_t finalize = MSG_task_create("finalize", 0, 1000, 0);
-
TRACE_msg_set_task
_category(finalize, "finalize");
+ m
sg
_task_t finalize = MSG_task_create("finalize", 0, 1000, 0);
+
MSG_task_set
_category(finalize, "finalize");
MSG_task_send(finalize, "master_mailbox");
}
MSG_task_send(finalize, "master_mailbox");
}
@@
-68,7
+68,7
@@
int master(int argc, char *argv[])
/** Receiver function */
int slave(int argc, char *argv[])
{
/** Receiver function */
int slave(int argc, char *argv[])
{
- m_task_t task = NULL;
+ m
sg
_task_t task = NULL;
while (1) {
MSG_task_receive(&(task), "master_mailbox");
while (1) {
MSG_task_receive(&(task), "master_mailbox");
@@
-88,7
+88,7
@@
int slave(int argc, char *argv[])
/** Main function */
int main(int argc, char *argv[])
{
/** Main function */
int main(int argc, char *argv[])
{
- MSG_
global_
init(&argc, argv);
+ MSG_init(&argc, argv);
if (argc < 3) {
printf("Usage: %s platform_file deployment_file\n", argv[0]);
exit(1);
if (argc < 3) {
printf("Usage: %s platform_file deployment_file\n", argv[0]);
exit(1);
@@
-109,6
+109,5
@@
int main(int argc, char *argv[])
MSG_launch_application(deployment_file);
MSG_main();
MSG_launch_application(deployment_file);
MSG_main();
- MSG_clean();
return 0;
}
return 0;
}