X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/693f30b46244c152cd79cdf3ad35d4a79b866c9c..49e85177c669d793e84242983a1b1f430e47184e:/examples/msg/tracing/ms.c diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c index 6d82eb4f69..aed734ede0 100644 --- a/examples/msg/tracing/ms.c +++ b/examples/msg/tracing/ms.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010. The SimGrid Team. +/* Copyright (c) 2010-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -12,10 +12,10 @@ * enable the tracing of categorized resource utilization, the use of trace marks, * and user variables associated to the hosts of the platform file. * You might want to run this program with the following parameters: - * --cfg=tracing/categorized:1 - * --cfg=tracing/uncategorized:1 - * --cfg=triva/categorized:triva_cat.plist - * --cfg=triva/uncategorized:triva_uncat.plist + * --cfg=tracing/categorized:yes + * --cfg=tracing/uncategorized:yes + * --cfg=viva/categorized:viva_cat.plist + * --cfg=viva/uncategorized:viva_uncat.plist * (See \ref tracing_tracing_options for details) */ @@ -46,7 +46,7 @@ int master(int argc, char *argv[]) TRACE_mark("msmark", "start_send_tasks"); int i; for (i = 0; i < number_of_tasks; i++) { - m_task_t task = NULL; + msg_task_t task = NULL; task = MSG_task_create("task", task_comp_size, task_comm_size, NULL); //setting the variable "task_creation" to value i @@ -60,7 +60,7 @@ int master(int argc, char *argv[]) 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_t finalize = MSG_task_create("finalize", 0, 0, 0); MSG_task_set_category(finalize, "finalize"); MSG_task_send(finalize, "master_mailbox"); } @@ -71,7 +71,7 @@ int master(int argc, char *argv[]) /** Receiver function */ int slave(int argc, char *argv[]) { - m_task_t task = NULL; + msg_task_t task = NULL; TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()), "is_slave", 1); TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()), @@ -155,6 +155,5 @@ int main(int argc, char *argv[]) xbt_dynar_free (&marks); } - MSG_clean(); return 0; } /* end_of_main */