From 1d9d174e0e416ffd7be66189889a18bf3e21639b Mon Sep 17 00:00:00 2001
From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Wed, 16 May 2018 17:26:44 +0200
Subject: [PATCH] kill a not so useful tracing option

---
 .../trace-process-migration.tesh              | 395 +-----------------
 src/instr/instr_config.cpp                    |  14 -
 src/instr/instr_paje_trace.cpp                |   5 -
 src/instr/instr_private.hpp                   |   1 -
 4 files changed, 2 insertions(+), 413 deletions(-)

diff --git a/examples/msg/trace-process-migration/trace-process-migration.tesh b/examples/msg/trace-process-migration/trace-process-migration.tesh
index 01997134b5..0d4ce83399 100644
--- a/examples/msg/trace-process-migration/trace-process-migration.tesh
+++ b/examples/msg/trace-process-migration/trace-process-migration.tesh
@@ -994,10 +994,9 @@ $ tail -n +3 procmig.trace
 > 7 18.155073 1 1
 > 7 18.155073 4 31
 
-$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=tracing/buffer:no --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:yes ${platfdir}/small_platform.xml
+$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:yes ${platfdir}/small_platform.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/categorized' to 'yes'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/uncategorized' to 'yes'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/buffer' to 'no'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/filename' to 'procmig.trace'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to 'yes'
 
@@ -2413,394 +2412,4 @@ $ tail -n +3 simgrid.trace
 > 7 18.155073 1 1
 > 7 18.155073 4 31
 
