[trace] removing the tracing per task (where each task was a container)

the --cfg=tracing/msg/task:1 parameter is no longer supported

reason:
- not used

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 042f93e..54df0d1 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -391,7 +391,6 @@ IF(HAVE_TRACING)
   ADD_TEST(tracing-help             ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test --help-tracing)
   ADD_TEST(tracing-ms                          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/ms.tesh)
   ADD_TEST(tracing-categories          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/categories.tesh)
-  ADD_TEST(tracing-tasks                       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/tasks.tesh)
   ADD_TEST(tracing-process-migration ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/procmig.tesh)
   ADD_TEST(graphicator ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY} --setenv bindir=${CMAKE_BINARY_DIR}/bin --cd ${CMAKE_HOME_DIRECTORY}/tools/graphicator graphicator.tesh)
 ENDIF(HAVE_TRACING)

diff --git a/buildtools/Cmake/AddTestsWin.cmake b/buildtools/Cmake/AddTestsWin.cmake
index 9174abb..b1d557f 100644 (file)
--- a/buildtools/Cmake/AddTestsWin.cmake
+++ b/buildtools/Cmake/AddTestsWin.cmake
@@ -78,7 +78,6 @@ ADD_TEST(msg-icomms-waitany ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/peer3 ${
 IF(HAVE_TRACING)\r
   ADD_TEST(tracing-ms perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/ms.tesh)\r
   ADD_TEST(tracing-categories perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/categories.tesh)\r
-  ADD_TEST(tracing-tasks perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/tasks.tesh)\r
   ADD_TEST(tracing-process-migration perl ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_HOME_DIRECTORY}/examples/msg tracing/procmig.tesh)\r
 ENDIF(HAVE_TRACING)\r
 \r

diff --git a/doc/tracing.doc b/doc/tracing.doc
index c67ff51..2c590ee 100644 (file)
--- a/doc/tracing.doc
+++ b/doc/tracing.doc
@@ -203,15 +203,6 @@ tracing/smpi/group
 --cfg=tracing/smpi/group:1
 \endverbatim
 
-\li <b>\c 
-tracing/msg/task
-</b>:
-  This option only has effect if this simulator is MSG-based. It traces the
-  behavior of all categorized MSG tasks, grouping them by hosts.
-\verbatim
---cfg=tracing/msg/task:1
-\endverbatim
-
 \li <b>\c 
 tracing/msg/process
 </b>:
@@ -579,4 +570,4 @@ visualization was generated with the following configuration:
 trace files. See the tracing API to how to define them for your
 simulator.
 
-*/
\ No newline at end of file
+*/

diff --git a/examples/msg/tracing/CMakeLists.txt b/examples/msg/tracing/CMakeLists.txt
index 6ad0665..2920a74 100644 (file)
--- a/examples/msg/tracing/CMakeLists.txt
+++ b/examples/msg/tracing/CMakeLists.txt
@@ -5,13 +5,11 @@ set(LIBRARY_OUTPUT_PATH "${CMAKE_HOME_DIRECTORY}/lib")
 
 add_executable(ms         ${CMAKE_CURRENT_SOURCE_DIR}/ms.c)
 add_executable(categories ${CMAKE_CURRENT_SOURCE_DIR}/categories.c)
-add_executable(tasks      ${CMAKE_CURRENT_SOURCE_DIR}/tasks.c)
 add_executable(procmig    ${CMAKE_CURRENT_SOURCE_DIR}/procmig.c)
 
 ### Add definitions for compile
 target_link_libraries(ms simgrid m )
 target_link_libraries(categories simgrid m )
-target_link_libraries(tasks simgrid m )
 target_link_libraries(procmig simgrid m )
 
 ## Clean generated files

diff --git a/examples/msg/tracing/tasks.c b/examples/msg/tracing/tasks.c
deleted file mode 100644 (file)
index 16ef444..0000000
--- a/examples/msg/tracing/tasks.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* 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");
-
-/** 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]);
-  XBT_INFO("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++) {
-    char task_name[100];
-    snprintf (task_name, 100, "task-%d", i);
-    m_task_t task = NULL;
-    task = MSG_task_create(task_name, 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++) {
-    char task_name[100];
-    snprintf (task_name, 100, "task-%d", i);
-    m_task_t finalize = MSG_task_create(task_name, 0, 0, xbt_strdup("finalize"));
-    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;
-  MSG_error_t res;
-
-  while (1) {
-    MSG_task_receive(&(task), "master_mailbox");
-
-    char *data = MSG_task_get_data(task);
-    if (data && !strcmp(data, "finalize")) {
-      free(data);
-      MSG_task_destroy(task);
-      break;
-    }
-
-    XBT_INFO("Executing task %f", MSG_task_get_compute_duration(task));
-    MSG_task_execute(task);
-    XBT_INFO("End of execution");
-    MSG_task_destroy(task);
-    task = NULL;
-  }
-  return 0;
-}
-
-/** Main function */
-int main(int argc, char *argv[])
-{
-  MSG_global_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);
-
-  TRACE_category_with_color ("compute", "1 0 0");  //compute is red
-  TRACE_category_with_color ("finalize", "0 1 0"); //finalize is green
-
-  MSG_function_register("master", master);
-  MSG_function_register("slave", slave);
-  MSG_launch_application(deployment_file);
-
-  MSG_main();
-  MSG_clean();
-  return 0;
-}

