A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b2908cf
)
[trace] update examples with the new API for setting task category
author
schnorr
<Lucas.Schnorr@imag.fr>
Sat, 24 Mar 2012 18:27:49 +0000
(19:27 +0100)
committer
schnorr
<Lucas.Schnorr@imag.fr>
Sat, 24 Mar 2012 18:27:49 +0000
(19:27 +0100)
examples/msg/gtnets/gtnets.c
patch
|
blob
|
history
examples/msg/ns3/ns3.c
patch
|
blob
|
history
examples/msg/tracing/categories.c
patch
|
blob
|
history
examples/msg/tracing/ms.c
patch
|
blob
|
history
examples/msg/tracing/procmig.c
patch
|
blob
|
history
diff --git
a/examples/msg/gtnets/gtnets.c
b/examples/msg/gtnets/gtnets.c
index
003672f
..
aab840b
100644
(file)
--- a/
examples/msg/gtnets/gtnets.c
+++ b/
examples/msg/gtnets/gtnets.c
@@
-70,7
+70,7
@@
int master(int argc, char *argv[])
{ /* Task creation. */
char sprintf_buffer[64] = "Task_0";
todo = MSG_task_create(sprintf_buffer, 0, task_comm_size, NULL);
{ /* Task creation. */
char sprintf_buffer[64] = "Task_0";
todo = MSG_task_create(sprintf_buffer, 0, task_comm_size, NULL);
-
TRACE_msg_set_task
_category(todo, id_alias);
+
MSG_task_set
_category(todo, id_alias);
//keep track of running tasks
gl_task_array[id] = todo;
gl_data_size[id] = task_comm_size;
//keep track of running tasks
gl_task_array[id] = todo;
gl_data_size[id] = task_comm_size;
diff --git
a/examples/msg/ns3/ns3.c
b/examples/msg/ns3/ns3.c
index
e121a3f
..
6b509d2
100644
(file)
--- a/
examples/msg/ns3/ns3.c
+++ b/
examples/msg/ns3/ns3.c
@@
-84,7
+84,7
@@
int master(int argc, char *argv[])
{ /* Task creation. */
char sprintf_buffer[64] = "Task_0";
todo = MSG_task_create(sprintf_buffer, 100*task_comm_size, task_comm_size, NULL);
{ /* Task creation. */
char sprintf_buffer[64] = "Task_0";
todo = MSG_task_create(sprintf_buffer, 100*task_comm_size, task_comm_size, NULL);
-
TRACE_msg_set_task
_category(todo, id_alias);
+
MSG_task_set
_category(todo, id_alias);
//keep track of running tasks
gl_task_array[id] = todo;
gl_data_size[id] = task_comm_size;
//keep track of running tasks
gl_task_array[id] = todo;
gl_data_size[id] = task_comm_size;
diff --git
a/examples/msg/tracing/categories.c
b/examples/msg/tracing/categories.c
index
1c581c1
..
3451219
100644
(file)
--- a/
examples/msg/tracing/categories.c
+++ b/
examples/msg/tracing/categories.c
@@
-45,20
+45,20
@@
int master(int argc, char *argv[])
//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++) {
m_task_t finalize = MSG_task_create("finalize", 0, 1000, 0);
}
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");
+
MSG_task_set
_category(finalize, "finalize");
MSG_task_send(finalize, "master_mailbox");
}
MSG_task_send(finalize, "master_mailbox");
}
diff --git
a/examples/msg/tracing/ms.c
b/examples/msg/tracing/ms.c
index
0e9c942
..
858e9f0
100644
(file)
--- a/
examples/msg/tracing/ms.c
+++ b/
examples/msg/tracing/ms.c
@@
-54,14
+54,14
@@
int master(int argc, char *argv[])
//setting the category of task to "compute"
//the category of a task must be defined before it is sent or executed
//setting the category of task to "compute"
//the category of a task must be defined before it is sent or executed
-
TRACE_msg_set_task
_category(task, "compute");
+
MSG_task_set
_category(task, "compute");
MSG_task_send(task, "master_mailbox");
}
TRACE_mark("msmark", "finish_send_tasks");
for (i = 0; i < slaves_count; i++) {
m_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
MSG_task_send(task, "master_mailbox");
}
TRACE_mark("msmark", "finish_send_tasks");
for (i = 0; i < slaves_count; i++) {
m_task_t finalize = MSG_task_create("finalize", 0, 0, 0);
-
TRACE_msg_set_task
_category(finalize, "finalize");
+
MSG_task_set
_category(finalize, "finalize");
MSG_task_send(finalize, "master_mailbox");
}
MSG_task_send(finalize, "master_mailbox");
}
diff --git
a/examples/msg/tracing/procmig.c
b/examples/msg/tracing/procmig.c
index
3c2121a
..
26a7eff
100644
(file)
--- a/
examples/msg/tracing/procmig.c
+++ b/
examples/msg/tracing/procmig.c
@@
-68,7
+68,7
@@
static int master(int argc, char *argv[])
if (destination){
MSG_task_set_data(task, xbt_strdup (destination));
}
if (destination){
MSG_task_set_data(task, xbt_strdup (destination));
}
-
TRACE_msg_set_task
_category(task, "migration_order");
+
MSG_task_set
_category(task, "migration_order");
MSG_task_send (task, "master_mailbox");
task = NULL;
}
MSG_task_send (task, "master_mailbox");
task = NULL;
}