-$ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing:yes --cfg=tracing/msg/process:yes ${platfdir}/small_platform.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/msg/process' to 'yes'
-
-$ tail -n +3 simgrid.trace
-> %EventDef PajeDefineContainerType 0
-> %       Alias string
-> %       Type string
-> %       Name string
-> %EndEventDef
-> %EventDef PajeDefineVariableType 1
-> %       Alias string
-> %       Type string
-> %       Name string
-> %       Color color
-> %EndEventDef
-> %EventDef PajeDefineStateType 2
-> %       Alias string
-> %       Type string
-> %       Name string
-> %EndEventDef
-> %EventDef PajeDefineEventType 3
-> %       Alias string
-> %       Type string
-> %       Name string
-> %EndEventDef
-> %EventDef PajeDefineLinkType 4
-> %       Alias string
-> %       Type string
-> %       StartContainerType string
-> %       EndContainerType string
-> %       Name string
-> %EndEventDef
-> %EventDef PajeDefineEntityValue 5
-> %       Alias string
-> %       Type 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 PajeResetState 14
-> %       Time date
-> %       Type string
-> %       Container string
-> %EndEventDef
-> %EventDef PajeStartLink 15
-> %       Time date
-> %       Type string
-> %       Container string
-> %       Value string
-> %       StartContainer string
-> %       Key string
-> %EndEventDef
-> %EventDef PajeEndLink 16
-> %       Time date
-> %       Type string
-> %       Container string
-> %       Value string
-> %       EndContainer string
-> %       Key string
-> %EndEventDef
-> %EventDef PajeNewEvent 17
-> %       Time date
-> %       Type string
-> %       Container string
-> %       Value string
-> %EndEventDef
-> 0 1 0 HOST
-> 6 0.000000 1 1 0 "Tremblay"
-> 6 0.000000 2 1 0 "Jupiter"
-> 6 0.000000 3 1 0 "Fafard"
-> 6 0.000000 4 1 0 "Ginette"
-> 6 0.000000 5 1 0 "Bourassa"
-> 6 0.000000 6 1 0 "Jacquelin"
-> 6 0.000000 7 1 0 "Boivin"
-> 0 2 0 LINK
-> 6 0.000000 8 2 0 "6"
-> 6 0.000000 9 2 0 "3"
-> 6 0.000000 10 2 0 "7"
-> 6 0.000000 11 2 0 "9"
-> 6 0.000000 12 2 0 "2"
-> 6 0.000000 13 2 0 "8"
-> 6 0.000000 14 2 0 "1"
-> 6 0.000000 15 2 0 "4"
-> 6 0.000000 16 2 0 "0"
-> 6 0.000000 17 2 0 "5"
-> 6 0.000000 18 2 0 "145"
-> 6 0.000000 19 2 0 "10"
-> 6 0.000000 20 2 0 "11"
-> 6 0.000000 21 2 0 "16"
-> 6 0.000000 22 2 0 "17"
-> 6 0.000000 23 2 0 "44"
-> 6 0.000000 24 2 0 "47"
-> 6 0.000000 25 2 0 "54"
-> 6 0.000000 26 2 0 "56"
-> 6 0.000000 27 2 0 "59"
-> 6 0.000000 28 2 0 "78"
-> 6 0.000000 29 2 0 "79"
-> 6 0.000000 30 2 0 "80"
-> 6 0.000000 31 2 0 "loopback"
-> 4 3 0 2 2 0-LINK2-LINK2
-> 4 4 0 1 2 0-HOST1-LINK2
-> 4 5 0 2 1 0-LINK2-HOST1
-> 15 0.000000 3 0 topology 12 0
-> 16 0.000000 3 0 topology 16 0
-> 15 0.000000 3 0 topology 9 1
-> 16 0.000000 3 0 topology 16 1
-> 15 0.000000 3 0 topology 16 2
-> 16 0.000000 3 0 topology 14 2
-> 15 0.000000 3 0 topology 21 3
-> 16 0.000000 3 0 topology 19 3
-> 15 0.000000 3 0 topology 8 4
-> 16 0.000000 3 0 topology 19 4
-> 15 0.000000 3 0 topology 19 5
-> 16 0.000000 3 0 topology 20 5
-> 15 0.000000 3 0 topology 8 6
-> 16 0.000000 3 0 topology 20 6
-> 15 0.000000 3 0 topology 27 7
-> 16 0.000000 3 0 topology 18 7
-> 15 0.000000 4 0 topology 5 8
-> 16 0.000000 4 0 topology 18 8
-> 15 0.000000 4 0 topology 4 9
-> 16 0.000000 4 0 topology 18 9
-> 15 0.000000 4 0 topology 2 10
-> 16 0.000000 4 0 topology 18 10
-> 15 0.000000 3 0 topology 16 11
-> 16 0.000000 3 0 topology 21 11
-> 15 0.000000 3 0 topology 21 12
-> 16 0.000000 3 0 topology 22 12
-> 15 0.000000 3 0 topology 9 13
-> 16 0.000000 3 0 topology 12 13
-> 15 0.000000 3 0 topology 15 14
-> 16 0.000000 3 0 topology 9 14
-> 15 0.000000 4 0 topology 1 15
-> 16 0.000000 4 0 topology 9 15
-> 15 0.000000 3 0 topology 20 16
-> 16 0.000000 3 0 topology 23 16
-> 15 0.000000 3 0 topology 23 17
-> 16 0.000000 3 0 topology 24 17
-> 15 0.000000 4 0 topology 5 18
-> 16 0.000000 4 0 topology 24 18
-> 15 0.000000 4 0 topology 4 19
-> 16 0.000000 4 0 topology 24 19
-> 15 0.000000 4 0 topology 2 20
-> 16 0.000000 4 0 topology 24 20
-> 15 0.000000 3 0 topology 11 21
-> 16 0.000000 3 0 topology 15 21
-> 15 0.000000 4 0 topology 1 22
-> 16 0.000000 4 0 topology 15 22
-> 15 0.000000 3 0 topology 12 23
-> 16 0.000000 3 0 topology 17 23
-> 15 0.000000 3 0 topology 9 24
-> 16 0.000000 3 0 topology 17 24
-> 15 0.000000 3 0 topology 22 25
-> 16 0.000000 3 0 topology 25 25
-> 15 0.000000 3 0 topology 12 26
-> 16 0.000000 3 0 topology 25 26
-> 15 0.000000 3 0 topology 25 27
-> 16 0.000000 3 0 topology 26 27
-> 15 0.000000 3 0 topology 26 28
-> 16 0.000000 3 0 topology 27 28
-> 15 0.000000 3 0 topology 14 29
-> 16 0.000000 3 0 topology 8 29
-> 15 0.000000 3 0 topology 13 30
-> 16 0.000000 3 0 topology 8 30
-> 15 0.000000 3 0 topology 11 31
-> 16 0.000000 3 0 topology 8 31
-> 15 0.000000 3 0 topology 8 32
-> 16 0.000000 3 0 topology 10 32
-> 15 0.000000 3 0 topology 30 33
-> 16 0.000000 3 0 topology 28 33
-> 15 0.000000 4 0 topology 3 34
-> 16 0.000000 4 0 topology 28 34
-> 15 0.000000 3 0 topology 28 35
-> 16 0.000000 3 0 topology 29 35
-> 15 0.000000 4 0 topology 3 36
-> 16 0.000000 4 0 topology 30 36
-> 15 0.000000 3 0 topology 14 37
-> 16 0.000000 3 0 topology 13 37
-> 15 0.000000 3 0 topology 29 38
-> 16 0.000000 3 0 topology 11 38
-> 15 0.000000 4 0 topology 1 39
-> 16 0.000000 4 0 topology 11 39
-> 15 0.000000 5 0 topology 24 40
-> 16 0.000000 5 0 topology 7 40
-> 15 0.000000 5 0 topology 10 41
-> 16 0.000000 5 0 topology 5 41
-> 15 0.000000 5 0 topology 13 42
-> 16 0.000000 5 0 topology 3 42
-> 15 0.000000 5 0 topology 17 43
-> 16 0.000000 5 0 topology 4 43
-> 15 0.000000 5 0 topology 18 44
-> 16 0.000000 5 0 topology 6 44
-> 15 0.000000 5 0 topology 11 45
-> 16 0.000000 5 0 topology 2 45
-> 0 6 1 ACTOR
-> 6 0.000000 32 6 3 "emigrant-1"
-> 2 7 6 ACTOR_STATE
-> 5 8 7 suspend "1 0 1"
-> 5 9 7 sleep "1 1 0"
-> 5 10 7 receive "1 0 0"
-> 5 11 7 send "0 0 1"
-> 5 12 7 task_execute "0 1 1"
-> 4 13 0 6 6 ACTOR_LINK
-> 4 14 0 6 6 ACTOR_TASK_LINK
-> 6 0.000000 33 6 1 "policeman-2"
-> 12 0.000000 7 32 9
-> 12 0.000000 7 33 11
-> 15 0.000000 14 0 SR 33 p0
-> 13 2.000000 7 32
-> 12 2.000000 7 32 10
-> 13 2.025708 7 33
-> 12 2.025708 7 33 11
-> 15 2.025708 14 0 SR 33 p1
-> 13 2.025708 7 32
-> 16 2.025708 14 0 SR 32 p0
-> 15 2.025708 13 0 M 32 0
-> 7 2.025708 6 32
-> 6 2.025708 34 6 1 "emigrant-1"
-> 16 2.025708 13 0 M 34 0
-> 12 2.025708 7 34 9
-> 13 4.025708 7 34
-> 12 4.025708 7 34 10
-> 13 4.025903 7 33
-> 12 4.025903 7 33 11
-> 15 4.025903 14 0 SR 33 p2
-> 13 4.025903 7 34
-> 16 4.025903 14 0 SR 34 p1
-> 15 4.025903 13 0 M 34 1
-> 7 4.025903 6 34
-> 6 4.025903 35 6 2 "emigrant-1"
-> 16 4.025903 13 0 M 35 1
-> 12 4.025903 7 35 9
-> 13 6.025903 7 35
-> 12 6.025903 7 35 10
-> 13 6.044918 7 33
-> 12 6.044918 7 33 11
-> 15 6.044918 14 0 SR 33 p3
-> 13 6.044918 7 35
-> 16 6.044918 14 0 SR 35 p2
-> 15 6.044918 13 0 M 35 2
-> 7 6.044918 6 35
-> 6 6.044918 36 6 3 "emigrant-1"
-> 16 6.044918 13 0 M 36 2
-> 12 6.044918 7 36 9
-> 13 8.044918 7 36
-> 12 8.044918 7 36 10
-> 13 8.070626 7 33
-> 12 8.070626 7 33 11
-> 15 8.070626 14 0 SR 33 p4
-> 13 8.070626 7 36
-> 16 8.070626 14 0 SR 36 p3
-> 15 8.070626 13 0 M 36 3
-> 7 8.070626 6 36
-> 6 8.070626 37 6 4 "emigrant-1"
-> 16 8.070626 13 0 M 37 3
-> 12 8.070626 7 37 9
-> 13 10.070626 7 37
-> 12 10.070626 7 37 10
-> 13 10.087178 7 33
-> 12 10.087178 7 33 11
-> 15 10.087178 14 0 SR 33 p5
-> 13 10.087178 7 37
-> 16 10.087178 14 0 SR 37 p4
-> 15 10.087178 13 0 M 37 4
-> 7 10.087178 6 37
-> 6 10.087178 38 6 5 "emigrant-1"
-> 16 10.087178 13 0 M 38 4
-> 12 10.087178 7 38 9
-> 13 12.087178 7 38
-> 12 12.087178 7 38 10
-> 13 12.112617 7 33
-> 12 12.112617 7 33 11
-> 15 12.112617 14 0 SR 33 p6
-> 13 12.112617 7 38
-> 16 12.112617 14 0 SR 38 p5
-> 15 12.112617 13 0 M 38 5
-> 7 12.112617 6 38
-> 6 12.112617 39 6 3 "emigrant-1"
-> 16 12.112617 13 0 M 39 5
-> 12 12.112617 7 39 9
-> 13 14.112617 7 39
-> 12 14.112617 7 39 10
-> 13 14.138325 7 33
-> 12 14.138325 7 33 11
-> 15 14.138325 14 0 SR 33 p7
-> 13 14.138325 7 39
-> 16 14.138325 14 0 SR 39 p6
-> 15 14.138325 13 0 M 39 6
-> 7 14.138325 6 39
-> 6 14.138325 40 6 1 "emigrant-1"
-> 16 14.138325 13 0 M 40 6
-> 12 14.138325 7 40 9
-> 13 16.138325 7 40
-> 12 16.138325 7 40 10
-> 13 16.138521 7 33
-> 12 16.138521 7 33 11
-> 15 16.138521 14 0 SR 33 p8
-> 13 16.138521 7 40
-> 16 16.138521 14 0 SR 40 p7
-> 15 16.138521 13 0 M 40 7
-> 7 16.138521 6 40
-> 6 16.138521 41 6 4 "emigrant-1"
-> 16 16.138521 13 0 M 41 7
-> 12 16.138521 7 41 9
-> 13 18.138521 7 41
-> 12 18.138521 7 41 10
-> 13 18.155073 7 33
-> 7 18.155073 6 33
-> 13 18.155073 7 41
-> 16 18.155073 14 0 SR 41 p8
-> 7 18.155073 6 41
-> 7 18.155073 2 16
-> 7 18.155073 2 14
-> 7 18.155073 2 19
-> 7 18.155073 2 20
-> 7 18.155073 2 18
-> 7 18.155073 2 21
-> 7 18.155073 2 22
-> 7 18.155073 2 12
-> 7 18.155073 2 9
-> 7 18.155073 2 15
-> 7 18.155073 2 23
-> 7 18.155073 2 24
-> 7 18.155073 2 17
-> 7 18.155073 2 25
-> 7 18.155073 2 26
-> 7 18.155073 2 27
-> 7 18.155073 2 8
-> 7 18.155073 2 10
-> 7 18.155073 2 28
-> 7 18.155073 2 29
-> 7 18.155073 2 13
-> 7 18.155073 2 30
-> 7 18.155073 2 11
-> 7 18.155073 1 7
-> 7 18.155073 1 5
-> 7 18.155073 1 3
-> 7 18.155073 1 4
-> 7 18.155073 1 6
-> 7 18.155073 1 2
-> 7 18.155073 1 1
-> 7 18.155073 2 31
-
-$ rm -rf procmig.trace simgrid.trace
+$ rm -rf procmig.trace
diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index da2524cae7..d73a58cb6a 100644
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -18,7 +18,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
 std::ofstream tracing_file;
 
 #define OPT_TRACING_BASIC                "tracing/basic"