diff --git a/examples/msg/tracing/tasks.tesh b/examples/msg/tracing/tasks.tesh
deleted file mode 100644 (file)
index 252c950..0000000
--- a/examples/msg/tracing/tasks.tesh
+++ /dev/null
@@ -1,773 +0,0 @@
-#! ./tesh
-
-p Tracing tasks
-
-$ $SG_TEST_EXENV ${bindir:=.}/tracing/tasks$EXEEXT --cfg=tracing:1 --cfg=tracing/categorized:1 --cfg=tracing/buffer:1 --cfg=tracing/msg/task:1 --cfg=tracing/filename:tracing/tasks.trace ${srcdir:=.}/tracing/platform.xml ${srcdir:=.}/tracing/deployment.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to '1'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to '1'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to '1'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/task' to '1'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'tracing/tasks.trace'
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] master 20 50000000.000000 1000000.000000 5
-> [Tremblay:slave:(2) 0.002164] [msg_test/INFO] Executing task 50000000.000000
-> [Jupiter:slave:(3) 0.168126] [msg_test/INFO] Executing task 50000000.000000
-> [Fafard:slave:(4) 0.386279] [msg_test/INFO] Executing task 50000000.000000
-> [Tremblay:slave:(2) 0.511874] [msg_test/INFO] End of execution
-> [Ginette:slave:(5) 0.526739] [msg_test/INFO] Executing task 50000000.000000
-> [Bourassa:slave:(6) 0.742611] [msg_test/INFO] Executing task 50000000.000000
-> [Tremblay:slave:(2) 0.744775] [msg_test/INFO] Executing task 50000000.000000
-> [Jupiter:slave:(3) 0.823468] [msg_test/INFO] End of execution
-> [Jupiter:slave:(3) 0.989430] [msg_test/INFO] Executing task 50000000.000000
-> [Fafard:slave:(4) 1.041621] [msg_test/INFO] End of execution
-> [Tremblay:slave:(2) 1.254485] [msg_test/INFO] End of execution
-> [Fafard:slave:(4) 1.259775] [msg_test/INFO] Executing task 50000000.000000
-> [Tremblay:slave:(2) 1.261939] [msg_test/INFO] Executing task 50000000.000000
-> [Ginette:slave:(5) 1.557837] [msg_test/INFO] End of execution
-> [Jupiter:slave:(3) 1.644772] [msg_test/INFO] End of execution
-> [Ginette:slave:(5) 1.698296] [msg_test/INFO] Executing task 50000000.000000
-> [Tremblay:slave:(2) 1.771649] [msg_test/INFO] End of execution
-> [Bourassa:slave:(6) 1.773709] [msg_test/INFO] End of execution
-> [Jupiter:slave:(3) 1.864258] [msg_test/INFO] Executing task 50000000.000000
-> [Tremblay:slave:(2) 1.866422] [msg_test/INFO] Executing task 50000000.000000
-> [Fafard:slave:(4) 1.915117] [msg_test/INFO] End of execution
-> [Bourassa:slave:(6) 2.082294] [msg_test/INFO] Executing task 50000000.000000
-> [Fafard:slave:(4) 2.300447] [msg_test/INFO] Executing task 50000000.000000
-> [Tremblay:slave:(2) 2.376132] [msg_test/INFO] End of execution
-> [Tremblay:slave:(2) 2.378296] [msg_test/INFO] Executing task 50000000.000000
-> [Jupiter:slave:(3) 2.519600] [msg_test/INFO] End of execution
-> [Jupiter:slave:(3) 2.685562] [msg_test/INFO] Executing task 50000000.000000
-> [Ginette:slave:(5) 2.729394] [msg_test/INFO] End of execution
-> [Ginette:slave:(5) 2.869854] [msg_test/INFO] Executing task 50000000.000000
-> [Tremblay:slave:(2) 2.888006] [msg_test/INFO] End of execution
-> [Tremblay:slave:(2) 2.890170] [msg_test/INFO] Executing task 50000000.000000
-> [Fafard:slave:(4) 2.955790] [msg_test/INFO] End of execution
-> [Bourassa:slave:(6) 3.113392] [msg_test/INFO] End of execution
-> [Fafard:slave:(4) 3.173943] [msg_test/INFO] Executing task 50000000.000000
-> [Jupiter:slave:(3) 3.340904] [msg_test/INFO] End of execution
-> [Bourassa:slave:(6) 3.389815] [msg_test/INFO] Executing task 50000000.000000
-> [Tremblay:slave:(2) 3.399880] [msg_test/INFO] End of execution
-> [Fafard:slave:(4) 3.829285] [msg_test/INFO] End of execution
-> [Ginette:slave:(5) 3.900952] [msg_test/INFO] End of execution
-> [Bourassa:slave:(6) 4.420913] [msg_test/INFO] End of execution
-> [4.441249] [msg_test/INFO] Simulation time 4.44125
-
-$ cat tracing/tasks.trace
-> %EventDef PajeDefineContainerType 0 
-> %       Alias string 
-> %       ContainerType string 
-> %       Name string 
-> %EndEventDef 
-> %EventDef PajeDefineVariableType 1 
-> %       Alias string 
-> %       ContainerType string 
-> %       Name string 
-> %       Color color 
-> %EndEventDef 
-> %EventDef PajeDefineStateType 2 
-> %       Alias string 
-> %       ContainerType string 
-> %       Name string 
-> %EndEventDef 
-> %EventDef PajeDefineEventType 3 
-> %       Alias string 
-> %       ContainerType string 
-> %       Name string 
-> %       Color color 
-> %EndEventDef 
-> %EventDef PajeDefineLinkType 4 
-> %       Alias string 
-> %       ContainerType string 
-> %       SourceContainerType string 
-> %       DestContainerType string 
-> %       Name string 
-> %EndEventDef 
-> %EventDef PajeDefineEntityValue 5 
-> %       Alias string 
-> %       EntityType string 
-> %       Name string 
-> %       Color color 
-> %EndEventDef 
-> %EventDef PajeCreateContainer 6 
-> %       Time date 
-> %       Alias string 
-> %       Type string 
-> %       Container string 
-> %       Name string 
-> %EndEventDef 
-> %EventDef PajeDestroyContainer 7 
-> %       Time date 
-> %       Type string 
-> %       Name string 
-> %EndEventDef 
-> %EventDef PajeSetVariable 8 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value double 
-> %EndEventDef
-> %EventDef PajeAddVariable 9 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value double 
-> %EndEventDef
-> %EventDef PajeSubVariable 10 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value double 
-> %EndEventDef
-> %EventDef PajeSetState 11 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value string 
-> %EndEventDef
-> %EventDef PajePushState 12 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value string 
-> %EndEventDef
-> %EventDef PajePopState 13 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %EndEventDef
-> %EventDef PajeStartLink 14 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value string 
-> %       SourceContainer string 
-> %       Key string 
-> %EndEventDef
-> %EventDef PajeEndLink 15 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value string 
-> %       DestContainer string 
-> %       Key string 
-> %EndEventDef
-> %EventDef PajeNewEvent 16 
-> %       Time date 
-> %       Type string 
-> %       Container string 
-> %       Value string 
-> %EndEventDef
-> 0 1 0 HOST
-> 6 0 1 1 0 "Tremblay"
-> 1 2 1 power "1 1 1"
-> 0 3 1 MSG_TASK
-> 2 4 3 MSG_TASK_STATE
-> 5 5 4 MSG_task_execute "0 1 0"
-> 5 6 4 created "1 1 0"
-> 4 7 0 3 3 MSG_TASK_LINK
-> 6 0 2 1 0 "Jupiter"
-> 6 0 3 1 0 "Fafard"
-> 6 0 4 1 0 "Ginette"
-> 6 0 5 1 0 "Bourassa"
-> 0 8 0 LINK
-> 6 0 6 8 0 "6"
-> 1 9 8 bandwidth "1 1 1"
-> 1 10 8 latency "1 1 1"
-> 6 0 7 8 0 "3"
-> 6 0 8 8 0 "7"
-> 6 0 9 8 0 "9"
-> 6 0 10 8 0 "2"
-> 6 0 11 8 0 "8"
-> 6 0 12 8 0 "1"
-> 6 0 13 8 0 "4"
-> 6 0 14 8 0 "0"
-> 6 0 15 8 0 "5"
-> 4 11 0 1 8 HOST-LINK
-> 4 12 0 8 8 LINK-LINK
-> 4 13 0 8 1 LINK-HOST
-> 8 0 2 1 98095000.000000
-> 8 0 2 2 76296000.000000
-> 8 0 2 3 76296000.000000
-> 8 0 2 4 48492000.000000
-> 8 0 2 5 48492000.000000
-> 8 0 9 6 41279125.000000
-> 8 0 10 6 0.000060
-> 8 0 9 7 34285625.000000
-> 8 0 10 7 0.000514
-> 8 0 9 8 11618875.000000
-> 8 0 10 8 0.000190
-> 8 0 9 9 7209750.000000
-> 8 0 10 9 0.001462
-> 8 0 9 10 118682500.000000
-> 8 0 10 10 0.000137
-> 8 0 9 11 8158000.000000
-> 8 0 10 11 0.000271
-> 8 0 9 12 34285625.000000
-> 8 0 10 12 0.000514
-> 8 0 9 13 10099625.000000
-> 8 0 10 13 0.000480
-> 8 0 9 14 41279125.000000
-> 8 0 10 14 0.000060
-> 8 0 9 15 27946250.000000
-> 8 0 10 15 0.000278
-> 14 0 11 0 G 3 0
-> 15 0 11 0 G 11 0
-> 14 0 12 0 G 11 1
-> 15 0 12 0 G 12 1
-> 14 0 12 0 G 12 2
-> 15 0 12 0 G 14 2
-> 14 0 12 0 G 14 3
-> 15 0 12 0 G 10 3
-> 14 0 12 0 G 10 4
-> 15 0 12 0 G 7 4
-> 14 0 12 0 G 7 5
-> 15 0 12 0 G 13 5
-> 14 0 13 0 G 13 6
-> 15 0 13 0 G 1 6
-> 14 0 12 0 G 11 7
-> 15 0 12 0 G 6 7
-> 14 0 12 0 G 6 8
-> 15 0 12 0 G 8 8
-> 14 0 13 0 G 8 9
-> 15 0 13 0 G 5 9
-> 14 0 12 0 G 13 10
-> 15 0 12 0 G 9 10
-> 14 0 13 0 G 9 11
-> 15 0 13 0 G 2 11
-> 14 0 12 0 G 10 12
-> 15 0 12 0 G 15 12
-> 14 0 13 0 G 15 13
-> 15 0 13 0 G 4 13
-> 14 0 12 0 G 12 14
-> 15 0 12 0 G 6 14
-> 14 0 11 0 G 1 15
-> 15 0 11 0 G 9 15
-> 14 0 12 0 G 7 16
-> 15 0 12 0 G 15 16
-> 1 14 8 bcompute "1 0 0"
-> 1 15 1 pcompute "1 0 0"
-> 1 16 8 bfinalize "0 1 0"
-> 1 17 1 pfinalize "0 1 0"
-> 6 0 16 3 1 "task-0"
-> 1 18 3 compute "1 1 1"
-> 8 0 18 16 1.000000
-> 12 0 4 16 6
-> 13 0 4 16
-> 14 0 7 0 SR 16 0
-> 7 0 3 16
-> 6 0.002164 17 3 1 "task-0"
-> 6 0.002164 18 3 1 "task-1"
-> 8 0.002164 18 17 1.000000
-> 12 0.002164 4 17 6
-> 15 0.002164 7 0 SR 17 0
-> 12 0.002164 4 17 5
-> 8 0.002164 18 18 1.000000
-> 12 0.002164 4 18 6
-> 13 0.002164 4 18
-> 14 0.002164 7 0 SR 18 1
-> 7 0.002164 3 18
-> 6 0.168126 19 3 2 "task-1"
-> 6 0.168126 20 3 1 "task-2"
-> 8 0.017364 14 9 0.000000
-> 9 0.017364 14 9 6632970.000000
-> 10 0.168126 14 9 6632970.000000
-> 8 0.168126 18 19 1.000000
-> 12 0.168126 4 19 6
-> 15 0.168126 7 0 SR 19 1
-> 12 0.168126 4 19 5
-> 8 0.168126 18 20 1.000000
-> 12 0.168126 4 20 6
-> 13 0.168126 4 20
-> 14 0.168126 7 0 SR 20 2
-> 7 0.168126 3 20
-> 8 0.002164 15 1 0.000000
-> 9 0.002164 15 1 98095000.000000
-> 10 0.168126 15 1 98095000.000000
-> 6 0.386279 21 3 3 "task-2"
-> 6 0.386279 22 3 1 "task-3"
-> 8 0.188676 14 13 0.000000
-> 9 0.188676 14 13 5060664.718311
-> 8 0.188676 14 7 0.000000
-> 9 0.188676 14 7 5060664.718311
-> 8 0.188676 14 10 0.000000
-> 9 0.188676 14 10 5060664.718311
-> 8 0.188676 14 14 0.000000
-> 9 0.188676 14 14 5060664.718311
-> 8 0.188676 14 12 0.000000
-> 9 0.188676 14 12 5060664.718311
-> 8 0.188676 14 11 0.000000
-> 9 0.188676 14 11 5060664.718311
-> 10 0.386279 14 13 5060664.718311
-> 10 0.386279 14 7 5060664.718311
-> 10 0.386279 14 10 5060664.718311
-> 10 0.386279 14 14 5060664.718311
-> 10 0.386279 14 12 5060664.718311
-> 10 0.386279 14 11 5060664.718311
-> 8 0.386279 18 21 1.000000
-> 12 0.386279 4 21 6
-> 15 0.386279 7 0 SR 21 2
-> 12 0.386279 4 21 5
-> 8 0.386279 18 22 1.000000
-> 12 0.386279 4 22 6
-> 13 0.386279 4 22
-> 14 0.386279 7 0 SR 22 3
-> 7 0.386279 3 22
-> 9 0.168126 15 1 98095000.000000
-> 10 0.386279 15 1 98095000.000000
-> 9 0.386279 15 1 98095000.000000
-> 9 0.399511 14 13 7859911.230163
-> 9 0.399511 14 7 7859911.230163
-> 8 0.399511 14 15 0.000000
-> 9 0.399511 14 15 7859911.230163
-> 10 0.511874 15 1 98095000.000000
-> 10 0.511874 14 13 7859911.230163
-> 10 0.511874 14 7 7859911.230163
-> 10 0.511874 14 15 7859911.230163
-> 13 0.511874 4 17
-> 7 0.511874 3 17
-> 9 0.511874 14 13 7859911.230163
-> 9 0.511874 14 7 7859911.230163
-> 9 0.511874 14 15 7859911.230163
-> 6 0.526739 23 3 4 "task-3"
-> 6 0.526739 24 3 1 "task-4"
-> 10 0.526739 14 13 7859911.230163
-> 10 0.526739 14 7 7859911.230163
-> 10 0.526739 14 15 7859911.230163
-> 8 0.526739 18 23 1.000000
-> 12 0.526739 4 23 6
-> 15 0.526739 7 0 SR 23 3
-> 12 0.526739 4 23 5
-> 8 0.526739 18 24 1.000000
-> 12 0.526739 4 24 6
-> 13 0.526739 4 24
-> 14 0.526739 7 0 SR 24 4
-> 7 0.526739 3 24
-> 6 0.742611 25 3 5 "task-4"
-> 6 0.742611 26 3 1 "task-5"
-> 9 0.547074 14 13 5114134.701194
-> 9 0.547074 14 7 5114134.701194
-> 9 0.547074 14 10 5114134.701194
-> 9 0.547074 14 14 5114134.701194
-> 9 0.547074 14 12 5114134.701194
-> 8 0.547074 14 6 0.000000
-> 9 0.547074 14 6 5114134.701194
-> 8 0.547074 14 8 0.000000
-> 9 0.547074 14 8 5114134.701194
-> 10 0.742611 14 13 5114134.701194
-> 10 0.742611 14 7 5114134.701194
-> 10 0.742611 14 10 5114134.701194
-> 10 0.742611 14 14 5114134.701194
-> 10 0.742611 14 12 5114134.701194
-> 10 0.742611 14 6 5114134.701194
-> 10 0.742611 14 8 5114134.701194
-> 8 0.742611 18 25 1.000000
-> 12 0.742611 4 25 6
-> 15 0.742611 7 0 SR 25 4
-> 12 0.742611 4 25 5
-> 8 0.742611 18 26 1.000000
-> 12 0.742611 4 26 6
-> 13 0.742611 4 26
-> 14 0.742611 7 0 SR 26 5
-> 7 0.742611 3 26
-> 6 0.744775 27 3 1 "task-5"
-> 6 0.744775 28 3 1 "task-6"
-> 8 0.744775 18 27 1.000000
-> 12 0.744775 4 27 6
-> 15 0.744775 7 0 SR 27 5
-> 12 0.744775 4 27 5
-> 8 0.744775 18 28 1.000000
-> 12 0.744775 4 28 6
-> 13 0.744775 4 28
-> 14 0.744775 7 0 SR 28 6
-> 7 0.744775 3 28
-> 8 0.168126 15 2 0.000000
-> 9 0.168126 15 2 76296000.000000
-> 10 0.823468 15 2 76296000.000000
-> 13 0.823468 4 19
-> 7 0.823468 3 19
-> 6 0.989430 29 3 1 "task-7"
-> 8 0.989430 18 29 1.000000
-> 12 0.989430 4 29 6
-> 13 0.989430 4 29
-> 14 0.989430 7 0 SR 29 7
-> 7 0.989430 3 29
-> 6 0.989430 30 3 2 "task-6"
-> 8 0.386279 15 3 0.000000
-> 9 0.386279 15 3 76296000.000000
-> 9 0.744775 15 1 98095000.000000
-> 8 0.989430 18 30 1.000000
-> 12 0.989430 4 30 6
-> 15 0.989430 7 0 SR 30 6
-> 12 0.989430 4 30 5
-> 10 0.989430 15 1 98095000.000000
-> 10 1.041621 15 3 76296000.000000
-> 13 1.041621 4 21
-> 7 1.041621 3 21
-> 9 0.989430 15 1 98095000.000000
-> 10 1.254485 15 1 98095000.000000
-> 13 1.254485 4 27
-> 7 1.254485 3 27
-> 6 1.259775 31 3 1 "task-8"
-> 8 1.259775 18 31 1.000000
-> 12 1.259775 4 31 6
-> 13 1.259775 4 31
-> 14 1.259775 7 0 SR 31 8
-> 7 1.259775 3 31
-> 6 1.259775 32 3 3 "task-7"
-> 6 1.261939 33 3 1 "task-8"
-> 6 1.261939 34 3 1 "task-9"
-> 8 1.259775 18 32 1.000000
-> 12 1.259775 4 32 6
-> 15 1.259775 7 0 SR 32 7
-> 12 1.259775 4 32 5
-> 8 1.261939 18 33 1.000000
-> 12 1.261939 4 33 6
-> 15 1.261939 7 0 SR 33 8
-> 12 1.261939 4 33 5
-> 8 1.261939 18 34 1.000000
-> 12 1.261939 4 34 6
-> 13 1.261939 4 34
-> 14 1.261939 7 0 SR 34 9
-> 7 1.261939 3 34
-> 8 0.526739 15 4 0.000000
-> 9 0.526739 15 4 48492000.000000
-> 10 1.557837 15 4 48492000.000000
-> 13 1.557837 4 23
-> 7 1.557837 3 23
-> 9 0.989430 15 2 76296000.000000
-> 10 1.644772 15 2 76296000.000000
-> 13 1.644772 4 30
-> 7 1.644772 3 30
-> 6 1.698296 35 3 1 "task-10"
-> 8 1.698296 18 35 1.000000
-> 12 1.698296 4 35 6
-> 13 1.698296 4 35
-> 14 1.698296 7 0 SR 35 10
-> 7 1.698296 3 35
-> 6 1.698296 36 3 4 "task-9"
-> 9 1.261939 15 1 98095000.000000
-> 8 1.698296 18 36 1.000000
-> 12 1.698296 4 36 6
-> 15 1.698296 7 0 SR 36 9
-> 12 1.698296 4 36 5
-> 10 1.698296 15 1 98095000.000000
-> 9 1.698296 15 1 98095000.000000
-> 9 1.713496 14 9 6632970.000000
-> 10 1.771649 15 1 98095000.000000
-> 10 1.771649 14 9 6632970.000000
-> 13 1.771649 4 33
-> 7 1.771649 3 33
-> 8 0.742611 15 5 0.000000
-> 9 0.742611 15 5 48492000.000000
-> 9 1.771649 14 9 6632970.000000
-> 10 1.773709 15 5 48492000.000000
-> 10 1.773709 14 9 6632970.000000
-> 13 1.773709 4 25
-> 7 1.773709 3 25
-> 6 1.864258 37 3 2 "task-10"
-> 6 1.864258 38 3 1 "task-11"
-> 9 1.773709 14 9 6632970.000000
-> 10 1.864258 14 9 6632970.000000
-> 8 1.864258 18 37 1.000000
-> 12 1.864258 4 37 6
-> 15 1.864258 7 0 SR 37 10
-> 12 1.864258 4 37 5
-> 8 1.864258 18 38 1.000000
-> 12 1.864258 4 38 6
-> 13 1.864258 4 38
-> 14 1.864258 7 0 SR 38 11
-> 7 1.864258 3 38
-> 6 1.866422 39 3 1 "task-11"
-> 6 1.866422 40 3 1 "task-12"
-> 8 1.866422 18 39 1.000000
-> 12 1.866422 4 39 6
-> 15 1.866422 7 0 SR 39 11
-> 12 1.866422 4 39 5
-> 8 1.866422 18 40 1.000000
-> 12 1.866422 4 40 6
-> 13 1.866422 4 40
-> 14 1.866422 7 0 SR 40 12
-> 7 1.866422 3 40
-> 9 1.259775 15 3 76296000.000000
-> 9 1.886758 14 13 5114134.701194
-> 9 1.886758 14 7 5114134.701194
-> 9 1.886758 14 10 5114134.701194
-> 9 1.886758 14 14 5114134.701194
-> 9 1.886758 14 12 5114134.701194
-> 9 1.886758 14 6 5114134.701194
-> 9 1.886758 14 8 5114134.701194
-> 10 1.915117 15 3 76296000.000000
-> 10 1.915117 14 13 5114134.701194
-> 10 1.915117 14 7 5114134.701194
-> 10 1.915117 14 10 5114134.701194
-> 10 1.915117 14 14 5114134.701194
-> 10 1.915117 14 12 5114134.701194
-> 10 1.915117 14 6 5114134.701194
-> 10 1.915117 14 8 5114134.701194
-> 13 1.915117 4 32
-> 7 1.915117 3 32
-> 6 2.082294 41 3 5 "task-12"
-> 6 2.082294 42 3 1 "task-13"
-> 9 1.915117 14 13 5114134.701194
-> 9 1.915117 14 7 5114134.701194
-> 9 1.915117 14 10 5114134.701194
-> 9 1.915117 14 14 5114134.701194
-> 9 1.915117 14 12 5114134.701194
-> 9 1.915117 14 6 5114134.701194
-> 9 1.915117 14 8 5114134.701194
-> 10 2.082294 14 13 5114134.701194
-> 10 2.082294 14 7 5114134.701194
-> 10 2.082294 14 10 5114134.701194
-> 10 2.082294 14 14 5114134.701194
-> 10 2.082294 14 12 5114134.701194
-> 10 2.082294 14 6 5114134.701194
-> 10 2.082294 14 8 5114134.701194
-> 8 2.082294 18 41 1.000000
-> 12 2.082294 4 41 6
-> 15 2.082294 7 0 SR 41 12
-> 12 2.082294 4 41 5
-> 8 2.082294 18 42 1.000000
-> 12 2.082294 4 42 6
-> 13 2.082294 4 42
-> 14 2.082294 7 0 SR 42 13
-> 7 2.082294 3 42
-> 6 2.300447 43 3 3 "task-13"
-> 6 2.300447 44 3 1 "task-14"
-> 9 1.866422 15 1 98095000.000000
-> 10 2.082294 15 1 98095000.000000
-> 9 2.102845 14 13 5060664.718311
-> 9 2.102845 14 7 5060664.718311
-> 9 2.102845 14 10 5060664.718311
-> 9 2.102845 14 14 5060664.718311
-> 9 2.102845 14 12 5060664.718311
-> 9 2.102845 14 11 5060664.718311
-> 10 2.300447 14 13 5060664.718311
-> 10 2.300447 14 7 5060664.718311
-> 10 2.300447 14 10 5060664.718311
-> 10 2.300447 14 14 5060664.718311
-> 10 2.300447 14 12 5060664.718311
-> 10 2.300447 14 11 5060664.718311
-> 8 2.300447 18 43 1.000000
-> 12 2.300447 4 43 6
-> 15 2.300447 7 0 SR 43 13
-> 12 2.300447 4 43 5
-> 8 2.300447 18 44 1.000000
-> 12 2.300447 4 44 6
-> 13 2.300447 4 44
-> 14 2.300447 7 0 SR 44 14
-> 7 2.300447 3 44
-> 9 2.082294 15 1 98095000.000000
-> 10 2.300447 15 1 98095000.000000
-> 9 2.300447 15 1 98095000.000000
-> 10 2.376132 15 1 98095000.000000
-> 13 2.376132 4 39
-> 7 2.376132 3 39
-> 6 2.378296 45 3 1 "task-15"
-> 8 2.378296 18 45 1.000000
-> 12 2.378296 4 45 6
-> 13 2.378296 4 45
-> 14 2.378296 7 0 SR 45 15
-> 7 2.378296 3 45
-> 6 2.378296 46 3 1 "task-14"
-> 9 1.864258 15 2 76296000.000000
-> 8 2.378296 18 46 1.000000
-> 12 2.378296 4 46 6
-> 15 2.378296 7 0 SR 46 14
-> 12 2.378296 4 46 5
-> 10 2.519600 15 2 76296000.000000
-> 13 2.519600 4 37
-> 7 2.519600 3 37
-> 6 2.685562 47 3 1 "task-16"
-> 8 2.685562 18 47 1.000000
-> 12 2.685562 4 47 6
-> 13 2.685562 4 47
-> 14 2.685562 7 0 SR 47 16
-> 7 2.685562 3 47
-> 6 2.685562 48 3 2 "task-15"
-> 9 1.698296 15 4 48492000.000000
-> 9 2.378296 15 1 98095000.000000
-> 8 2.685562 18 48 1.000000
-> 12 2.685562 4 48 6
-> 15 2.685562 7 0 SR 48 15
-> 12 2.685562 4 48 5
-> 10 2.685562 15 1 98095000.000000
-> 10 2.729394 15 4 48492000.000000
-> 13 2.729394 4 36
-> 7 2.729394 3 36
-> 6 2.869854 49 3 1 "task-17"
-> 8 2.869854 18 49 1.000000
-> 12 2.869854 4 49 6
-> 13 2.869854 4 49
-> 14 2.869854 7 0 SR 49 17
-> 7 2.869854 3 49
-> 6 2.869854 50 3 4 "task-16"
-> 9 2.685562 15 1 98095000.000000
-> 8 2.869854 18 50 1.000000
-> 12 2.869854 4 50 6
-> 15 2.869854 7 0 SR 50 16
-> 12 2.869854 4 50 5
-> 10 2.869854 15 1 98095000.000000
-> 9 2.869854 15 1 98095000.000000
-> 10 2.888006 15 1 98095000.000000
-> 13 2.888006 4 46
-> 7 2.888006 3 46
-> 6 2.890170 51 3 1 "task-18"
-> 8 2.890170 18 51 1.000000
-> 12 2.890170 4 51 6
-> 13 2.890170 4 51
-> 14 2.890170 7 0 SR 51 18
-> 7 2.890170 3 51
-> 6 2.890170 52 3 1 "task-17"
-> 9 2.300447 15 3 76296000.000000
-> 8 2.890170 18 52 1.000000
-> 12 2.890170 4 52 6
-> 15 2.890170 7 0 SR 52 17
-> 12 2.890170 4 52 5
-> 10 2.955790 15 3 76296000.000000
-> 13 2.955790 4 43
-> 7 2.955790 3 43
-> 9 2.082294 15 5 48492000.000000
-> 10 3.113392 15 5 48492000.000000
-> 13 3.113392 4 41
-> 7 3.113392 3 41
-> 6 3.173943 53 3 1 "task-19"
-> 8 3.173943 18 53 1.000000
-> 12 3.173943 4 53 6
-> 13 3.173943 4 53
-> 14 3.173943 7 0 SR 53 19
-> 7 3.173943 3 53
-> 6 3.173943 54 3 3 "task-18"
-> 9 2.685562 15 2 76296000.000000
-> 9 2.890170 15 1 98095000.000000
-> 8 3.173943 18 54 1.000000
-> 12 3.173943 4 54 6
-> 15 3.173943 7 0 SR 54 18
-> 12 3.173943 4 54 5
-> 10 3.173943 15 1 98095000.000000
-> 9 3.194279 14 13 5114134.701194
-> 9 3.194279 14 7 5114134.701194
-> 9 3.194279 14 10 5114134.701194
-> 9 3.194279 14 14 5114134.701194
-> 9 3.194279 14 12 5114134.701194
-> 9 3.194279 14 6 5114134.701194
-> 9 3.194279 14 8 5114134.701194
-> 10 3.340904 15 2 76296000.000000
-> 10 3.340904 14 13 5114134.701194
-> 10 3.340904 14 7 5114134.701194
-> 10 3.340904 14 10 5114134.701194
-> 10 3.340904 14 14 5114134.701194
-> 10 3.340904 14 12 5114134.701194
-> 10 3.340904 14 6 5114134.701194
-> 10 3.340904 14 8 5114134.701194
-> 13 3.340904 4 48
-> 7 3.340904 3 48
-> 6 3.389815 55 3 5 "task-19"
-> 6 3.389815 56 3 1 "task-0"
-> 1 19 3 finalize "1 1 1"
-> 9 3.340904 14 13 5114134.701194
-> 9 3.340904 14 7 5114134.701194
-> 9 3.340904 14 10 5114134.701194
-> 9 3.340904 14 14 5114134.701194
-> 9 3.340904 14 12 5114134.701194
-> 9 3.340904 14 6 5114134.701194
-> 9 3.340904 14 8 5114134.701194
-> 10 3.389815 14 13 5114134.701194
-> 10 3.389815 14 7 5114134.701194
-> 10 3.389815 14 10 5114134.701194
-> 10 3.389815 14 14 5114134.701194
-> 10 3.389815 14 12 5114134.701194
-> 10 3.389815 14 6 5114134.701194
-> 10 3.389815 14 8 5114134.701194
-> 8 3.389815 18 55 1.000000
-> 12 3.389815 4 55 6
-> 15 3.389815 7 0 SR 55 19
-> 12 3.389815 4 55 5
-> 8 3.389815 19 56 1.000000
-> 12 3.389815 4 56 6
-> 13 3.389815 4 56
-> 14 3.389815 7 0 SR 56 20
-> 7 3.389815 3 56
-> 9 3.173943 15 1 98095000.000000
-> 10 3.389815 15 1 98095000.000000
-> 9 3.389815 15 1 98095000.000000
-> 10 3.399880 15 1 98095000.000000
-> 13 3.399880 4 52
-> 7 3.399880 3 52
-> 6 3.405015 57 3 2 "task-0"
-> 8 3.405015 19 57 1.000000
-> 12 3.405015 4 57 6
-> 15 3.405015 7 0 SR 57 20
-> 7 3.405015 3 57
-> 6 3.405015 58 3 1 "task-1"
-> 8 3.405015 19 58 1.000000
-> 12 3.405015 4 58 6
-> 13 3.405015 4 58
-> 14 3.405015 7 0 SR 58 21
-> 7 3.405015 3 58
-> 6 3.405171 59 3 1 "task-1"
-> 8 3.405171 19 59 1.000000
-> 12 3.405171 4 59 6
-> 15 3.405171 7 0 SR 59 21
-> 7 3.405171 3 59
-> 6 3.405171 60 3 1 "task-2"
-> 8 3.405171 19 60 1.000000
-> 12 3.405171 4 60 6
-> 13 3.405171 4 60
-> 14 3.405171 7 0 SR 60 22
-> 7 3.405171 3 60
-> 9 3.173943 15 3 76296000.000000
-> 10 3.829285 15 3 76296000.000000
-> 13 3.829285 4 54
-> 7 3.829285 3 54
-> 6 3.849836 61 3 1 "task-3"
-> 8 3.849836 19 61 1.000000
-> 12 3.849836 4 61 6
-> 13 3.849836 4 61
-> 14 3.849836 7 0 SR 61 23
-> 7 3.849836 3 61
-> 6 3.849836 62 3 3 "task-2"
-> 8 3.849836 19 62 1.000000
-> 12 3.849836 4 62 6
-> 15 3.849836 7 0 SR 62 22
-> 7 3.849836 3 62
-> 9 2.869854 15 4 48492000.000000
-> 10 3.900952 15 4 48492000.000000
-> 13 3.900952 4 50
-> 7 3.900952 3 50
-> 6 3.914183 63 3 1 "task-4"
-> 8 3.914183 19 63 1.000000
-> 12 3.914183 4 63 6
-> 13 3.914183 4 63
-> 14 3.914183 7 0 SR 63 24
-> 7 3.914183 3 63
-> 6 3.914183 64 3 4 "task-3"
-> 8 3.914183 19 64 1.000000
-> 12 3.914183 4 64 6
-> 15 3.914183 7 0 SR 64 23
-> 7 3.914183 3 64
-> 9 3.389815 15 5 48492000.000000
-> 10 4.420913 15 5 48492000.000000
-> 13 4.420913 4 55
-> 7 4.420913 3 55
-> 6 4.441249 65 3 5 "task-4"
-> 8 4.441249 19 65 1.000000
-> 12 4.441249 4 65 6
-> 15 4.441249 7 0 SR 65 24
-> 7 4.441249 3 65
-> 7 4.441249 1 3
-> 7 4.441249 1 1
-> 7 4.441249 8 14
-> 7 4.441249 8 12
-> 7 4.441249 8 10
-> 7 4.441249 8 7
-> 7 4.441249 8 13
-> 7 4.441249 8 15
-> 7 4.441249 8 6
-> 7 4.441249 8 8
-> 7 4.441249 8 11
-> 7 4.441249 8 9
-> 7 4.441249 1 5
-> 7 4.441249 1 2
-> 7 4.441249 1 4
-> 7 4.441249 0 0
-
-$ rm -rf tracing/tasks.trace

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 13bd2b9..4025598 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -18,7 +18,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
 #define OPT_TRACING_SMPI_GROUP    "tracing/smpi/group"
 #define OPT_TRACING_CATEGORIZED   "tracing/categorized"
 #define OPT_TRACING_UNCATEGORIZED "tracing/uncategorized"
