From d2644ccc43fa22eb685036f530dec9eff0c81d48 Mon Sep 17 00:00:00 2001
From: schnorr <schnorr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 21 Apr 2010 08:38:10 +0000
Subject: [PATCH] adding new test to make use of TRACE_TASK mask

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7628 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 buildtools/Cmake/src/CMakeTest.txt  |   1 +
 examples/msg/tracing/CMakeLists.txt |   2 +
 examples/msg/tracing/tasks.c        | 127 ++++++++++++++++++++++++++++
 examples/msg/tracing/tasks.tesh     |  47 ++++++++++
 4 files changed, 177 insertions(+)
 create mode 100644 examples/msg/tracing/tasks.c
 create mode 100644 examples/msg/tracing/tasks.tesh

diff --git a/buildtools/Cmake/src/CMakeTest.txt b/buildtools/Cmake/src/CMakeTest.txt
index 8bfb8f080a..25f3fb65e8 100644
--- a/buildtools/Cmake/src/CMakeTest.txt
+++ b/buildtools/Cmake/src/CMakeTest.txt
@@ -135,6 +135,7 @@ ADD_TEST(msg-masterslave_cpu_ti	${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJ
 IF(HAVE_TRACING)
   ADD_TEST(tracing-ms ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg tracing/ms.tesh)
   ADD_TEST(tracing-categories ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg tracing/categories.tesh)
+  ADD_TEST(tracing-tasks ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg tracing/tasks.tesh)
   ADD_TEST(tracing-process-migration ${PROJECT_DIRECTORY}/tools/tesh/tesh --cd ${PROJECT_DIRECTORY}/examples/msg tracing/procmig.tesh)
 ENDIF(HAVE_TRACING)
 
diff --git a/examples/msg/tracing/CMakeLists.txt b/examples/msg/tracing/CMakeLists.txt
index 23663d90cc..e3f9964cf6 100644
--- a/examples/msg/tracing/CMakeLists.txt
+++ b/examples/msg/tracing/CMakeLists.txt
@@ -5,9 +5,11 @@ set(LIBRARY_OUTPUT_PATH "${PROJECT_DIRECTORY}/lib")
 
 add_executable(ms ${PROJECT_DIRECTORY}/examples/msg/tracing/ms.c)
 add_executable(categories ${PROJECT_DIRECTORY}/examples/msg/tracing/categories.c)
+add_executable(tasks ${PROJECT_DIRECTORY}/examples/msg/tracing/tasks.c)
 add_executable(procmig ${PROJECT_DIRECTORY}/examples/msg/tracing/procmig.c)
 
 ### Add definitions for compile
 target_link_libraries(ms simgrid m -fprofile-arcs)
 target_link_libraries(categories simgrid m -fprofile-arcs)
+target_link_libraries(tasks simgrid m -fprofile-arcs)
 target_link_libraries(procmig simgrid m -fprofile-arcs)
diff --git a/examples/msg/tracing/tasks.c b/examples/msg/tracing/tasks.c
new file mode 100644
index 0000000000..0131208601
--- /dev/null
+++ b/examples/msg/tracing/tasks.c
@@ -0,0 +1,127 @@
+/* 	$Id$	 */
+
+/* Copyright (c) 2002,2003,2004 Arnaud Legrand. 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. */
+
+#include <stdio.h>
+#include "msg/msg.h"
+#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");
+
+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[])
+{
+  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]);
+  INFO4 ("master %ld %f %f %ld", number_of_tasks, task_comp_size, task_comm_size, slaves_count);
+
+  int i;
+  for (i = 0; i < number_of_tasks; i++) {
+    m_task_t task=NULL;
+    task = MSG_task_create("task", task_comp_size, task_comm_size, NULL);
+
+    //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_send(task, "master_mailbox");
+  }
+  
+   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_send(finalize, "master_mailbox");
+   } 
+  
+  return 0;
+}
+
+/** Receiver function  */
+int slave(int argc, char *argv[])
+{
+  m_task_t task = NULL;
+  int res;
+
+  while(1) {
+    res = MSG_task_receive(&(task), "master_mailbox");
+    if (res != MSG_OK){
+      INFO0("error");
+      break;
+    }
+
+    if (!strcmp(MSG_task_get_name(task),"finalize")) {
+      MSG_task_destroy(task);
+    	break;
+    }
+
+    INFO1("Executing task %f", MSG_task_get_compute_duration(task));
+    MSG_task_execute(task);
+    INFO0("End of execution");
+    MSG_task_destroy(task);
+    task = NULL;
+  }
+  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;
+
+  //starting the simulation tracing
+  TRACE_start_with_mask ("tasks.trace", TRACE_TASK);
+
+  //declaring user categories
+  TRACE_category ("compute");
+  TRACE_category ("finalize");
+
+  MSG_global_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);
+  }
+  res = test_all(argv[1],argv[2]);
+  MSG_clean();
+
+  //ending the simulation tracing
+  TRACE_end();
+
+  if(res==MSG_OK)
+    return 0;
+  else
+    return 1;
+} /* end_of_main */
diff --git a/examples/msg/tracing/tasks.tesh b/examples/msg/tracing/tasks.tesh
new file mode 100644
index 0000000000..57eb47ce80
--- /dev/null
+++ b/examples/msg/tracing/tasks.tesh
@@ -0,0 +1,47 @@
+#! ./tesh
+
+p Tracing tasks
+
+$ $SG_TEST_EXENV tracing/tasks$EXEEXT ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml
+> [Tremblay:master:(1) 0.000000] [msg_test/INFO] master 20 50000000.000000 1000000.000000 5
+> [Tremblay:slave:(2) 0.002339] [msg_test/INFO] Executing task 50000000.000000
+> [Jupiter:slave:(3) 0.168300] [msg_test/INFO] Executing task 50000000.000000
+> [Fafard:slave:(4) 0.386454] [msg_test/INFO] Executing task 50000000.000000
+> [Tremblay:slave:(2) 0.512049] [msg_test/INFO] End of execution
+> [Ginette:slave:(5) 0.526913] [msg_test/INFO] Executing task 50000000.000000
+> [Bourassa:slave:(6) 0.742786] [msg_test/INFO] Executing task 50000000.000000
+> [Tremblay:slave:(2) 0.745124] [msg_test/INFO] Executing task 50000000.000000
+> [Jupiter:slave:(3) 0.823643] [msg_test/INFO] End of execution
+> [Jupiter:slave:(3) 0.989605] [msg_test/INFO] Executing task 50000000.000000
+> [Fafard:slave:(4) 1.041796] [msg_test/INFO] End of execution
+> [Tremblay:slave:(2) 1.254834] [msg_test/INFO] End of execution
+> [Fafard:slave:(4) 1.259949] [msg_test/INFO] Executing task 50000000.000000
+> [Tremblay:slave:(2) 1.262288] [msg_test/INFO] Executing task 50000000.000000
+> [Ginette:slave:(5) 1.558011] [msg_test/INFO] End of execution
+> [Jupiter:slave:(3) 1.644947] [msg_test/INFO] End of execution
+> [Ginette:slave:(5) 1.698471] [msg_test/INFO] Executing task 50000000.000000
+> [Tremblay:slave:(2) 1.771998] [msg_test/INFO] End of execution
+> [Bourassa:slave:(6) 1.773883] [msg_test/INFO] End of execution
+> [Jupiter:slave:(3) 1.864433] [msg_test/INFO] Executing task 50000000.000000
+> [Tremblay:slave:(2) 1.866771] [msg_test/INFO] Executing task 50000000.000000
+> [Fafard:slave:(4) 1.915291] [msg_test/INFO] End of execution
+> [Bourassa:slave:(6) 2.082643] [msg_test/INFO] Executing task 50000000.000000
+> [Fafard:slave:(4) 2.300797] [msg_test/INFO] Executing task 50000000.000000
+> [Tremblay:slave:(2) 2.376481] [msg_test/INFO] End of execution
+> [Tremblay:slave:(2) 2.378820] [msg_test/INFO] Executing task 50000000.000000
+> [Jupiter:slave:(3) 2.519775] [msg_test/INFO] End of execution
+> [Jupiter:slave:(3) 2.685737] [msg_test/INFO] Executing task 50000000.000000
+> [Ginette:slave:(5) 2.729569] [msg_test/INFO] End of execution
+> [Ginette:slave:(5) 2.870028] [msg_test/INFO] Executing task 50000000.000000
+> [Tremblay:slave:(2) 2.888530] [msg_test/INFO] End of execution
+> [Tremblay:slave:(2) 2.890868] [msg_test/INFO] Executing task 50000000.000000
+> [Fafard:slave:(4) 2.956139] [msg_test/INFO] End of execution
+> [Bourassa:slave:(6) 3.113741] [msg_test/INFO] End of execution
+> [Fafard:slave:(4) 3.174292] [msg_test/INFO] Executing task 50000000.000000
+> [Jupiter:slave:(3) 3.341079] [msg_test/INFO] End of execution
+> [Bourassa:slave:(6) 3.390164] [msg_test/INFO] Executing task 50000000.000000
+> [Tremblay:slave:(2) 3.400578] [msg_test/INFO] End of execution
+> [Fafard:slave:(4) 3.829634] [msg_test/INFO] End of execution
+> [Ginette:slave:(5) 3.901126] [msg_test/INFO] End of execution
+> [Bourassa:slave:(6) 4.421262] [msg_test/INFO] End of execution
+> [4.441598] [msg_test/INFO] Simulation time 4.4416
-- 
2.20.1