From ccb7ee887db68e2906ca98bceaba2298c6c993e6 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Fri, 19 Jul 2024 17:28:57 +0000
Subject: [PATCH 01/53] working?

---
 utils/babeltrace_thapi.in | 11 ++++++++-
 xprof/xprof.rb.in         | 50 ++++++++++++++++++++++++++++++++-------
 2 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/utils/babeltrace_thapi.in b/utils/babeltrace_thapi.in
index fe344861..1b64b0ba 100755
--- a/utils/babeltrace_thapi.in
+++ b/utils/babeltrace_thapi.in
@@ -130,6 +130,7 @@ def get_components(names)
   components_classes = {
     'source.ctf.fs' => BT2::BTPlugin.find('ctf').get_source_component_class_by_name('fs'),
     'source.ctf.lttng_live' => BT2::BTPlugin.find('ctf').get_source_component_class_by_name('lttng-live'),
+    'source.ctf.lttng-archive' => BT2::BTPlugin.find('ctf').get_source_component_class_by_name('lttng-archive'),
     'filter.utils.muxer' => BT2::BTPlugin.find('utils').get_filter_component_class_by_name('muxer'),
     'sink.text.pretty' => BT2::BTPlugin.find('text').get_sink_component_class_by_name('pretty'),
     'sink.ctf.fs' => BT2::BTPlugin.find('ctf').get_sink_component_class_by_name('fs'),
@@ -200,6 +201,10 @@ def get_and_add_components(graph, names, l_inputs)
       graph.add(comp, 'source_live',
                 params: { 'inputs' => $options[:inputs],
                           'session-not-found-action' => 'end' })
+    when 'source.ctf.lttng-archive'
+      graph.add(comp, 'source-archive',
+                params: { 'session-name' => $options[:archive],
+                          'session-found-file-path' => $options[:'session-found-file-path'] })
     when 'source.ctf.fs'
       s = Find.find(*l_inputs)
               .reject { |path| FileTest.directory?(path) }
@@ -281,7 +286,9 @@ def bt_graphs(inputs)
   @bt_graphs[inputs] ||= begin
     g_comps = [if $options[:live]
                  'source.ctf.lttng_live'
-               else
+               elsif $options[:archive]
+                  'source.ctf.lttng-archive'
+              else
                  'source.ctf.fs'
                end]
 
@@ -354,6 +361,8 @@ class BabeltraceParserThapi < OptionParserWithDefaultAndValidation
        'Format: backend_name[:backend_level],...',
         default: ['mpi:3', 'omp:2', 'cl:1', 'ze:1', 'cuda:1', 'hip:1'])
     on('--debug', default: false)
+    on('--archive SESSION-NAME')
+    on('--session-found-file-path PATH')
     on('--[no-]muxer')
     on('-v', '--version', 'Print the version string') do
       puts File.read(File.join(DATADIR, 'version'))
diff --git a/xprof/xprof.rb.in b/xprof/xprof.rb.in
index e2aed6d5..4edd9bdc 100755
--- a/xprof/xprof.rb.in
+++ b/xprof/xprof.rb.in
@@ -534,8 +534,8 @@ def lm_setup_lttng(backends)
   FileUtils.mkdir_p(lttng_home_dir)
   FileUtils.mkdir_p(lttng_trace_dir_tmp)
   exec('lttng-sessiond --daemonize')
-  exec("lttng create #{lttng_session_uuid} -o #{lttng_trace_dir_tmp}")
 
+  exec("lttng create #{lttng_session_uuid} -o #{lttng_trace_dir_tmp}")
   File.write(File.join(lttng_trace_dir_tmp, 'thapi_metadata.yaml'), { type: 'lttng' }.to_yaml)
 
   channel_name = 'blocking-channel'
@@ -560,11 +560,15 @@ def lm_setup_lttng(backends)
     end
 
   end
+
+  exec("lttng enable-rotation --session=#{lttng_session_uuid} --size=50M --timer=60s") if OPTIONS.include?(:archive)
   exec("lttng start #{lttng_session_uuid}")
+  lttng_session_uuid
 end
 
 def lm_lttng_teardown_session
   raise unless mpi_local_master?
+  exec("lttng rotate #{lttng_session_uuid}") if OPTIONS[:archive]
   exec("lttng destroy #{lttng_session_uuid}")
 end
 
@@ -596,7 +600,23 @@ def lm_babeltrace(backends)
   opts << "--output #{thapi_trace_dir_tmp}"
   opts << "--backends #{backends.join(',')}"
   opts << '--no-discard-metadata' if type == 'aggreg' && OPTIONS.include?(:'kernel-verbose')
-  exec("#{BINDIR}/babeltrace_thapi #{opts.join(' ')} -- #{lttng_trace_dir_tmp}")
+
+  if OPTIONS[:archive]
+    read_file = File.join(lttng_trace_dir_tmp, 'bt_archive_ready')
+    opts << "--archive #{lttng_session_uuid} --session-found-file-path=#{read_file}"
+    cmd = "#{BINDIR}/babeltrace_thapi #{opts.join(' ')} -- #{lttng_trace_dir_tmp}"
+    LOGGER.debug(cmd)
+    pid_bt = spawn(cmd)
+
+    cmd = "laurence.py --log-level=CRITICAL #{lttng_session_uuid} 500"
+    LOGGER.debug(cmd)
+    pid_laurence = spawn(cmd)
+
+    sleep(1) until File.exist?(read_file)
+    [pid_bt, pid_laurence]
+  else
+    exec("#{BINDIR}/babeltrace_thapi #{opts.join(' ')} -- #{lttng_trace_dir_tmp}")
+  end
 end
 
 #   _
@@ -610,7 +630,6 @@ end
 
 def lm_move_to_shared
   raise unless mpi_local_master?
-
   if OPTIONS.include?(:trace) || !OPTIONS[:analysis]
     # The Apps finished, lttng finished, need to move to the shared tmp folder
     FileUtils.mkdir_p(File.dirname(thapi_trace_dir_tmp))
@@ -643,6 +662,7 @@ def gm_rename_folder
   thapi_trace_dir_root
 end
 
+
 # Start, Stop lttng, amd do the on-node analsysis
 def trace_and_on_node_processing(usr_argv)
   # Global barrier at exit
@@ -653,24 +673,37 @@ def trace_and_on_node_processing(usr_argv)
     # All ranks need to set the LLTTNG_HOME env
     # so they can have access to the daemon
     ENV['LTTNG_HOME'] = lttng_home_dir
-    # Only local master spawn LTTNG daemon and start session
-    lm_setup_lttng(backends) if mpi_local_master?
+    LOGGER.debug("LTTNG_HOME = #{ENV.fetch('LTTNG_HOME', nil)}")
+    
+    # Only local master spawn LTTNG daemon, start session, and possible babeltrace archibe
+    pids = if mpi_local_master?
+       lm_setup_lttng(backends)
+       lm_babeltrace(backends) if OPTIONS.include?(:archive)
+    end
+
+    # Other local node cannot start before lttng and the daemon
     syncd.local_barrier('waiting_for_lttng_setup')
+
     # Launch User Command
     launch_usr_bin(h, usr_argv)
-
     # We need to be sure that all the local ranks are finished
     # before the local master stops the lttng session
     syncd.local_barrier('waiting_for_application_ending')
+
+    # Everything from now on is local master processing
     return unless mpi_local_master?
 
     # Stop Lttng session
     lm_lttng_teardown_session
-    # Lttng session is finished,
+    if OPTIONS.include?(:archive)
+      LOGGER.debug("Waiting for babeltrace_thapi and laurence #{pids} to finish")
+      pids.each { |pid| Process.wait(pid) }
+    end
+    # Lttng session, and babeltrace2 finished,
     # we can kill the session daemon
     lm_lttng_kill_sessiond
     # Preprocess trace
-    lm_babeltrace(backends)
+    lm_babeltrace(backends) unless OPTIONS.include?(:archive)
     lm_move_to_shared
   end
   gm_rename_folder if mpi_master?
@@ -767,6 +800,7 @@ if __FILE__ == $PROGRAM_NAME
   parser.on('-b', '--backends BACKENDS', Array, "Select which and how backends' need to handled.",
             'Format: backend_name[:backend_level],...',
             default: ['mpi:3', 'omp:2', 'cl:1', 'ze:1', 'cuda:1', 'hip:1'])