-#define OPT_TRACING_MSG_TASK      "tracing/msg/task"
 #define OPT_TRACING_MSG_PROCESS   "tracing/msg/process"
 #define OPT_TRACING_FILENAME      "tracing/filename"
 #define OPT_TRACING_BUFFER        "tracing/buffer"
@@ -33,7 +32,6 @@ static int trace_smpi_enabled;
 static int trace_smpi_grouped;
 static int trace_categorized;
 static int trace_uncategorized;
-static int trace_msg_task_enabled;
 static int trace_msg_process_enabled;
 static int trace_buffer;
 static int trace_onelink_only;
@@ -52,7 +50,6 @@ static void TRACE_getopts(void)
   trace_smpi_grouped = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI_GROUP);
   trace_categorized = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_CATEGORIZED);
   trace_uncategorized = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_UNCATEGORIZED);
-  trace_msg_task_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK);
   trace_msg_process_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS);
   trace_buffer = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_BUFFER);
   trace_onelink_only = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_ONELINK_ONLY);
@@ -126,7 +123,6 @@ int TRACE_end()
 int TRACE_needs_platform (void)
 {
   return TRACE_msg_process_is_enabled() ||
-         TRACE_msg_task_is_enabled() ||
          TRACE_categorized() ||
          TRACE_uncategorized() ||
          TRACE_platform () ||
@@ -170,11 +166,6 @@ int TRACE_uncategorized (void)
   return trace_uncategorized;
 }
 
