X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/21027ae0247d53c68b942ebbc087657c15ef21c2..7a8cd62135619ad52e05ae1c929ef07e166e4260:/examples/msg/tracing/categories.c
diff --git a/examples/msg/tracing/categories.c b/examples/msg/tracing/categories.c
index 585f409ad9..bb6d765e1a 100644
--- a/examples/msg/tracing/categories.c
+++ b/examples/msg/tracing/categories.c
@@ -1,22 +1,36 @@
-/* $Id$ */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2010. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+/** @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 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:
+ * --cfg=tracing:1
+ * --cfg=tracing/categorized:1
+ * --cfg=tracing/uncategorized:1
+ * --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 "xbt/sysdep.h" /* calloc, printf */
/* 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[]);
-MSG_error_t test_all(const char *platform_file, const char *application_file);
/** Emitter function */
int master(int argc, char *argv[])
@@ -26,43 +40,42 @@ int master(int argc, char *argv[])
int i;
for (i = 0; i < number_of_tasks; i++) {
- m_task_t task = NULL;
+ msg_task_t task = 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");
- }else if (i%3){
- task = MSG_task_create ("task_request", 10, 10, NULL);
- TRACE_msg_set_task_category (task, "request");
- }else{
- task = MSG_task_create ("task_data", 10, 10000000, NULL);
- TRACE_msg_set_task_category (task, "data");
+ if (i % 2) {
+ task = MSG_task_create("task_compute", 10000000, 0, NULL);
+ MSG_task_set_category(task, "compute");
+ } else if (i % 3) {
+ task = MSG_task_create("task_request", 10, 10, NULL);
+ MSG_task_set_category(task, "request");
+ } else {
+ task = MSG_task_create("task_data", 10, 10000000, NULL);
+ 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);
- TRACE_msg_set_task_category(finalize, "finalize");
- MSG_task_send(finalize, "master_mailbox");
- }
-
+
+ for (i = 0; i < slaves_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");
+ }
+
return 0;
}
/** Receiver function */
int slave(int argc, char *argv[])
{
- m_task_t task = NULL;
- int res;
+ msg_task_t task = NULL;
- while(1) {
- res = MSG_task_receive(&(task), "master_mailbox");
+ while (1) {
+ MSG_task_receive(&(task), "master_mailbox");
- if (!strcmp(MSG_task_get_name(task),"finalize")) {
+ if (!strcmp(MSG_task_get_name(task), "finalize")) {
MSG_task_destroy(task);
- break;
+ break;
}
MSG_task_execute(task);
@@ -72,57 +85,29 @@ int slave(int argc, char *argv[])
return 0;
}
-/** Test function */
-MSG_error_t test_all(const char *platform_file,
- const char *application_file)
-{
- MSG_error_t res = MSG_OK;
-
- { /* Simulation setting */
- MSG_set_channel_number(0);
- MSG_create_environment(platform_file);
- }
- { /* Application deployment */
- MSG_function_register("master", master);
- MSG_function_register("slave", slave);
- MSG_launch_application(application_file);
- }
- res = MSG_main();
-
- INFO1("Simulation time %g",MSG_get_clock());
- return res;
-}
-
-
/** Main function */
int main(int argc, char *argv[])
{
- MSG_error_t res = MSG_OK;
- int i;
-
- //starting the simulation tracing
- TRACE_start ("categories.trace");
-
- //declaring user categories
- TRACE_category ("compute");
- TRACE_category ("request");
- TRACE_category ("data");
- TRACE_category ("finalize");
-
- MSG_global_init(&argc,argv);
+ MSG_init(&argc, argv);
if (argc < 3) {
- printf ("Usage: %s platform_file deployment_file\n",argv[0]);
- printf ("example: %s msg_platform.xml msg_deployment.xml\n",argv[0]);
- exit(1);
+ printf("Usage: %s platform_file deployment_file\n", argv[0]);
+ exit(1);
}
- res = test_all(argv[1],argv[2]);
- MSG_clean();
- //ending the simulation tracing
- TRACE_end();
+ char *platform_file = argv[1];
+ char *deployment_file = argv[2];
+ MSG_create_environment(platform_file);
+
+ //declaring user categories with RGB colors
+ TRACE_category_with_color ("compute", "1 0 0"); //red
+ TRACE_category_with_color ("request", "0 1 0"); //green
+ TRACE_category_with_color ("data", "0 0 1"); //blue
+ TRACE_category_with_color ("finalize", "0 0 0");//black
+
+ MSG_function_register("master", master);
+ MSG_function_register("slave", slave);
+ MSG_launch_application(deployment_file);
- if(res==MSG_OK)
- return 0;
- else
- return 1;
-} /* end_of_main */
+ MSG_main();
+ return 0;
+}