X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/da1a88299f91798046c12cd7568b87f55e4fab94..ba7ceb6bb4bbcfed5106581edeab7fea90c8e26c:/examples/msg/tracing/ms.c
diff --git a/examples/msg/tracing/ms.c b/examples/msg/tracing/ms.c
index d15b876436..eb9deaf1b2 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-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@ -6,39 +6,27 @@
/** @addtogroup MSG_examples
*
- * - tracing/ms.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 uses several tracing functions that
- * 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
+ * - tracing/ms.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 uses several tracing functions that
+ * 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:yes
+ * --cfg=tracing/uncategorized:yes
+ * --cfg=viva/categorized:viva_cat.plist
+ * --cfg=viva/uncategorized:viva_uncat.plist
* (See \ref tracing_tracing_options for details)
*/
-#include
-#include "msg/msg.h"
-#include "xbt/sysdep.h" /* calloc, printf */
+#include "simgrid/msg.h"
-/* Create a log channel to have nice outputs. */
-#include "xbt/log.h"
-#include "xbt/asserts.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
- "Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
-int master(int argc, char *argv[]);
-int slave(int argc, char *argv[]);
-
-/** Emitter function */
-int master(int argc, char *argv[])
+static int master(int argc, char *argv[])
{
- long number_of_tasks = atol(argv[1]);
- double task_comp_size = atof(argv[2]);
- double task_comm_size = atof(argv[3]);
- long slaves_count = atol(argv[4]);
+ long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");
+ double task_comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s");
+ double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s");
+ long slaves_count = xbt_str_parse_int(argv[4], "Invalid amount of slaves: %s");
//setting the variable "is_master" (previously declared) to value 1
TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()), "is_master", 1);
@@ -46,7 +34,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 +48,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");
}
@@ -68,15 +56,12 @@ int master(int argc, char *argv[])
return 0;
}
-/** Receiver function */
-int slave(int argc, char *argv[])
+static 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()),
- "task_computation",
- 0);
+ TRACE_host_variable_set(MSG_host_get_name(MSG_host_self()), "task_computation", 0);
while (1) {
MSG_task_receive(&(task), "master_mailbox");
@@ -86,9 +71,7 @@ int slave(int argc, char *argv[])
}
//adding the value returned by MSG_task_get_compute_duration(task)
//to the variable "task_computation"
- TRACE_host_variable_add(MSG_host_get_name(MSG_host_self()),
- "task_computation",
- MSG_task_get_compute_duration(task));
+ TRACE_host_variable_add(MSG_host_get_name(MSG_host_self()), "task_computation", MSG_task_get_flops_amount(task));
MSG_task_execute(task);
MSG_task_destroy(task);
task = NULL;
@@ -96,18 +79,15 @@ int slave(int argc, char *argv[])
return 0;
}
-/** 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);
}
- char *platform_file = argv[1];
- char *deployment_file = argv[2];
- MSG_create_environment(platform_file);
+ MSG_create_environment(argv[1]);
//declaring user variables
TRACE_host_variable_declare("is_slave");
@@ -123,14 +103,13 @@ int main(int argc, char *argv[])
//declaring user categories with RGB colors (values from 0 to 1)
TRACE_category_with_color ("compute", "1 0 0"); //compute is red
TRACE_category_with_color ("finalize", "0 1 0"); //finalize is green
- //categories without user-defined colors receive
- //random colors generated by the tracing system
+ //categories without user-defined colors receive random colors generated by the tracing system
TRACE_category ("request");
TRACE_category_with_color ("report", NULL);
MSG_function_register("master", master);
MSG_function_register("slave", slave);
- MSG_launch_application(deployment_file);
+ MSG_launch_application(argv[2]);
MSG_main();
@@ -155,6 +134,5 @@ int main(int argc, char *argv[])
xbt_dynar_free (&marks);
}
- MSG_clean();
return 0;
-} /* end_of_main */
+}