-#define OPT_TRACING_BUFFER               "tracing/buffer"
 #define OPT_TRACING_CATEGORIZED          "tracing/categorized"
 #define OPT_TRACING_COMMENT_FILE         "tracing/comment-file"
 #define OPT_TRACING_COMMENT              "tracing/comment"
@@ -60,8 +59,6 @@ static simgrid::config::Flag<bool> trace_categorized{
     OPT_TRACING_CATEGORIZED, "Tracing categorized resource utilization of hosts and links.", false};
 static simgrid::config::Flag<bool> trace_uncategorized{
     OPT_TRACING_UNCATEGORIZED, "Tracing uncategorized resource utilization of hosts and links.", false};
-static simgrid::config::Flag<bool> trace_buffer{OPT_TRACING_BUFFER,
-                                                "Buffer trace events to put them in temporal order.", true};
 static simgrid::config::Flag<bool> trace_disable_destroy{
     OPT_TRACING_DISABLE_DESTROY, {"tracing/disable_destroy"}, "Disable platform containers destruction.", false};
 static simgrid::config::Flag<bool> trace_basic{OPT_TRACING_BASIC, "Avoid extended events (impoverished trace file).",
@@ -236,11 +233,6 @@ bool TRACE_disable_speed()
   return trace_disable_power && trace_enabled;
 }
 