+  parser.on('--[no-]archive', 'Trigger for ardhive support', default: false)
 
   # Analysis
   parser.on('-r', '--replay [PATH]', 'Replay traces for post-mortem analysis.',

From e2424d2e83fd4a01a80974f70bbdc6ea63e1b503 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Fri, 19 Jul 2024 17:32:40 +0000
Subject: [PATCH 02/53] minize diff

---
 xprof/xprof.rb.in | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/xprof/xprof.rb.in b/xprof/xprof.rb.in
index 4edd9bdc..a3dd2a12 100755
--- a/xprof/xprof.rb.in
+++ b/xprof/xprof.rb.in
@@ -590,7 +590,12 @@ end
 #   |_)  _. |_   _  | _|_ ._ _.  _  _     )
 #   |_) (_| |_) (/_ |  |_ | (_| (_ (/_   /_
 #
+<<<<<<< HEAD
 def lm_babeltrace(backends)
+=======
+
+def on_node_processing_babeltrace(backends)
+>>>>>>> minize diff
   raise unless mpi_local_master?
   # No need to run babeltrace_thapi
   return if OPTIONS.include?(:trace) || !OPTIONS[:analysis]
@@ -633,6 +638,11 @@ def lm_move_to_shared
   if OPTIONS.include?(:trace) || !OPTIONS[:analysis]
     # The Apps finished, lttng finished, need to move to the shared tmp folder
     FileUtils.mkdir_p(File.dirname(thapi_trace_dir_tmp))
+    # NOTE: I don't understand `mv`
+    #       File.mv(a, b) will put a into b (aka a/b)
+    #       FileUtils.rename(a,b) will move a as b, but may
+    #         raise Invalid cross-device error.
+    #       So we use `exec(mv -T a b)`, this have the added benefice of logging
     exec("mv #{lttng_trace_dir_tmp} #{thapi_trace_dir_tmp}")
   else
     # `lm_babeltrace` finished, can remove `tmp` folder

From 104853dc68c91236a9e39daec852670d23cbb18d Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Fri, 19 Jul 2024 19:02:23 +0000
Subject: [PATCH 03/53] fix check

---
 xprof/xprof.rb.in | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/xprof/xprof.rb.in b/xprof/xprof.rb.in
index a3dd2a12..7f7065e6 100755
--- a/xprof/xprof.rb.in
+++ b/xprof/xprof.rb.in
@@ -561,7 +561,7 @@ def lm_setup_lttng(backends)
 
   end
 
-  exec("lttng enable-rotation --session=#{lttng_session_uuid} --size=50M --timer=60s") if OPTIONS.include?(:archive)
+  exec("lttng enable-rotation --session=#{lttng_session_uuid} --size=50M --timer=60s") if OPTIONS[:archive]
   exec("lttng start #{lttng_session_uuid}")
   lttng_session_uuid
 end
@@ -688,12 +688,11 @@ def trace_and_on_node_processing(usr_argv)
     # Only local master spawn LTTNG daemon, start session, and possible babeltrace archibe
     pids = if mpi_local_master?
        lm_setup_lttng(backends)
-       lm_babeltrace(backends) if OPTIONS.include?(:archive)
+       lm_babeltrace(backends) if OPTIONS[:archive]
     end
 
     # Other local node cannot start before lttng and the daemon
     syncd.local_barrier('waiting_for_lttng_setup')
-
     # Launch User Command
     launch_usr_bin(h, usr_argv)
     # We need to be sure that all the local ranks are finished
@@ -705,7 +704,7 @@ def trace_and_on_node_processing(usr_argv)
 
     # Stop Lttng session
     lm_lttng_teardown_session
-    if OPTIONS.include?(:archive)
+    if OPTIONS[:archive]
       LOGGER.debug("Waiting for babeltrace_thapi and laurence #{pids} to finish")
       pids.each { |pid| Process.wait(pid) }
     end
@@ -713,7 +712,7 @@ def trace_and_on_node_processing(usr_argv)
     # we can kill the session daemon
     lm_lttng_kill_sessiond
     # Preprocess trace
-    lm_babeltrace(backends) unless OPTIONS.include?(:archive)
+    lm_babeltrace(backends) unless OPTIONS[:archive]
     lm_move_to_shared
   end
   gm_rename_folder if mpi_master?

From 1c6b713a73bca9a0cfa9f585969429c698a5b46e Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <tapplencourt@anl.gov>
Date: Fri, 19 Jul 2024 14:08:45 -0500
Subject: [PATCH 04/53] Update xprof/xprof.rb.in

---
 xprof/xprof.rb.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xprof/xprof.rb.in b/xprof/xprof.rb.in
index 7f7065e6..d89759dd 100755
--- a/xprof/xprof.rb.in
+++ b/xprof/xprof.rb.in
@@ -563,7 +563,6 @@ def lm_setup_lttng(backends)
 
   exec("lttng enable-rotation --session=#{lttng_session_uuid} --size=50M --timer=60s") if OPTIONS[:archive]
   exec("lttng start #{lttng_session_uuid}")
-  lttng_session_uuid
 end
 
 def lm_lttng_teardown_session

From ada3558bd7511d4738254dc6fd3f0eaf9bfb0bb7 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Fri, 19 Jul 2024 19:16:31 +0000
Subject: [PATCH 05/53] typo

---
 xprof/xprof.rb.in | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/xprof/xprof.rb.in b/xprof/xprof.rb.in
index d89759dd..a14766cb 100755
--- a/xprof/xprof.rb.in
+++ b/xprof/xprof.rb.in
@@ -589,12 +589,7 @@ end
 #   |_)  _. |_   _  | _|_ ._ _.  _  _     )
 #   |_) (_| |_) (/_ |  |_ | (_| (_ (/_   /_
 #
-<<<<<<< HEAD
 def lm_babeltrace(backends)
-=======
-
-def on_node_processing_babeltrace(backends)
->>>>>>> minize diff
   raise unless mpi_local_master?
   # No need to run babeltrace_thapi
   return if OPTIONS.include?(:trace) || !OPTIONS[:analysis]
@@ -651,7 +646,6 @@ end
 
 def gm_rename_folder
   raise unless mpi_master?
-
   # All process have put their file into `thapi_trace_dir_tmp/hostname`.
   # `thapi_trace_dir_tmp` is using the MPI_JOB_ID
   # Replace it with a better name, and update the root metadata.

From feadf20294641a0f0a91bcbf8803a91309ada5d2 Mon Sep 17 00:00:00 2001
From: Brice Videau <bvideau@anl.gov>
Date: Mon, 22 Jul 2024 17:12:59 -0500
Subject: [PATCH 06/53] Consistency

---
 utils/babeltrace_thapi.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/utils/babeltrace_thapi.in b/utils/babeltrace_thapi.in
index 1b64b0ba..acfaaa5f 100755
--- a/utils/babeltrace_thapi.in
+++ b/utils/babeltrace_thapi.in
@@ -130,7 +130,7 @@ def get_components(names)
   components_classes = {
     'source.ctf.fs' => BT2::BTPlugin.find('ctf').get_source_component_class_by_name('fs'),
     'source.ctf.lttng_live' => BT2::BTPlugin.find('ctf').get_source_component_class_by_name('lttng-live'),
-    'source.ctf.lttng-archive' => BT2::BTPlugin.find('ctf').get_source_component_class_by_name('lttng-archive'),
+    'source.ctf.lttng_archive' => BT2::BTPlugin.find('ctf').get_source_component_class_by_name('lttng-archive'),
     'filter.utils.muxer' => BT2::BTPlugin.find('utils').get_filter_component_class_by_name('muxer'),
     'sink.text.pretty' => BT2::BTPlugin.find('text').get_sink_component_class_by_name('pretty'),
     'sink.ctf.fs' => BT2::BTPlugin.find('ctf').get_sink_component_class_by_name('fs'),
@@ -201,8 +201,8 @@ def get_and_add_components(graph, names, l_inputs)
       graph.add(comp, 'source_live',
                 params: { 'inputs' => $options[:inputs],
                           'session-not-found-action' => 'end' })
-    when 'source.ctf.lttng-archive'
-      graph.add(comp, 'source-archive',
+    when 'source.ctf.lttng_archive'
+      graph.add(comp, 'source_archive',
                 params: { 'session-name' => $options[:archive],
                           'session-found-file-path' => $options[:'session-found-file-path'] })
     when 'source.ctf.fs'
@@ -288,7 +288,7 @@ def bt_graphs(inputs)
                  'source.ctf.lttng_live'
                elsif $options[:archive]
                   'source.ctf.lttng-archive'
-              else
+               else
                  'source.ctf.fs'
                end]
 

From b3c1591e0c75ce44ae955a05049151ac8c6e5e52 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Tue, 23 Jul 2024 15:50:28 +0000
Subject: [PATCH 07/53] use var

---
 xprof/xprof.rb.in | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/xprof/xprof.rb.in b/xprof/xprof.rb.in
index a14766cb..60d01793 100755
--- a/xprof/xprof.rb.in
+++ b/xprof/xprof.rb.in
@@ -13,6 +13,11 @@ PREFIX = '@prefix@'
 DATAROOTDIR = File.join(PREFIX, 'share')
 DATADIR = DATAROOTDIR
 
+LTTNG_ARCHIVE_SIZE = '50M'
+LTTNG_ARCHIVE_TIMER = '60s'
+LTTNG_DIRWATCH_SIZE = '500' # In MiB
+LTTNG_DIRWATCH_LOCK_RETRY_DELAY = 0.1
+
 $LOAD_PATH.unshift(DATADIR) if File.directory?(DATADIR)
 require 'open3'
 require 'fileutils'
@@ -561,7 +566,9 @@ def lm_setup_lttng(backends)
 
   end
 
-  exec("lttng enable-rotation --session=#{lttng_session_uuid} --size=50M --timer=60s") if OPTIONS[:archive]
+  if OPTIONS[:archive]
+    exec("lttng enable-rotation --session=#{lttng_session_uuid} --size=#{LTTNG_ARCHIVE_SIZE} --timer=#{LTTNG_ARCHIVE_TIMER}")
+  end
   exec("lttng start #{lttng_session_uuid}")
 end
 
@@ -607,11 +614,11 @@ def lm_babeltrace(backends)
     LOGGER.debug(cmd)
     pid_bt = spawn(cmd)
 
-    cmd = "laurence.py --log-level=CRITICAL #{lttng_session_uuid} 500"
+    cmd = "laurence.py --log-level=CRITICAL #{lttng_session_uuid} #{LTTNG_DIRWATCH_SIZE}"
     LOGGER.debug(cmd)
     pid_laurence = spawn(cmd)
 
-    sleep(1) until File.exist?(read_file)
+    sleep(LTTNG_DIRWATCH_LOCK_RETRY_DELAY) until File.exist?(read_file)
     [pid_bt, pid_laurence]
   else
     exec("#{BINDIR}/babeltrace_thapi #{opts.join(' ')} -- #{lttng_trace_dir_tmp}")
@@ -665,7 +672,6 @@ def gm_rename_folder
   thapi_trace_dir_root
 end
 
-
 # Start, Stop lttng, amd do the on-node analsysis
 def trace_and_on_node_processing(usr_argv)
   # Global barrier at exit

From cc295177b0ecec5da43c0c61fa59ef28422cea88 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Tue, 23 Jul 2024 16:31:24 +0000
Subject: [PATCH 08/53] archive name

---
 utils/babeltrace_thapi.in | 4 ++--
 xprof/xprof.rb.in         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/utils/babeltrace_thapi.in b/utils/babeltrace_thapi.in
index acfaaa5f..66e92ea2 100755
--- a/utils/babeltrace_thapi.in
+++ b/utils/babeltrace_thapi.in
@@ -204,7 +204,7 @@ def get_and_add_components(graph, names, l_inputs)
     when 'source.ctf.lttng_archive'
       graph.add(comp, 'source_archive',
                 params: { 'session-name' => $options[:archive],
-                          'session-found-file-path' => $options[:'session-found-file-path'] })
+                          'session-found-file-path' => $options[:'archive-session-found-file-path'] })
     when 'source.ctf.fs'
       s = Find.find(*l_inputs)
               .reject { |path| FileTest.directory?(path) }
@@ -362,7 +362,7 @@ class BabeltraceParserThapi < OptionParserWithDefaultAndValidation
         default: ['mpi:3', 'omp:2', 'cl:1', 'ze:1', 'cuda:1', 'hip:1'])
     on('--debug', default: false)
     on('--archive SESSION-NAME')