-int TRACE_msg_task_is_enabled(void)
-{
-  return trace_msg_task_enabled && TRACE_is_enabled();
-}
-
 int TRACE_msg_process_is_enabled(void)
 {
   return trace_msg_process_enabled && TRACE_is_enabled();
@@ -262,13 +253,6 @@ void TRACE_global_init(int *argc, char **argv)
                    xbt_cfgelm_int, &default_tracing_uncategorized, 0, 1,
                    NULL, NULL);
 
-  /* msg task */
-  int default_tracing_msg_task = 0;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_MSG_TASK,
-                   "Tracing of MSG task behavior.",
-                   xbt_cfgelm_int, &default_tracing_msg_task, 0, 1,
-                   NULL, NULL);
-
   /* msg process */
   int default_tracing_msg_process = 0;
   xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_MSG_PROCESS,
@@ -361,10 +345,6 @@ void TRACE_help (int detailed)
       "  This option only has effect if this simulator is SMPI-based. The processes\n"
       "  are grouped by the hosts where they were executed.",
       detailed);
-  print_line (OPT_TRACING_MSG_TASK, "Trace task behavior (MSG)",
-      "  This option only has effect if this simulator is MSG-based. It traces the\n"
-      "  behavior of all categorized MSG tasks, grouping them by hosts.",
-      detailed);
   print_line (OPT_TRACING_MSG_PROCESS, "Trace processes behavior (MSG)",
       "  This option only has effect if this simulator is MSG-based. It traces the\n"
       "  behavior of all categorized MSG processes, grouping them by hosts. This option\n"
@@ -537,7 +517,6 @@ void TRACE_set_network_update_mechanism (void)
 #undef OPT_TRACING_SMPI_GROUP
 #undef OPT_TRACING_CATEGORIZED
 #undef OPT_TRACING_UNCATEGORIZED
-#undef OPT_TRACING_MSG_TASK
 #undef OPT_TRACING_MSG_PROCESS
 #undef OPT_TRACING_FILENAME
 #undef OPT_TRACING_BUFFER

diff --git a/src/instr/instr_msg_task.c b/src/instr/instr_msg_task.c
index b75039e..423eab3 100644 (file)
--- a/src/instr/instr_msg_task.c
+++ b/src/instr/instr_msg_task.c
@@ -15,49 +15,20 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg, instr, "MSG");
  */
 void TRACE_msg_set_task_category(m_task_t task, const char *category)
 {
-  if (!TRACE_categorized())
-    return;
-
   xbt_assert(task->category == NULL, "Task %p(%s) already has a category (%s).",
       task, task->name, task->category);
-  if (TRACE_msg_task_is_enabled()){
-    xbt_assert(task->name != NULL,
-        "Task %p(%s) must have a unique name in order to be traced, if --cfg=tracing/msg/task:1 is used.",
-        task, task->name);
-    xbt_assert(getContainer(task->name)==NULL,
-        "Task %p(%s). Tracing already knows a task with name %s."
-        "The name of each task must be unique, if --cfg=tracing/msg/task:1 is used.", task, task->name, task->name);
-  }
 
+  //if user provides a NULL category, task is no longer traced
   if (category == NULL) {
-    //if user provides a NULL category, task is no longer traced
     xbt_free (task->category);
     task->category = NULL;
+    XBT_DEBUG("MSG task %p(%s), category removed", task, task->name);
     return;
   }
 
   //set task category
   task->category = xbt_strdup (category);
   XBT_DEBUG("MSG task %p(%s), category %s", task, task->name, task->category);
-
-  if (TRACE_msg_task_is_enabled()){
-    m_host_t host = MSG_host_self();
-    container_t host_container = getContainer(host->name);
-    //check to see if there is a container with the task->name
-    xbt_assert(getContainer(task->name) == NULL,
-        "Task %p(%s). Tracing already knows a task with name %s."
-        "The name of each task must be unique, if --cfg=tracing/msg/task:1 is used.", task, task->name, task->name);
-    container_t msg = newContainer(task->name, INSTR_MSG_TASK, host_container);
-    type_t type = getType (task->category, msg->type);
-    if (!type){
-      type = getVariableType(task->category, NULL, msg->type);
-    }
-    new_pajeSetVariable (SIMIX_get_clock(), msg, type, 1);
-
-    type = getType ("MSG_TASK_STATE", msg->type);
-    val_t value = getValueByName ("created", type);
-    new_pajePushState (MSG_get_clock(), msg, type, value);
-  }
 }
 
 /* MSG_task_create related function*/