-bool TRACE_buffer ()
-{
-  return trace_buffer && trace_enabled;
-}
-
 bool TRACE_disable_destroy ()
 {
   return trace_disable_destroy && trace_enabled;
@@ -337,12 +329,6 @@ void TRACE_help()
              "  to allow further study of simulated or real sleep time");
   print_line(OPT_TRACING_SMPI_INTERNALS, "Generates tracing events corresponding",
              "  to point-to-point messages sent by collective communications");
-  print_line(OPT_TRACING_BUFFER, "Buffer events to put them in temporal order",
-             "  This option put some events in a time-ordered buffer using the insertion\n"
-             "  sort algorithm. The process of acquiring and releasing locks to access this\n"
-             "  buffer and the cost of the sorting algorithm make this process slow. The\n"
-             "  simulator performance can be severely impacted if this option is activated,\n"
-             "  but you are sure to get a trace file with events sorted.");
   print_line(OPT_TRACING_DISABLE_DESTROY, "Disable platform containers destruction",
              "  Disable the destruction of containers at the end of simulation. This can be\n"
              "  used with simulators that have a different notion of time (different from\n"
diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp
index 49aa668d92..a725958bb9 100644
--- a/src/instr/instr_paje_trace.cpp
+++ b/src/instr/instr_paje_trace.cpp
@@ -85,11 +85,6 @@ static void buffer_debug(std::vector<simgrid::instr::PajeEvent*>* buf)
 /* internal do the instrumentation module */
 void simgrid::instr::PajeEvent::insert_into_buffer()
 {
-  if (not TRACE_buffer()) {
-    print();
-    delete this;
-    return;
-  }
   buffer_debug(&buffer);
 
   XBT_DEBUG("%s: insert event_type=%u, timestamp=%f, buffersize=%zu)", __func__, eventType_, timestamp_, buffer.size());
diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index f4dff23810..52c6aaa8f2 100644
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.hpp
@@ -221,7 +221,6 @@ XBT_PRIVATE bool TRACE_categorized();
 XBT_PRIVATE bool TRACE_uncategorized();
 XBT_PRIVATE bool TRACE_actor_is_enabled();
 XBT_PRIVATE bool TRACE_vm_is_enabled();
-XBT_PRIVATE bool TRACE_buffer();
 XBT_PRIVATE bool TRACE_disable_link();
 XBT_PRIVATE bool TRACE_disable_speed();
 XBT_PRIVATE bool TRACE_disable_destroy();
-- 
2.20.1