-    on('--session-found-file-path PATH')
+    on('--archive-session-found-file-path PATH')
     on('--[no-]muxer')
     on('-v', '--version', 'Print the version string') do
       puts File.read(File.join(DATADIR, 'version'))
diff --git a/xprof/xprof.rb.in b/xprof/xprof.rb.in
index 60d01793..900395fa 100755
--- a/xprof/xprof.rb.in
+++ b/xprof/xprof.rb.in
@@ -609,7 +609,7 @@ def lm_babeltrace(backends)
 
   if OPTIONS[:archive]
     read_file = File.join(lttng_trace_dir_tmp, 'bt_archive_ready')
-    opts << "--archive #{lttng_session_uuid} --session-found-file-path=#{read_file}"
+    opts << "--archive #{lttng_session_uuid} --archive-session-found-file-path=#{read_file}"
     cmd = "#{BINDIR}/babeltrace_thapi #{opts.join(' ')} -- #{lttng_trace_dir_tmp}"
     LOGGER.debug(cmd)
     pid_bt = spawn(cmd)

From 8d285e7454a70aabe0a1c789d01ef0a5c3b30ba3 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <tapplencourt@anl.gov>
Date: Tue, 23 Jul 2024 11:31:43 -0500
Subject: [PATCH 09/53] Update xprof/xprof.rb.in

Co-authored-by: Brice Videau <bvideau@anl.gov>
---
 xprof/xprof.rb.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xprof/xprof.rb.in b/xprof/xprof.rb.in
index 900395fa..108778cf 100755
--- a/xprof/xprof.rb.in
+++ b/xprof/xprof.rb.in
@@ -689,7 +689,6 @@ def trace_and_on_node_processing(usr_argv)
        lm_setup_lttng(backends)
        lm_babeltrace(backends) if OPTIONS[:archive]
     end
-
     # Other local node cannot start before lttng and the daemon
     syncd.local_barrier('waiting_for_lttng_setup')
     # Launch User Command

From ff1d22557522956c8dcedd28c10813035dc2cf5e Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Tue, 23 Jul 2024 22:13:26 +0000
Subject: [PATCH 10/53] new name for daemon

---
 xprof/xprof.rb.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xprof/xprof.rb.in b/xprof/xprof.rb.in
index 108778cf..527d6b3c 100755
--- a/xprof/xprof.rb.in
+++ b/xprof/xprof.rb.in
@@ -614,7 +614,7 @@ def lm_babeltrace(backends)
     LOGGER.debug(cmd)
     pid_bt = spawn(cmd)
 
-    cmd = "laurence.py --log-level=CRITICAL #{lttng_session_uuid} #{LTTNG_DIRWATCH_SIZE}"
+    cmd = "dirwatch.py --log-level=CRITICAL #{lttng_session_uuid} #{LTTNG_DIRWATCH_SIZE}"
     LOGGER.debug(cmd)
     pid_laurence = spawn(cmd)
 

From 3f740393250a82d6a4989a070b03c95fe3c0ce9a Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <tapplencourt@anl.gov>
Date: Mon, 19 Aug 2024 15:55:41 -0500
Subject: [PATCH 11/53] Update presubmit.yml

---
 .github/workflows/presubmit.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 0901bb69..140e2594 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -30,13 +30,11 @@ jobs:
           key: ${{ runner.os }}-build-${{ env.cache-name }}
       - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler libglib2.0-dev
         if: steps.babeltrace2.outputs.cache-hit != 'true'
-      - run: wget https://www.efficios.com/files/babeltrace/babeltrace2-2.0.5.tar.bz2
-        if: steps.babeltrace2.outputs.cache-hit != 'true'
-      - run: tar -xjvf babeltrace2-2.0.5.tar.bz2
+      - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/babeltrace.git babeltrace2-2.0.5
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |
-          wget https://github.com/argonne-lcf/THAPI-spack/raw/main/packages/babeltrace2/d2d2e6cc.patch
-          patch -p1 < d2d2e6cc.patch
+          wget https://github.com/argonne-lcf/THAPI-spack/raw/main/packages/babeltrace2/d2d2e6cc_cpp.patch
+          patch -p1 < d2d2e6cc_cpp.patch
         if: steps.babeltrace2.outputs.cache-hit != 'true'
         working-directory: babeltrace2-2.0.5
       - run: mkdir -p babeltrace2-2.0.5/build

From 329fdf501e860f5cc5f00fe5c8170a3b136c3c2c Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Mon, 19 Aug 2024 21:26:25 +0000
Subject: [PATCH 12/53] new patch

---
 .github/workflows/presubmit.yml     |  3 +--
 .github/workflows/str_nullptr.patch | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/str_nullptr.patch

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 140e2594..a5b55c09 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -33,8 +33,7 @@ jobs:
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/babeltrace.git babeltrace2-2.0.5
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |
-          wget https://github.com/argonne-lcf/THAPI-spack/raw/main/packages/babeltrace2/d2d2e6cc_cpp.patch
-          patch -p1 < d2d2e6cc_cpp.patch
+          patch -p1 < ../THAPI/.github/workflows/str_nullptr.patch
         if: steps.babeltrace2.outputs.cache-hit != 'true'
         working-directory: babeltrace2-2.0.5
       - run: mkdir -p babeltrace2-2.0.5/build
diff --git a/.github/workflows/str_nullptr.patch b/.github/workflows/str_nullptr.patch
new file mode 100644
index 00000000..a7e53631
--- /dev/null
+++ b/.github/workflows/str_nullptr.patch
@@ -0,0 +1,17 @@
+diff --git a/src/plugins/ctf/common/src/msg-iter.cpp b/src/plugins/ctf/common/src/msg-iter.cpp
+index 36e2088b..eacce78a 100644
+--- a/src/plugins/ctf/common/src/msg-iter.cpp
++++ b/src/plugins/ctf/common/src/msg-iter.cpp
+@@ -775,12 +775,6 @@ void MsgIter::_handleStrRawDataItem(const RawDataItem& item)
+             }
+         });
+
+-        if (afterNullCpIt) {
+-            /* Found U+0000 */
+-            endIt = *afterNullCpIt;
+-            _mHaveNullChar = true;
+-        }
+-
+         /* Append to current string buffer */
+         _mStrBuf.insert(_mStrBuf.end(), item.data().begin(), endIt);
+     }

From e894a08060f04f702e10e9a105c91f6a18940a1c Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Mon, 19 Aug 2024 21:31:02 +0000
Subject: [PATCH 13/53] fix url

---
 .github/workflows/presubmit.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index a5b55c09..bd0b5c10 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -33,7 +33,8 @@ jobs:
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/babeltrace.git babeltrace2-2.0.5
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |
-          patch -p1 < ../THAPI/.github/workflows/str_nullptr.patch
+          wget https://github.com/argonne-lcf/THAPI/blob/53262fcaaaf45d7d475884d7e63b69abe47e41d6/.github/workflows/str_nullptr.patch
+          patch -p1 < str_nullptr.patch
         if: steps.babeltrace2.outputs.cache-hit != 'true'
         working-directory: babeltrace2-2.0.5
       - run: mkdir -p babeltrace2-2.0.5/build

From 1a93b76779cf233a81d79846c7b36fc0c7946f5f Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Mon, 19 Aug 2024 21:32:46 +0000
Subject: [PATCH 14/53] raw...

---
 .github/workflows/presubmit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index bd0b5c10..621f510e 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -33,7 +33,7 @@ jobs:
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/babeltrace.git babeltrace2-2.0.5
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |
-          wget https://github.com/argonne-lcf/THAPI/blob/53262fcaaaf45d7d475884d7e63b69abe47e41d6/.github/workflows/str_nullptr.patch
+          wget https://raw.githubusercontent.com/argonne-lcf/THAPI/53262fcaaaf45d7d475884d7e63b69abe47e41d6/.github/workflows/str_nullptr.patch 
           patch -p1 < str_nullptr.patch
         if: steps.babeltrace2.outputs.cache-hit != 'true'
         working-directory: babeltrace2-2.0.5

From 60647b6973e97003ac392aa635f3eaddead6a3cb Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Mon, 19 Aug 2024 21:37:14 +0000
Subject: [PATCH 15/53] boostrap

---
 .github/workflows/presubmit.yml | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 621f510e..3f014d69 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -35,20 +35,15 @@ jobs:
       - run: |
           wget https://raw.githubusercontent.com/argonne-lcf/THAPI/53262fcaaaf45d7d475884d7e63b69abe47e41d6/.github/workflows/str_nullptr.patch 
           patch -p1 < str_nullptr.patch
-        if: steps.babeltrace2.outputs.cache-hit != 'true'
         working-directory: babeltrace2-2.0.5
-      - run: mkdir -p babeltrace2-2.0.5/build
-        if: steps.babeltrace2.outputs.cache-hit != 'true'
-      - run: ../configure --prefix=$HOME/babeltrace2/2.0.5
-        if: steps.babeltrace2.outputs.cache-hit != 'true'
-        working-directory: babeltrace2-2.0.5/build
-      - run: make -j
         if: steps.babeltrace2.outputs.cache-hit != 'true'
-        working-directory: babeltrace2-2.0.5/build
-      - run: make -j install
+      - run: |
+          ./bootstrap
+          ./configure --prefix=$HOME/babeltrace2/2.0.5
+          make -j
+          make install
         if: steps.babeltrace2.outputs.cache-hit != 'true'
-        working-directory: babeltrace2-2.0.5/build
-
+        working-directory: babeltrace2-2.0.5
   build-and-check:
     needs: [babeltrace2, pre_job]
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}

From 9ac9407fd355110e262634e2e051a393803c6ea2 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <tapplencourt@anl.gov>
Date: Mon, 19 Aug 2024 17:10:25 -0500
Subject: [PATCH 16/53] Update presubmit.yml

---
 .github/workflows/presubmit.yml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 3f014d69..5d6847e9 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -14,10 +14,23 @@ jobs:
           skip_after_successful_duplicate: 'true'
           paths_ignore: '["**/README.md"]'
           do_not_skip: '["pull_request"]'