@@ -74,13 +45,6 @@ void TRACE_msg_task_execute_start(m_task_t task)
 {
   XBT_DEBUG("EXEC,in %p, %lld, %s", task, task->counter, task->category);
 
-  if (TRACE_msg_task_is_enabled()){
-    container_t task_container = getContainer (task->name);
-    type_t type = getType ("MSG_TASK_STATE", task_container->type);
-    val_t value = getValueByName ("MSG_task_execute", type);
-    new_pajePushState (MSG_get_clock(), task_container, type, value);
-  }
-
   if (TRACE_msg_process_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
@@ -96,12 +60,6 @@ void TRACE_msg_task_execute_end(m_task_t task)
 {
   XBT_DEBUG("EXEC,out %p, %lld, %s", task, task->counter, task->category);
 
-  if (TRACE_msg_task_is_enabled()){
-    container_t task_container = getContainer (task->name);
-    type_t type = getType ("MSG_TASK_STATE", task_container->type);
-    new_pajePopState (MSG_get_clock(), task_container, type);
-  }
-
   if (TRACE_msg_process_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
@@ -117,11 +75,6 @@ void TRACE_msg_task_destroy(m_task_t task)
 {
   XBT_DEBUG("DESTROY %p, %lld, %s", task, task->counter, task->category);
 
-  if (TRACE_msg_task_is_enabled()){
-    //that's the end, let's destroy it
-    destroyContainer (getContainer(task->name));
-  }
-
   //free category
   xbt_free(task->category);
   task->category = NULL;
@@ -133,10 +86,6 @@ void TRACE_msg_task_get_start(void)
 {
   XBT_DEBUG("GET,in");
 
-  if (TRACE_msg_task_is_enabled()){
-    //task not received yet, nothing to do
-  }
-
   if (TRACE_msg_process_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
@@ -152,24 +101,6 @@ void TRACE_msg_task_get_end(double start_time, m_task_t task)
 {
   XBT_DEBUG("GET,out %p, %lld, %s", task, task->counter, task->category);
 
-  if (TRACE_msg_task_is_enabled()){
-
-    m_host_t host = MSG_host_self();
-    container_t host_container = getContainer(host->name);
-    container_t msg = newContainer(task->name, INSTR_MSG_TASK, host_container);
-    type_t type = getType (task->category, msg->type);
-    new_pajeSetVariable (SIMIX_get_clock(), msg, type, 1);
-
-    type = getType ("MSG_TASK_STATE", msg->type);
-    val_t value = getValueByName ("created", type);
-    new_pajePushState (MSG_get_clock(), msg, type, value);
-
-    type = getType ("MSG_TASK_LINK", getRootType());
-    char key[INSTR_DEFAULT_STR_SIZE];
-    snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", task->counter);
-    new_pajeEndLink (MSG_get_clock(), getRootContainer(), type, msg, "SR", key);
-  }
-
   if (TRACE_msg_process_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
@@ -190,20 +121,6 @@ int TRACE_msg_task_put_start(m_task_t task)
 {
   XBT_DEBUG("PUT,in %p, %lld, %s", task, task->counter, task->category);
 
-  if (TRACE_msg_task_is_enabled()){
-
-    container_t msg = getContainer (task->name);
-    type_t type = getType ("MSG_TASK_STATE", msg->type);
-    new_pajePopState (MSG_get_clock(), msg, type);
-
-    type = getType ("MSG_TASK_LINK", getRootType());
-    char key[INSTR_DEFAULT_STR_SIZE];
-    snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", task->counter);
-    new_pajeStartLink(MSG_get_clock(), getRootContainer(), type, msg, "SR", key);
-
-    destroyContainer (msg);
-  }
-
   if (TRACE_msg_process_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];
@@ -226,10 +143,6 @@ void TRACE_msg_task_put_end(void)
 {
   XBT_DEBUG("PUT,out");
 
-  if (TRACE_msg_task_is_enabled()){
-    //task no longer exists here
-  }
-
   if (TRACE_msg_process_is_enabled()){
     int len = INSTR_DEFAULT_STR_SIZE;
     char str[INSTR_DEFAULT_STR_SIZE];

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 875fa0f..a78e1ca 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -160,7 +160,6 @@ int TRACE_smpi_is_enabled(void);
 int TRACE_smpi_is_grouped(void);
 int TRACE_categorized (void);
 int TRACE_uncategorized (void);
-int TRACE_msg_task_is_enabled(void);
 int TRACE_msg_process_is_enabled(void);
 int TRACE_buffer (void);
 int TRACE_onelink_only (void);

diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c
index 398d0cd..5482547 100644 (file)
--- a/src/instr/instr_routing.c
+++ b/src/instr/instr_routing.c
@@ -267,14 +267,6 @@ static void instr_routing_parse_start_host (sg_platf_host_cbarg_t host)
     getLinkType ("MSG_PROCESS_LINK", getRootType(), msg_process, msg_process);
     getLinkType ("MSG_PROCESS_TASK_LINK", getRootType(), msg_process, msg_process);
   }
-
-  if (TRACE_msg_task_is_enabled()) {
-    type_t msg_task = getContainerType ("MSG_TASK", new->type);
-    type_t state = getStateType ("MSG_TASK_STATE", msg_task);
-    getValue ("MSG_task_execute", "0 1 0", state);
-    getValue ("created", "1 1 0", state);
-    getLinkType ("MSG_TASK_LINK", getRootType(), msg_task, msg_task);
-  }
 }
 
 static void instr_routing_parse_start_router (sg_platf_router_cbarg_t router)