X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bc7aeab041e3ce07b22351094fa1f1700cfde72..824a560624ae6351bb405af78d532ab51307dcbf:/examples/msg/trace-categories/trace-categories.c
diff --git a/examples/msg/trace-categories/trace-categories.c b/examples/msg/trace-categories/trace-categories.c
index 22d2c47801..704ddc14ab 100644
--- a/examples/msg/trace-categories/trace-categories.c
+++ b/examples/msg/trace-categories/trace-categories.c
@@ -6,8 +6,8 @@
/** @addtogroup MSG_examples
*
- * - tracing/categories.c This is a master/slave program where the master creates tasks, send them to the slaves.
- * For each task received, the slave executes it and then destroys it. This program declares several tracing categories
+ * - tracing/categories.c This is a master/worker program. The master creates tasks and send them to workers.
+ * For each task received, the worker executes it and then destroys it. This program declares several tracing categories
* that are used to classify tasks. When the program is executed, the tracing mechanism registers the resource
* utilization of hosts and links according to these categories. You might want to run this program with the following
* parameters:
@@ -19,15 +19,12 @@
* (See \ref tracing_tracing_options for details)
*/
-#include
#include "simgrid/msg.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
-
static int master(int argc, char *argv[])
{
long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");
- long slaves_count = xbt_str_parse_int(argv[4], "Invalid amount of slaves: %s");
+ long workers_count = xbt_str_parse_int(argv[4], "Invalid amount of workers: %s");
int i;
for (i = 0; i < number_of_tasks; i++) {
@@ -47,7 +44,7 @@ static int master(int argc, char *argv[])
MSG_task_send(task, "master_mailbox");
}
- for (i = 0; i < slaves_count; i++) {
+ for (i = 0; i < workers_count; i++) {
msg_task_t finalize = MSG_task_create("finalize", 0, 1000, 0);
MSG_task_set_category(finalize, "finalize");
MSG_task_send(finalize, "master_mailbox");
@@ -56,7 +53,7 @@ static int master(int argc, char *argv[])
return 0;
}
-static int slave(int argc, char *argv[])
+static int worker(int argc, char *argv[])
{
msg_task_t task = NULL;
@@ -90,7 +87,7 @@ int main(int argc, char *argv[])
TRACE_category_with_color ("finalize", "0 0 0");//black
MSG_function_register("master", master);
- MSG_function_register("slave", slave);
+ MSG_function_register("worker", worker);
MSG_launch_application(argv[2]);
MSG_main();