-
-  babeltrace2:
+  lttng-tools:
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
+    name: Build lttng-tools
+    runs-on: ubuntu-latest
+    steps:
+      - run: sudo apt update; sudo apt install -y gcc g++
+      - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/lttng-tools.git
+      - run: |
+         ./bootstrap
+         ./configure --disable-bin-lttng-crash --prefix=$HOME/babeltrace2/2.0.4
+         make -j
+         make install
+        working-directory: lttng-tools
+  babeltrace2:
+    needs: [pre_job,lttng-tools]
+    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     name: Build and cache Babeltrace2
     runs-on: ubuntu-24.04
     steps:

From 64f04c43f02e16466dc97ddb680c1276ca8ff811 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <tapplencourt@anl.gov>
Date: Mon, 19 Aug 2024 17:12:54 -0500
Subject: [PATCH 17/53] Update presubmit.yml

---
 .github/workflows/presubmit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 5d6847e9..f5fcda7e 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -20,7 +20,7 @@ jobs:
     name: Build lttng-tools
     runs-on: ubuntu-latest
     steps:
-      - run: sudo apt update; sudo apt install -y gcc g++
+      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/lttng-tools.git
       - run: |
          ./bootstrap

From 88da618ce7ec1b8a021e6150c048e4a5a8c19171 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <tapplencourt@anl.gov>
Date: Mon, 19 Aug 2024 17:15:32 -0500
Subject: [PATCH 18/53] Update presubmit.yml

---
 .github/workflows/presubmit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index f5fcda7e..1a897d32 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -20,7 +20,7 @@ jobs:
     name: Build lttng-tools
     runs-on: ubuntu-latest
     steps:
-      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev liburcu-dev
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/lttng-tools.git
       - run: |
          ./bootstrap

From e07ed69f0fd4609deb060ee60d7c9d753bc1af17 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <tapplencourt@anl.gov>
Date: Mon, 19 Aug 2024 17:23:39 -0500
Subject: [PATCH 19/53] Update presubmit.yml

---
 .github/workflows/presubmit.yml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 1a897d32..64d4e636 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -14,13 +14,33 @@ jobs:
           skip_after_successful_duplicate: 'true'
           paths_ignore: '["**/README.md"]'
           do_not_skip: '["pull_request"]'
+  userspace-rcu:
+    needs: pre_job
+    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
+    name: Build urcu
+    runs-on: ubuntu-latest
+    steps:
+      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev
+      - run: git clone https://github.com/urcu/userspace-rcu
+      - run: |
+         ./bootstrap
+         ./configure --prefix=$HOME/babeltrace2/2.0.4
+         make -j 32 install
+        working-directory: userspace-rcu
   lttng-tools:
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     name: Build lttng-tools
     runs-on: ubuntu-latest
     steps:
-      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev liburcu-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev
+      - name: Load Env
+        run: |
+          echo "$HOME/babeltrace2/2.0.4/bin" >> $GITHUB_PATH
+          echo "PKG_CONFIG_PATH=$HOME/babeltrace2/2.0.4/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
+          echo "CPATH=$HOME/babeltrace2/2.0.4/include:$CPATH" >> $GITHUB_ENV
+          echo "LD_LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
+          echo "LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LIBRARY_PATH" >> $GITHUB_ENV
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/lttng-tools.git
       - run: |
          ./bootstrap

From 17916472bf8266204689f870255c35e4734201e9 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <tapplencourt@anl.gov>
Date: Mon, 19 Aug 2024 17:26:26 -0500
Subject: [PATCH 20/53] Update presubmit.yml

---
 .github/workflows/presubmit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 64d4e636..bb29baf7 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -28,7 +28,7 @@ jobs:
          make -j 32 install
         working-directory: userspace-rcu
   lttng-tools:
-    needs: pre_job
+    needs: [pre_job, userspace-rcu]
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     name: Build lttng-tools
     runs-on: ubuntu-latest

From 56b4f760259edb2719274586faf8c8a5a7f7cf94 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Tue, 20 Aug 2024 16:09:53 +0000
Subject: [PATCH 21/53] test merge

---
 .github/workflows/presubmit.yml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index bb29baf7..2bcf1b66 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -17,23 +17,9 @@ jobs:
   userspace-rcu:
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
-    name: Build urcu
+    name: Build urcu and lttng-tools
     runs-on: ubuntu-latest
     steps:
-      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev
-      - run: git clone https://github.com/urcu/userspace-rcu
-      - run: |
-         ./bootstrap
-         ./configure --prefix=$HOME/babeltrace2/2.0.4
-         make -j 32 install
-        working-directory: userspace-rcu
-  lttng-tools:
-    needs: [pre_job, userspace-rcu]
-    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
-    name: Build lttng-tools
-    runs-on: ubuntu-latest
-    steps:
-      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev
       - name: Load Env
         run: |
           echo "$HOME/babeltrace2/2.0.4/bin" >> $GITHUB_PATH
@@ -41,6 +27,13 @@ jobs:
           echo "CPATH=$HOME/babeltrace2/2.0.4/include:$CPATH" >> $GITHUB_ENV
           echo "LD_LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
           echo "LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LIBRARY_PATH" >> $GITHUB_ENV
+      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev
+      - run: git clone https://github.com/urcu/userspace-rcu
+      - run: |
+         ./bootstrap
+         ./configure --prefix=$HOME/babeltrace2/2.0.4
+         make -j 32 install
+        working-directory: userspace-rcu
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/lttng-tools.git
       - run: |
          ./bootstrap

From 9c9d02617b4caa8f84e333720db78cd247ea36c8 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Tue, 20 Aug 2024 16:10:32 +0000
Subject: [PATCH 22/53] fix deps

---
 .github/workflows/presubmit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 2bcf1b66..0581084f 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -42,7 +42,7 @@ jobs:
          make install
         working-directory: lttng-tools
   babeltrace2:
-    needs: [pre_job,lttng-tools]
+    needs: [pre_job,userspace-rcu]
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     name: Build and cache Babeltrace2
     runs-on: ubuntu-24.04

From 5df33d4c9d3c7df724fe886249556411e462df8c Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Tue, 20 Aug 2024 16:12:50 +0000
Subject: [PATCH 23/53] fix depnds

---
 .github/workflows/presubmit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 0581084f..153374c0 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -27,7 +27,7 @@ jobs:
           echo "CPATH=$HOME/babeltrace2/2.0.4/include:$CPATH" >> $GITHUB_ENV
           echo "LD_LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
           echo "LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LIBRARY_PATH" >> $GITHUB_ENV
-      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev liblttng-ust-dev
       - run: git clone https://github.com/urcu/userspace-rcu
       - run: |
          ./bootstrap

From 2cb10d20cbbd10bd6847b13006234e2b7fe5e8b3 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Tue, 20 Aug 2024 16:17:12 +0000
Subject: [PATCH 24/53] lttng ust

---
 .github/workflows/presubmit.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 153374c0..618843c5 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -34,6 +34,12 @@ jobs:
          ./configure --prefix=$HOME/babeltrace2/2.0.4
          make -j 32 install
         working-directory: userspace-rcu
+      - run: git clone https://github.com/lttng/lttng-ust
+      - run: |
+         ./bootstrap
+         ./configure --prefix=$HOME/babeltrace2/2.0.4
+         make -j 32 install
+        working-directory: lttng-ust
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/lttng-tools.git
       - run: |
          ./bootstrap

From 7ff0704285e34e3daf845ea44b0aecf301df1b36 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Tue, 20 Aug 2024 16:19:09 +0000
Subject: [PATCH 25/53] libnuma

---
 .github/workflows/presubmit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 618843c5..2a837979 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -27,7 +27,7 @@ jobs:
           echo "CPATH=$HOME/babeltrace2/2.0.4/include:$CPATH" >> $GITHUB_ENV
           echo "LD_LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
           echo "LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LIBRARY_PATH" >> $GITHUB_ENV
-      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev liblttng-ust-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev
       - run: git clone https://github.com/urcu/userspace-rcu
       - run: |
          ./bootstrap

From 844479359b5eb58147c6654f2963c9dee4688898 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Tue, 20 Aug 2024 16:20:43 +0000
Subject: [PATCH 26/53] add space

---
 .github/workflows/presubmit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 2a837979..6422f3f3 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -27,7 +27,7 @@ jobs:
           echo "CPATH=$HOME/babeltrace2/2.0.4/include:$CPATH" >> $GITHUB_ENV
           echo "LD_LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
           echo "LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LIBRARY_PATH" >> $GITHUB_ENV
-      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev 
       - run: git clone https://github.com/urcu/userspace-rcu
       - run: |
          ./bootstrap

From f33dfe5bfbdd87e1a8bb4addbce40b953c701962 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Tue, 20 Aug 2024 16:24:00 +0000
Subject: [PATCH 27/53] no mange page

---
 .github/workflows/presubmit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 6422f3f3..f9226396 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -37,7 +37,7 @@ jobs:
       - run: git clone https://github.com/lttng/lttng-ust
       - run: |
          ./bootstrap
-         ./configure --prefix=$HOME/babeltrace2/2.0.4
+         ./configure --disable-man-pages --prefix=$HOME/babeltrace2/2.0.4
          make -j 32 install
         working-directory: lttng-ust
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/lttng-tools.git

From b09052495f8cbc074d952a5b377f01e0e39130d8 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Tue, 20 Aug 2024 16:50:41 +0000
Subject: [PATCH 28/53] urcu 14

---
 .github/workflows/presubmit.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index f9226396..5c961881 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -28,18 +28,20 @@ jobs:
           echo "LD_LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
           echo "LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LIBRARY_PATH" >> $GITHUB_ENV
       - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev 
-      - run: git clone https://github.com/urcu/userspace-rcu
+      - run: git clone -b stable-0.14 https://github.com/urcu/userspace-rcu
       - run: |
          ./bootstrap
          ./configure --prefix=$HOME/babeltrace2/2.0.4
          make -j 32 install
         working-directory: userspace-rcu
+      # Not yet any relase for 2.14, so take master
       - run: git clone https://github.com/lttng/lttng-ust
       - run: |
          ./bootstrap
          ./configure --disable-man-pages --prefix=$HOME/babeltrace2/2.0.4
          make -j 32 install
         working-directory: lttng-ust
+      # lttng-tools need lttng-ust 2.14+
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/lttng-tools.git
       - run: |
          ./bootstrap

From 6acc77d6c2ca9f99cec7200d2d7f285069441dee Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <tapplencourt@anl.gov>
Date: Tue, 20 Aug 2024 12:48:37 -0500
Subject: [PATCH 29/53] Update presubmit.yml

---
 .github/workflows/presubmit.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 5c961881..ad83c77f 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -27,14 +27,15 @@ jobs:
           echo "CPATH=$HOME/babeltrace2/2.0.4/include:$CPATH" >> $GITHUB_ENV
           echo "LD_LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
           echo "LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LIBRARY_PATH" >> $GITHUB_ENV
-      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev 
+      - run: ls /usr/include/
+      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev libc-dev
       - run: git clone -b stable-0.14 https://github.com/urcu/userspace-rcu
       - run: |
          ./bootstrap
          ./configure --prefix=$HOME/babeltrace2/2.0.4
          make -j 32 install
         working-directory: userspace-rcu
-      # Not yet any relase for 2.14, so take master
+      # Not yet any release for 2.14, so take master
       - run: git clone https://github.com/lttng/lttng-ust
       - run: |
          ./bootstrap

From afd5879ae555df3a88fb35b0f55eac2417bf791a Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Tue, 20 Aug 2024 19:27:47 +0000
Subject: [PATCH 30/53] split make and install

---
 .github/workflows/presubmit.yml | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index ad83c77f..bb7898e5 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -18,35 +18,25 @@ jobs:
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     name: Build urcu and lttng-tools
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-ubuntu-24.04
     steps:
       - name: Load Env
         run: |
-          echo "$HOME/babeltrace2/2.0.4/bin" >> $GITHUB_PATH
-          echo "PKG_CONFIG_PATH=$HOME/babeltrace2/2.0.4/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
-          echo "CPATH=$HOME/babeltrace2/2.0.4/include:$CPATH" >> $GITHUB_ENV
-          echo "LD_LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
-          echo "LIBRARY_PATH=$HOME/babeltrace2/2.0.4/lib:$LIBRARY_PATH" >> $GITHUB_ENV
+          echo "PKG_CONFIG_PATH=$HOME/babeltrace2/2.0.5/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
       - run: ls /usr/include/
-      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev libc-dev
-      - run: git clone -b stable-0.14 https://github.com/urcu/userspace-rcu
-      - run: |
-         ./bootstrap
-         ./configure --prefix=$HOME/babeltrace2/2.0.4
-         make -j 32 install
-        working-directory: userspace-rcu
-      # Not yet any release for 2.14, so take master
+      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev liburcu-dev libc-dev
       - run: git clone https://github.com/lttng/lttng-ust
       - run: |
          ./bootstrap
-         ./configure --disable-man-pages --prefix=$HOME/babeltrace2/2.0.4
-         make -j 32 install
+         ./configure --disable-man-pages --prefix=$HOME/babeltrace2/2.0.5
+         make -j
+         make install
         working-directory: lttng-ust
       # lttng-tools need lttng-ust 2.14+
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/lttng-tools.git
       - run: |
          ./bootstrap
-         ./configure --disable-bin-lttng-crash --prefix=$HOME/babeltrace2/2.0.4
+         ./configure --disable-man-pages --disable-bin-lttng-crash --prefix=$HOME/babeltrace2/2.0.5
          make -j
          make install
         working-directory: lttng-tools
@@ -74,7 +64,7 @@ jobs:
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |
           ./bootstrap
-          ./configure --prefix=$HOME/babeltrace2/2.0.5
+          ./configure --disable-man-pages --prefix=$HOME/babeltrace2/2.0.5
           make -j
           make install
         if: steps.babeltrace2.outputs.cache-hit != 'true'

From cdb023ecb95baccd565aff7d2340d2536c789728 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <apl@anl.gov>
Date: Tue, 20 Aug 2024 19:31:26 +0000
Subject: [PATCH 31/53] fix typos

---
 .github/workflows/presubmit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index bb7898e5..79c71e0f 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -18,7 +18,7 @@ jobs:
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     name: Build urcu and lttng-tools
-    runs-on: ubuntu-ubuntu-24.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Load Env
         run: |

From a8450ad5fd20de26b57febdfa4562a8e6d7327bf Mon Sep 17 00:00:00 2001
From: tapplencourt <tapplencourt@anl.gov>
Date: Wed, 21 Aug 2024 15:44:34 -0500
Subject: [PATCH 32/53] install

---
 .github/workflows/presubmit.yml | 48 ++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 79c71e0f..8dab189d 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -14,46 +14,43 @@ jobs:
           skip_after_successful_duplicate: 'true'
           paths_ignore: '["**/README.md"]'
           do_not_skip: '["pull_request"]'
-  userspace-rcu:
+
+  babeltrace2:
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     name: Build urcu and lttng-tools
     runs-on: ubuntu-24.04
     steps:
+      - uses: actions/cache@v4
+        id: babeltrace2
+        env:
+          cache-name: cache-babeltrace2
+        with:
+          path: ~/babeltrace2/2.0.5
+          key: ${{ runner.os }}-build-${{ env.cache-name }}
       - name: Load Env
         run: |
           echo "PKG_CONFIG_PATH=$HOME/babeltrace2/2.0.5/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
-      - run: ls /usr/include/
       - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev liburcu-dev libc-dev
+        if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: git clone https://github.com/lttng/lttng-ust
+        if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |
-         ./bootstrap
-         ./configure --disable-man-pages --prefix=$HOME/babeltrace2/2.0.5
-         make -j
-         make install
+          ./bootstrap
+          ./configure --disable-man-pages --prefix=$HOME/babeltrace2/2.0.5
+          make -j
+          make install
         working-directory: lttng-ust
+        if: steps.babeltrace2.outputs.cache-hit != 'true'
       # lttng-tools need lttng-ust 2.14+
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/lttng-tools.git
+        if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |
-         ./bootstrap
-         ./configure --disable-man-pages --disable-bin-lttng-crash --prefix=$HOME/babeltrace2/2.0.5
-         make -j
-         make install
+          ./bootstrap
+          ./configure --disable-man-pages --disable-bin-lttng-crash --prefix=$HOME/babeltrace2/2.0.5
+          make -j
+          make install
         working-directory: lttng-tools
-  babeltrace2:
-    needs: [pre_job,userspace-rcu]
-    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
-    name: Build and cache Babeltrace2
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/cache@v4
-        id: babeltrace2
-        env:
-          cache-name: cache-babeltrace2
-        with:
-          path: ~/babeltrace2/2.0.5
-          key: ${{ runner.os }}-build-${{ env.cache-name }}
-      - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler libglib2.0-dev
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/babeltrace.git babeltrace2-2.0.5
         if: steps.babeltrace2.outputs.cache-hit != 'true'
@@ -67,8 +64,9 @@ jobs:
           ./configure --disable-man-pages --prefix=$HOME/babeltrace2/2.0.5
           make -j
           make install
-        if: steps.babeltrace2.outputs.cache-hit != 'true'
         working-directory: babeltrace2-2.0.5
+        if: steps.babeltrace2.outputs.cache-hit != 'true'
+
   build-and-check:
     needs: [babeltrace2, pre_job]
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}

From e16a82bd09cde3a0ae8b616f40f6b21853ded774 Mon Sep 17 00:00:00 2001
From: tapplencourt <tapplencourt@anl.gov>
Date: Wed, 21 Aug 2024 15:58:58 -0500
Subject: [PATCH 33/53] fix other stuff

---
 .github/workflows/presubmit.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 8dab189d..75cb388c 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -33,12 +33,13 @@ jobs:
           echo "PKG_CONFIG_PATH=$HOME/babeltrace2/2.0.5/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
       - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev liburcu-dev libc-dev
         if: steps.babeltrace2.outputs.cache-hit != 'true'
+      # lttng-ust
       - run: git clone https://github.com/lttng/lttng-ust
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |
           ./bootstrap
           ./configure --disable-man-pages --prefix=$HOME/babeltrace2/2.0.5
-          make -j
+          make -j$(nproc)
           make install
         working-directory: lttng-ust
         if: steps.babeltrace2.outputs.cache-hit != 'true'
@@ -48,10 +49,11 @@ jobs:
       - run: |
           ./bootstrap
           ./configure --disable-man-pages --disable-bin-lttng-crash --prefix=$HOME/babeltrace2/2.0.5
-          make -j
+          make -j$(nproc)
           make install
         working-directory: lttng-tools
         if: steps.babeltrace2.outputs.cache-hit != 'true'
+     # babeltrace
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/babeltrace.git babeltrace2-2.0.5
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |
@@ -62,7 +64,7 @@ jobs:
       - run: |
           ./bootstrap
           ./configure --disable-man-pages --prefix=$HOME/babeltrace2/2.0.5
-          make -j
+          make -j$(nproc)
           make install
         working-directory: babeltrace2-2.0.5
         if: steps.babeltrace2.outputs.cache-hit != 'true'
@@ -81,7 +83,7 @@ jobs:
         with:
           path: ~/babeltrace2/2.0.5
           key: ${{ runner.os }}-build-${{ env.cache-name }}
-      - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev liburcu-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
       - name: Load Babeltrace2
         run: |

From 0d72c6d0f31ca25f50d81b4e2b839214ff80859a Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <tapplencourt@anl.gov>
Date: Fri, 23 Aug 2024 14:55:21 -0500
Subject: [PATCH 34/53] Update presubmit.yml

---
 .github/workflows/presubmit.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 75cb388c..72490356 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -47,6 +47,7 @@ jobs:
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/lttng-tools.git
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |
+          export CPLUS_INCLUDE_PATH=./src/bin/lttng-sessiond/:$CPLUS_INCLUDE_PATH
           ./bootstrap
           ./configure --disable-man-pages --disable-bin-lttng-crash --prefix=$HOME/babeltrace2/2.0.5
           make -j$(nproc)

From a3de9e907c52afb02282ca63b63d094b0d6b4e6d Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <tapplencourt@anl.gov>
Date: Fri, 23 Aug 2024 15:26:00 -0500
Subject: [PATCH 35/53] Update presubmit.yml

---
 .github/workflows/presubmit.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 72490356..736ee2a1 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -37,6 +37,9 @@ jobs:
       - run: git clone https://github.com/lttng/lttng-ust
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |
+           # Avoid https://github.com/lttng/lttng-ust/commit/b187bcd5d99cde54dececee0e5028524d55aa314 who change the signature of 
+           # lttng_ust_ctl_recv_register_event used by lttng-tool anl-ms3
+           git checkout 4f8afc535e77070f1ef00434674f0417c6f9ef69 
           ./bootstrap
           ./configure --disable-man-pages --prefix=$HOME/babeltrace2/2.0.5
           make -j$(nproc)
@@ -47,7 +50,6 @@ jobs:
       - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/lttng-tools.git
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |
-          export CPLUS_INCLUDE_PATH=./src/bin/lttng-sessiond/:$CPLUS_INCLUDE_PATH
           ./bootstrap
           ./configure --disable-man-pages --disable-bin-lttng-crash --prefix=$HOME/babeltrace2/2.0.5
           make -j$(nproc)

From be1dabd184b47531fb40ccbcc604bb6841471b33 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0010.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Fri, 23 Aug 2024 20:36:15 +0000
Subject: [PATCH 36/53] indent

---
 .github/workflows/presubmit.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 736ee2a1..88ea26a4 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -37,9 +37,9 @@ jobs:
       - run: git clone https://github.com/lttng/lttng-ust
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |
-           # Avoid https://github.com/lttng/lttng-ust/commit/b187bcd5d99cde54dececee0e5028524d55aa314 who change the signature of 
-           # lttng_ust_ctl_recv_register_event used by lttng-tool anl-ms3
-           git checkout 4f8afc535e77070f1ef00434674f0417c6f9ef69 
+          # Avoid https://github.com/lttng/lttng-ust/commit/b187bcd5d99cde54dececee0e5028524d55aa314 who change the signature of 
+          # lttng_ust_ctl_recv_register_event used by lttng-tool anl-ms3
+          git checkout 4f8afc535e77070f1ef00434674f0417c6f9ef69 
           ./bootstrap
           ./configure --disable-man-pages --prefix=$HOME/babeltrace2/2.0.5
           make -j$(nproc)

From 9f1be42000dc17ef23f394df4eb8647805c14670 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0010.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Fri, 23 Aug 2024 20:44:19 +0000
Subject: [PATCH 37/53] libglib2.0-dev

---
 .github/workflows/presubmit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 88ea26a4..ecdaa44b 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Load Env
         run: |
           echo "PKG_CONFIG_PATH=$HOME/babeltrace2/2.0.5/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
-      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev liburcu-dev libc-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev liburcu-dev libc-dev libglib2.0-dev
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       # lttng-ust
       - run: git clone https://github.com/lttng/lttng-ust

From 5b56ae42b568055b400bc35b9257309494d88c02 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0010.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Fri, 23 Aug 2024 21:08:51 +0000
Subject: [PATCH 38/53] elf

---
 .github/workflows/presubmit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index ecdaa44b..4cb312d5 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Load Env
         run: |
           echo "PKG_CONFIG_PATH=$HOME/babeltrace2/2.0.5/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
-      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev liburcu-dev libc-dev libglib2.0-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev liburcu-dev libc-dev libglib2.0-dev elfutils libelf-dev
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       # lttng-ust
       - run: git clone https://github.com/lttng/lttng-ust

From a507d96f863ddf8358ed4d26a7fee140c865d9dd Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0010.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Fri, 23 Aug 2024 21:18:17 +0000
Subject: [PATCH 39/53] libdw-dev

---
 .github/workflows/presubmit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 4cb312d5..5f3a7eed 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Load Env
         run: |
           echo "PKG_CONFIG_PATH=$HOME/babeltrace2/2.0.5/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
-      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev liburcu-dev libc-dev libglib2.0-dev elfutils libelf-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev liburcu-dev libc-dev libglib2.0-dev elfutils libelf-dev libdw-dev
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       # lttng-ust
       - run: git clone https://github.com/lttng/lttng-ust

From 8e5ab8f9fb1a0090c217ae2d3bb19965a3580233 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt <tapplencourt@anl.gov>
Date: Fri, 23 Aug 2024 16:36:27 -0500
Subject: [PATCH 40/53] Update presubmit.yml

---
 .github/workflows/presubmit.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 5f3a7eed..c3b02a14 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -57,19 +57,19 @@ jobs:
         working-directory: lttng-tools
         if: steps.babeltrace2.outputs.cache-hit != 'true'
      # babeltrace
-      - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/babeltrace.git babeltrace2-2.0.5
+      - run: git clone -b anl-ms3 git://git.efficios.com/deliverable/babeltrace.git
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |
           wget https://raw.githubusercontent.com/argonne-lcf/THAPI/53262fcaaaf45d7d475884d7e63b69abe47e41d6/.github/workflows/str_nullptr.patch 
           patch -p1 < str_nullptr.patch
-        working-directory: babeltrace2-2.0.5
+        working-directory: babeltrace
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |
           ./bootstrap
           ./configure --disable-man-pages --prefix=$HOME/babeltrace2/2.0.5
           make -j$(nproc)
           make install
-        working-directory: babeltrace2-2.0.5
+        working-directory: babeltrace
         if: steps.babeltrace2.outputs.cache-hit != 'true'
 
   build-and-check:

From 6b1fe606eda71cee1191f0d29e2ae01327de9a79 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0012.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Wed, 28 Aug 2024 15:27:02 +0000
Subject: [PATCH 41/53] add patch

---
 .github/workflows/bt_makefile.patch | 29 +++++++++++++++++++++++++++++
 .github/workflows/presubmit.yml     |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 .github/workflows/bt_makefile.patch

diff --git a/.github/workflows/bt_makefile.patch b/.github/workflows/bt_makefile.patch
new file mode 100644
index 00000000..e31f07e3
--- /dev/null
+++ b/.github/workflows/bt_makefile.patch
@@ -0,0 +1,29 @@
+From 41115106fc5f1f677e42a51929771995f53eed07 Mon Sep 17 00:00:00 2001
+From: Simon Marchi <simon.marchi@efficios.com>
+Date: Wed, 28 Aug 2024 11:22:21 -0400
+Subject: [PATCH] Use LTTNGCTL_CFLAGS
+
+Change-Id: I5c50340ada0e7942ac24df1f2deba1f27bf04132
+---
+ src/Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c6146cec5b24..32b553eb38f3 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -767,6 +767,10 @@ plugins_ctf_babeltrace_plugin_ctf_la_SOURCES = \
+ 	plugins/ctf/lttng-live/viewer-connection.hpp \
+ 	plugins/ctf/plugin.cpp
+ 
++plugins_ctf_babeltrace_plugin_ctf_la_CXXFLAGS = \
++	$(AM_CXXFLAGS) \
++	$(LTTNGCTL_CFLAGS)
++
+ plugins_ctf_babeltrace_plugin_ctf_la_LDFLAGS = \
+ 	$(AM_LDFLAGS) \
+ 	$(LT_NO_UNDEFINED) \
+
+base-commit: 5d357b9284e77562cbe7d5397def89f686704422
+-- 
+2.46.0
diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index c3b02a14..bd1fa01f 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -62,6 +62,8 @@ jobs:
       - run: |
           wget https://raw.githubusercontent.com/argonne-lcf/THAPI/53262fcaaaf45d7d475884d7e63b69abe47e41d6/.github/workflows/str_nullptr.patch 
           patch -p1 < str_nullptr.patch
+          wget https://raw.githubusercontent.com/argonne-lcf/THAPI/53262fcaaaf45d7d475884d7e63b69abe47e41d6/.github/workflows/bt_makefile.patch
+          patch -p1 < bt_makefile.patch
         working-directory: babeltrace
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       - run: |

From bb57d34f555637ca2cdf48b7035f07a95e8ec201 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0012.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Wed, 28 Aug 2024 15:32:26 +0000
Subject: [PATCH 42/53] fix path

---
 .github/workflows/presubmit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index bd1fa01f..35da1982 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -62,7 +62,7 @@ jobs:
       - run: |
           wget https://raw.githubusercontent.com/argonne-lcf/THAPI/53262fcaaaf45d7d475884d7e63b69abe47e41d6/.github/workflows/str_nullptr.patch 
           patch -p1 < str_nullptr.patch
-          wget https://raw.githubusercontent.com/argonne-lcf/THAPI/53262fcaaaf45d7d475884d7e63b69abe47e41d6/.github/workflows/bt_makefile.patch
+          wget https://raw.githubusercontent.com/argonne-lcf/THAPI/4418916620496fd66cde0b3d5e241bed0a4c18a3/.github/workflows/bt_makefile.patch
           patch -p1 < bt_makefile.patch
         working-directory: babeltrace
         if: steps.babeltrace2.outputs.cache-hit != 'true'

From 40b8c7d3efdebec2377a7a0976ce3c0cf0310b9d Mon Sep 17 00:00:00 2001
From: sbekele <solo2abera@gmail.com>
Date: Wed, 28 Aug 2024 19:22:29 +0000
Subject: [PATCH 43/53] initializations

---
 ze/tracer_ze_helpers.include.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ze/tracer_ze_helpers.include.c b/ze/tracer_ze_helpers.include.c
index 9b1e5dea..292e993f 100644
--- a/ze/tracer_ze_helpers.include.c
+++ b/ze/tracer_ze_helpers.include.c
@@ -1053,9 +1053,9 @@ static void readCopyE(uint32_t driverIdx, uint32_t deviceIdx, copyEngineData *co
 }
 
 static void thapi_sampling_energy() {
-  uint64_t ts_us;
-  uint64_t energy_uj;
-  uint32_t frequency;
+  uint64_t ts_us = 0;
+  uint64_t energy_uj = 0;
+  uint32_t frequency = 0;
   for (uint32_t driverIdx = 0; driverIdx < _sampling_driverCount; driverIdx++) {
     for (uint32_t deviceIdx = 0; deviceIdx < _sampling_deviceCount[driverIdx]; deviceIdx++) {
       if (tracepoint_enabled(lttng_ust_ze_sampling, gpu_frequency)){

From e3487d3706549e390084daabb87c07db564c293a Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0009.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Tue, 3 Sep 2024 15:23:43 +0000
Subject: [PATCH 44/53] silent warning for now

---
 ze/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ze/Makefile.am b/ze/Makefile.am
index 20d14200..0cbc9430 100644
--- a/ze/Makefile.am
+++ b/ze/Makefile.am
@@ -1,7 +1,7 @@
 .DELETE_ON_ERROR:
 
 if STRICT
-  WERROR = -Werror
+  WERROR = -Werror -Wno-error=nonnull
 else
   WERROR =
 endif

From a9a3ea18ed70316525f49588fb9160d580e98451 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0009.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Tue, 3 Sep 2024 15:29:59 +0000
Subject: [PATCH 45/53] add libnuma deps

---
 .github/workflows/presubmit.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 35da1982..915615c6 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Load Env
         run: |
           echo "PKG_CONFIG_PATH=$HOME/babeltrace2/2.0.5/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
-      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev liburcu-dev libc-dev libglib2.0-dev elfutils libelf-dev libdw-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev liburcu-dev libc-dev libglib2.0-dev elfutils libelf-dev libdw-dev libnuma-dev
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       # lttng-ust
       - run: git clone https://github.com/lttng/lttng-ust
@@ -133,7 +133,7 @@ jobs:
         with:
           path: ~/babeltrace2/2.0.5
           key: ${{ runner.os }}-build-${{ env.cache-name }}
-      - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler libglib2.0-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler libglib2.0-dev libnuma-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
       - name: Load Babeltrace2
         run: |
@@ -180,7 +180,7 @@ jobs:
           name: thapi-bin
       - name: Untar THAPI
         run: tar -xvf thapi.tar
-      - run: sudo apt update; sudo apt install -y lttng-tools liblttng-ust-dev ruby ruby-dev libprotobuf-dev libpocl2 clinfo bats coreutils libglib2.0-dev
+      - run: sudo apt update; sudo apt install -y lttng-tools liblttng-ust-dev ruby ruby-dev libprotobuf-dev libpocl2 clinfo bats coreutils libglib2.0-dev libnuma-dev
       - run: sudo gem install babeltrace2 opencl_ruby_ffi
       - name: Load Babeltrace2
         run: |
@@ -204,7 +204,7 @@ jobs:
         with:
           path: ~/babeltrace2/2.0.5
           key: ${{ runner.os }}-build-${{ env.cache-name }}
-      - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
       - name: Load Babeltrace2
         run: |
@@ -242,7 +242,7 @@ jobs:
         with:
           path: ~/babeltrace2/2.0.5
           key: ${{ runner.os }}-build-${{ env.cache-name }}
-      - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
       - name: Load Babeltrace2
         run: |
@@ -274,7 +274,7 @@ jobs:
         with:
           path: ~/babeltrace2/2.0.5
           key: ${{ runner.os }}-build-${{ env.cache-name }}
-      - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
       - name: Load Babeltrace2
         run: |

From 988b9a7af1e870e1704fc0e083564208db6b2f0d Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0009.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Tue, 3 Sep 2024 15:42:23 +0000
Subject: [PATCH 46/53] timeout

---
 integration_tests/light_iprof_only_sync.sh |  2 +-
 integration_tests/parallel_execution.bats  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/integration_tests/light_iprof_only_sync.sh b/integration_tests/light_iprof_only_sync.sh
index 2e5bd8d1..90442a05 100755
--- a/integration_tests/light_iprof_only_sync.sh
+++ b/integration_tests/light_iprof_only_sync.sh
@@ -15,7 +15,7 @@ RT_SIGNAL_FINISH=$((SIGRTMIN + 3))
 
 # Signal handler for capturing signals
 handle_signal() {
-    echo "$PARENT_PID $(date) |   Received signal $1 from sync_daemon"
+    echo "$PARENT_PID $(date) |   Received signal $1 from mpi_daemon"
     if [ "$1" == "RT_SIGNAL_READY" ]; then
         SIGNAL_RECEIVED="true"
     fi
diff --git a/integration_tests/parallel_execution.bats b/integration_tests/parallel_execution.bats
index 05668a66..62d14644 100644
--- a/integration_tests/parallel_execution.bats
+++ b/integration_tests/parallel_execution.bats
@@ -11,27 +11,27 @@ teardown_file() {
 }
 
 @test "sync_daemon_fs" {
-   THAPI_SYNC_DAEMON=fs THAPI_JOBID=0 timeout 40s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh $THAPI_TEST_BIN
+   THAPI_SYNC_DAEMON=fs THAPI_JOBID=0 timeout 60s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh $THAPI_TEST_BIN
 }
 
 @test "iprof_fs" {
-   THAPI_SYNC_DAEMON=fs THAPI_JOBID=0 timeout 40s $MPIRUN -n 2 $IPROF --debug 0 -- $THAPI_TEST_BIN
+   THAPI_SYNC_DAEMON=fs THAPI_JOBID=0 timeout 60s $MPIRUN -n 2 $IPROF --debug 0 -- $THAPI_TEST_BIN
 }
 
 @test "sync_daemon_fs_launching_mpi_app" {
    mpicc ./integration_tests/mpi_helloworld.c -o mpi_helloworld
-   THAPI_SYNC_DAEMON=fs THAPI_JOBID=0 timeout 40s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh ./mpi_helloworld
+   THAPI_SYNC_DAEMON=fs THAPI_JOBID=0 timeout 60s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh ./mpi_helloworld
 }
 
 @test "sync_daemon_mpi" {
-   THAPI_SYNC_DAEMON=mpi THAPI_JOBID=0 timeout 40s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh $THAPI_TEST_BIN
+   THAPI_SYNC_DAEMON=mpi THAPI_JOBID=0 timeout 60s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh $THAPI_TEST_BIN
 }
 
 @test "iprof_mpi" {
-   THAPI_SYNC_DAEMON=mpi THAPI_JOBID=0 timeout 40s $MPIRUN -n 2 $IPROF --debug 0 -- $THAPI_TEST_BIN
+   THAPI_SYNC_DAEMON=mpi THAPI_JOBID=0 timeout 60s $MPIRUN -n 2 $IPROF --debug 0 -- $THAPI_TEST_BIN
 }
 
 @test "sync_daemon_mpi_launching_mpi_app" {
    mpicc ./integration_tests/mpi_helloworld.c -o mpi_helloworld
-   THAPI_SYNC_DAEMON=mpi THAPI_JOBID=0 timeout 40s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh ./mpi_helloworld
+   THAPI_SYNC_DAEMON=mpi THAPI_JOBID=0 timeout 60s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh ./mpi_helloworld
 }

From 280065b5385f9f760c50c142778fc0d79a3cfa14 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0009.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Tue, 3 Sep 2024 19:46:13 +0000
Subject: [PATCH 47/53] 40s

---
 integration_tests/parallel_execution.bats | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/integration_tests/parallel_execution.bats b/integration_tests/parallel_execution.bats
index 62d14644..05668a66 100644
--- a/integration_tests/parallel_execution.bats
+++ b/integration_tests/parallel_execution.bats
@@ -11,27 +11,27 @@ teardown_file() {
 }
 
 @test "sync_daemon_fs" {
-   THAPI_SYNC_DAEMON=fs THAPI_JOBID=0 timeout 60s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh $THAPI_TEST_BIN
+   THAPI_SYNC_DAEMON=fs THAPI_JOBID=0 timeout 40s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh $THAPI_TEST_BIN
 }
 
 @test "iprof_fs" {
-   THAPI_SYNC_DAEMON=fs THAPI_JOBID=0 timeout 60s $MPIRUN -n 2 $IPROF --debug 0 -- $THAPI_TEST_BIN
+   THAPI_SYNC_DAEMON=fs THAPI_JOBID=0 timeout 40s $MPIRUN -n 2 $IPROF --debug 0 -- $THAPI_TEST_BIN
 }
 
 @test "sync_daemon_fs_launching_mpi_app" {
    mpicc ./integration_tests/mpi_helloworld.c -o mpi_helloworld
-   THAPI_SYNC_DAEMON=fs THAPI_JOBID=0 timeout 60s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh ./mpi_helloworld
+   THAPI_SYNC_DAEMON=fs THAPI_JOBID=0 timeout 40s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh ./mpi_helloworld
 }
 
 @test "sync_daemon_mpi" {
-   THAPI_SYNC_DAEMON=mpi THAPI_JOBID=0 timeout 60s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh $THAPI_TEST_BIN
+   THAPI_SYNC_DAEMON=mpi THAPI_JOBID=0 timeout 40s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh $THAPI_TEST_BIN
 }
 
 @test "iprof_mpi" {
-   THAPI_SYNC_DAEMON=mpi THAPI_JOBID=0 timeout 60s $MPIRUN -n 2 $IPROF --debug 0 -- $THAPI_TEST_BIN
+   THAPI_SYNC_DAEMON=mpi THAPI_JOBID=0 timeout 40s $MPIRUN -n 2 $IPROF --debug 0 -- $THAPI_TEST_BIN
 }
 
 @test "sync_daemon_mpi_launching_mpi_app" {
    mpicc ./integration_tests/mpi_helloworld.c -o mpi_helloworld
-   THAPI_SYNC_DAEMON=mpi THAPI_JOBID=0 timeout 60s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh ./mpi_helloworld
+   THAPI_SYNC_DAEMON=mpi THAPI_JOBID=0 timeout 40s $MPIRUN -n 2 ./integration_tests/light_iprof_only_sync.sh ./mpi_helloworld
 }

From a17cfaeca14960d6a0b9f5973004ce076bb9b9eb Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0009.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Tue, 3 Sep 2024 20:40:38 +0000
Subject: [PATCH 48/53] add test

---
 .github/workflows/presubmit.yml | 11 ++++++-----
 integration_tests/general.bats  |  8 ++++++--
 xprof/xprof.rb.in               |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 915615c6..1486676b 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -54,6 +54,7 @@ jobs:
           ./configure --disable-man-pages --disable-bin-lttng-crash --prefix=$HOME/babeltrace2/2.0.5
           make -j$(nproc)
           make install
+          cp dirwatch.py $HOME/babeltrace2/2.0.5/bin/
         working-directory: lttng-tools
         if: steps.babeltrace2.outputs.cache-hit != 'true'
      # babeltrace
@@ -133,7 +134,7 @@ jobs:
         with:
           path: ~/babeltrace2/2.0.5
           key: ${{ runner.os }}-build-${{ env.cache-name }}
-      - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler libglib2.0-dev libnuma-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler libglib2.0-dev libnuma-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
       - name: Load Babeltrace2
         run: |
@@ -180,7 +181,7 @@ jobs:
           name: thapi-bin
       - name: Untar THAPI
         run: tar -xvf thapi.tar
-      - run: sudo apt update; sudo apt install -y lttng-tools liblttng-ust-dev ruby ruby-dev libprotobuf-dev libpocl2 clinfo bats coreutils libglib2.0-dev libnuma-dev
+      - run: sudo apt update; sudo apt install -y ruby ruby-dev libprotobuf-dev libpocl2 clinfo bats coreutils libglib2.0-dev libnuma-dev
       - run: sudo gem install babeltrace2 opencl_ruby_ffi
       - name: Load Babeltrace2
         run: |
@@ -204,7 +205,7 @@ jobs:
         with:
           path: ~/babeltrace2/2.0.5
           key: ${{ runner.os }}-build-${{ env.cache-name }}
-      - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
       - name: Load Babeltrace2
         run: |
@@ -242,7 +243,7 @@ jobs:
         with:
           path: ~/babeltrace2/2.0.5
           key: ${{ runner.os }}-build-${{ env.cache-name }}
-      - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
       - name: Load Babeltrace2
         run: |
@@ -274,7 +275,7 @@ jobs:
         with:
           path: ~/babeltrace2/2.0.5
           key: ${{ runner.os }}-build-${{ env.cache-name }}
-      - run: sudo apt update; sudo apt install -y gcc g++ lttng-tools liblttng-ust-dev ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
       - name: Load Babeltrace2
         run: |
diff --git a/integration_tests/general.bats b/integration_tests/general.bats
index fbeac370..e2899682 100644
--- a/integration_tests/general.bats
+++ b/integration_tests/general.bats
@@ -22,6 +22,10 @@ teardown_file() {
    rm out.pftrace
 }
 
+@test "archive_summary" {
+   $IPROF --archive $THAPI_TEST_BIN
+}
+
 @test "replay_summary" {
    $IPROF $THAPI_TEST_BIN
    $IPROF -r
@@ -29,10 +33,10 @@ teardown_file() {
 
 @test "no-analysis_all" {
    $IPROF --no-analysis -- $THAPI_TEST_BIN
-   $IPROF -r 
+   $IPROF -r
    $IPROF -t -r | wc -l
    $IPROF -l -r
-   rm out.pftrace 
+   rm out.pftrace
 }
 
 @test "trace-output_all" {
diff --git a/xprof/xprof.rb.in b/xprof/xprof.rb.in
index 527d6b3c..11fb7ea3 100755
--- a/xprof/xprof.rb.in
+++ b/xprof/xprof.rb.in
@@ -614,7 +614,7 @@ def lm_babeltrace(backends)
     LOGGER.debug(cmd)
     pid_bt = spawn(cmd)
 
-    cmd = "dirwatch.py --log-level=CRITICAL #{lttng_session_uuid} #{LTTNG_DIRWATCH_SIZE}"
+    cmd = "python dirwatch.py --log-level=CRITICAL #{lttng_session_uuid} #{LTTNG_DIRWATCH_SIZE}"
     LOGGER.debug(cmd)
     pid_laurence = spawn(cmd)
 

From 0cd52a40831aeb1e2561835407924145cf15c6cb Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0009.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Tue, 3 Sep 2024 21:01:22 +0000
Subject: [PATCH 49/53] fix urcu

---
 .github/workflows/presubmit.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 1486676b..ce7da2b2 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Load Env
         run: |
           echo "PKG_CONFIG_PATH=$HOME/babeltrace2/2.0.5/lib/pkgconfig:$PKG_CONFIG_PATH" >> $GITHUB_ENV
-      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev liburcu-dev libc-dev libglib2.0-dev elfutils libelf-dev libdw-dev libnuma-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ libpopt-dev libnuma-dev liburcu-dev libc-dev libglib2.0-dev elfutils libelf-dev libdw-dev
         if: steps.babeltrace2.outputs.cache-hit != 'true'
       # lttng-ust
       - run: git clone https://github.com/lttng/lttng-ust
@@ -134,7 +134,7 @@ jobs:
         with:
           path: ~/babeltrace2/2.0.5
           key: ${{ runner.os }}-build-${{ env.cache-name }}
-      - run: sudo apt update; sudo apt install -y gcc g++ ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler libglib2.0-dev libnuma-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler libglib2.0-dev libnuma-dev liburcu-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
       - name: Load Babeltrace2
         run: |
@@ -181,7 +181,7 @@ jobs:
           name: thapi-bin
       - name: Untar THAPI
         run: tar -xvf thapi.tar
-      - run: sudo apt update; sudo apt install -y ruby ruby-dev libprotobuf-dev libpocl2 clinfo bats coreutils libglib2.0-dev libnuma-dev
+      - run: sudo apt update; sudo apt install -y ruby ruby-dev libprotobuf-dev libpocl2 clinfo bats coreutils libglib2.0-dev libnuma-dev liburcu-dev
       - run: sudo gem install babeltrace2 opencl_ruby_ffi
       - name: Load Babeltrace2
         run: |
@@ -205,7 +205,7 @@ jobs:
         with:
           path: ~/babeltrace2/2.0.5
           key: ${{ runner.os }}-build-${{ env.cache-name }}
-      - run: sudo apt update; sudo apt install -y gcc g++ ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev liburcu-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
       - name: Load Babeltrace2
         run: |
@@ -243,7 +243,7 @@ jobs:
         with:
           path: ~/babeltrace2/2.0.5
           key: ${{ runner.os }}-build-${{ env.cache-name }}
-      - run: sudo apt update; sudo apt install -y gcc g++ ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev liburcu-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
       - name: Load Babeltrace2
         run: |
@@ -275,7 +275,7 @@ jobs:
         with:
           path: ~/babeltrace2/2.0.5
           key: ${{ runner.os }}-build-${{ env.cache-name }}
-      - run: sudo apt update; sudo apt install -y gcc g++ ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev
+      - run: sudo apt update; sudo apt install -y gcc g++ ruby ruby-dev elfutils libelf-dev libdw-dev libprotobuf-dev protobuf-compiler valgrind libglib2.0-dev libnuma-dev liburcu-dev
       - run: sudo gem install cast-to-yaml nokogiri babeltrace2 opencl_ruby_ffi metababel
       - name: Load Babeltrace2
         run: |

From a745146f8c3f01f3ab2c1fff14f6a7bede1559d7 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0009.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Tue, 3 Sep 2024 21:09:46 +0000
Subject: [PATCH 50/53] add timout

---
 integration_tests/general.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration_tests/general.bats b/integration_tests/general.bats
index e2899682..fe354f22 100644
--- a/integration_tests/general.bats
+++ b/integration_tests/general.bats
@@ -23,7 +23,7 @@ teardown_file() {
 }
 
 @test "archive_summary" {
-   $IPROF --archive $THAPI_TEST_BIN
+   timeout 30s $IPROF --debug 0 --archive $THAPI_TEST_BIN
 }
 
 @test "replay_summary" {

From cc62f6d9800acec9e1a73f99059edc694905917a Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0009.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Tue, 3 Sep 2024 21:49:47 +0000
Subject: [PATCH 51/53] new install

---
 .github/workflows/presubmit.yml | 4 +++-
 xprof/xprof.rb.in               | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index ce7da2b2..8c2134cb 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -54,7 +54,9 @@ jobs:
           ./configure --disable-man-pages --disable-bin-lttng-crash --prefix=$HOME/babeltrace2/2.0.5
           make -j$(nproc)
           make install
-          cp dirwatch.py $HOME/babeltrace2/2.0.5/bin/
+          # Put in path
+          cat "#!/usr/bin/env python"| cat - dirwatch.py > $HOME/babeltrace2/2.0.5/bin/dirwatch.py
+          chmod 755 $HOME/babeltrace2/2.0.5/bin/dirwatch.py
         working-directory: lttng-tools
         if: steps.babeltrace2.outputs.cache-hit != 'true'
      # babeltrace
diff --git a/xprof/xprof.rb.in b/xprof/xprof.rb.in
index 11fb7ea3..527d6b3c 100755
--- a/xprof/xprof.rb.in
+++ b/xprof/xprof.rb.in
@@ -614,7 +614,7 @@ def lm_babeltrace(backends)
     LOGGER.debug(cmd)
     pid_bt = spawn(cmd)
 
-    cmd = "python dirwatch.py --log-level=CRITICAL #{lttng_session_uuid} #{LTTNG_DIRWATCH_SIZE}"
+    cmd = "dirwatch.py --log-level=CRITICAL #{lttng_session_uuid} #{LTTNG_DIRWATCH_SIZE}"
     LOGGER.debug(cmd)
     pid_laurence = spawn(cmd)
 

From 814f656aa3c028f136ffc4bdda3235dbeea83b15 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0009.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Tue, 3 Sep 2024 22:19:55 +0000
Subject: [PATCH 52/53] fix shebang

---
 .github/workflows/presubmit.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
index 8c2134cb..033a263d 100644
--- a/.github/workflows/presubmit.yml
+++ b/.github/workflows/presubmit.yml
@@ -55,7 +55,7 @@ jobs:
           make -j$(nproc)
           make install
           # Put in path
-          cat "#!/usr/bin/env python"| cat - dirwatch.py > $HOME/babeltrace2/2.0.5/bin/dirwatch.py
+          echo "#!/usr/bin/env python"| cat - dirwatch.py > $HOME/babeltrace2/2.0.5/bin/dirwatch.py
           chmod 755 $HOME/babeltrace2/2.0.5/bin/dirwatch.py
         working-directory: lttng-tools
         if: steps.babeltrace2.outputs.cache-hit != 'true'

From f971f8723b024258d42ace6b8178d1442d07ed90 Mon Sep 17 00:00:00 2001
From: Thomas Applencourt
 <applenco@aurora-uan-0009.hostmgmt.cm.aurora.alcf.anl.gov>
Date: Tue, 3 Sep 2024 22:46:25 +0000
Subject: [PATCH 53/53] typos

---
 utils/babeltrace_thapi.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/babeltrace_thapi.in b/utils/babeltrace_thapi.in
index 66e92ea2..08125a0a 100755
--- a/utils/babeltrace_thapi.in
+++ b/utils/babeltrace_thapi.in
@@ -287,7 +287,7 @@ def bt_graphs(inputs)
     g_comps = [if $options[:live]
                  'source.ctf.lttng_live'
                elsif $options[:archive]
-                  'source.ctf.lttng-archive'
+                  'source.ctf.lttng_archive'
                else
                  'source.ctf.fs'
                end]