* [PATCH] Remove support for the Common Trace Format (CTF)
@ 2026-05-10 2:28 Sergio Durigan Junior
2026-05-10 4:47 ` Eli Zaretskii
2026-05-10 12:43 ` Simon Marchi
0 siblings, 2 replies; 7+ messages in thread
From: Sergio Durigan Junior @ 2026-05-10 2:28 UTC (permalink / raw)
To: GDB Patches; +Cc: Simon Marchi, doko, Michael Jeanson, Sergio Durigan Junior
Hi there,
The Debian maintainer of babeltrace (Michael, in CC) is working
towards removing the version 1 package from the archive in favour of
version 2. This makes sense as version 1 is unsupported and projects
should move to version 2.
While digging through the archives I found PR buid/27142 (from
Matthias, also in Cc) which was filed 5 years ago requesting GDB to
support babeltrace v2. At the time Simon started a thread on gdb@
suggesting that we should actually remove the support for CTF (Common
Trace Format) altogether, since it's a niche feature (CTF) within a
niche feature (tracepoints) and apparently GDB itself records CTF data
in an unconventional way that might break other tools. You can see
the thread here:
https://inbox.sourceware.org/gdb/3fb1fbb6-836a-0e39-73a9-ef721630da88@polymtl.ca/
Long story short, the consensus seems to be that CTF support is ripe
to be removed, so that's what this patch does. I think I covered all
places that referred to either CTF or babeltrace; I recompiled GDB
here and things are still working as expected. I ran the tests I
touched and there are some failures, but they're unrelated to CTF and
I could reproduce them in a pristine tree as well.
I've been a bit distant from the community so I don't know whether we
have a specific procedure to remove features from GDB. I remember
that when we removed support for an architecture, we used to deprecate
it in release N and then proceed with the removal on release N+1. Not
sure if this is applicable here, but let me know.
Either way, I intend to disable support for babeltrace on Debian's GDB
soon.
WDYT?
Signed-off-by: Sergio Durigan Junior <sergiodj@sergiodj.net>
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=27142
---
gdb/Makefile.in | 10 +-
gdb/NEWS | 22 +-
gdb/configure.ac | 43 -
gdb/doc/gdb.texinfo | 48 +-
gdb/mi/mi-main.c | 12 +-
gdb/testsuite/gdb.base/completion.exp | 10 -
gdb/testsuite/gdb.trace/actions.exp | 22 -
.../gdb.trace/mi-trace-frame-collected.exp | 23 -
.../gdb.trace/mi-trace-unavailable.exp | 23 -
gdb/testsuite/gdb.trace/report.exp | 14 -
gdb/testsuite/gdb.trace/tstatus.exp | 14 -
gdb/testsuite/gdb.trace/tsv.exp | 12 -
gdb/testsuite/gdb.trace/unavailable.exp | 22 -
gdb/testsuite/gdb.trace/while-stepping.exp | 22 -
gdb/top.c | 10 -
gdb/tracectf.c | 1728 -----------------
gdb/tracectf.h | 25 -
gdb/tracefile.c | 25 +-
gdb/tracepoint.h | 2 -
19 files changed, 31 insertions(+), 2056 deletions(-)
delete mode 100644 gdb/tracectf.c
delete mode 100644 gdb/tracectf.h
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index e38ba95eebd..a0c11f5eb57 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -197,10 +197,6 @@ LIBEXPAT = @LIBEXPAT@
# Where is lzma? This will be empty if lzma was not available.
LIBLZMA = @LIBLZMA@
-# Where is libbabeltrace? This will be empty if libbabeltrace was not
-# available.
-LIBBABELTRACE = @LIBBABELTRACE@
-
# Where is libxxhash? This will be empty if libxxhash was not
# available.
LIBXXHASH = @LIBXXHASH@
@@ -677,10 +673,10 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(LIBCTF) $(BFD) $(ZLIB) $(ZSTD_LIBS) \
$(LIBSUPPORT) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \
$(XM_CLIBS) $(GDBTKLIBS) $(LIBBACKTRACE_LIB) \
@LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ $(AMD_DBGAPI_LIBS) \
- $(LIBEXPAT) $(LIBLZMA) $(LIBBABELTRACE) $(LIBIPT) \
+ $(LIBEXPAT) $(LIBLZMA) $(LIBIPT) \
$(WIN32LIBS) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) $(LIBICONV) \
$(GMPLIBS) $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS) \
- $(DEBUGINFOD_LIBS) $(LIBBABELTRACE_LIB)
+ $(DEBUGINFOD_LIBS)
CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) $(CTF_DEPS) \
$(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \
$(LIBSUPPORT)
@@ -1208,7 +1204,6 @@ COMMON_SFILES = \
thread-iter.c \
tid-parse.c \
top.c \
- tracectf.c \
tracefile.c \
tracefile-tfile.c \
tracepoint.c \
@@ -1697,7 +1692,6 @@ HFILES_NO_SRCDIR = \
tid-parse.h \
tilegx-tdep.h \
top.h \
- tracectf.h \
tracefile.h \
tracepoint.h \
trad-frame.h \
diff --git a/gdb/NEWS b/gdb/NEWS
index 480e1854002..48a80856aa1 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -3,6 +3,9 @@
*** Changes since GDB 17
+* Support for the Common Trace Format (CTF) has been removed. GDB now
+ saves trace information exclusively in its own "tfile" format.
+
* Support for .gdb_index sections with version less than 7 has been
removed.
@@ -78,6 +81,12 @@
* The Windows native target now supports non-stop mode. This feature
requires Windows 10 or later.
+* Configure changes
+
+** --with-babeltrace has been removed. The babeltrace library was
+ only used to help GDB parse Common Trace Format (CTF) data. The
+ support for CTF has also been removed.
+
* New targets
GNU/Linux/MicroBlaze (gdbserver) microblazeel-*linux*
@@ -112,7 +121,8 @@ show debug gnu-ifunc
set debug ctf on|off
show debug ctf
- Turn on or off debug messages about CTF reading.
+ Turn on or off debug messages about Compact C Type Format (CTF)
+ reading.
set progress-bars enabled on|off
show progress-bars enabled
@@ -130,8 +140,15 @@ disable skip
These are new aliases for 'skip delete', 'skip enable', and 'skip
disable' respectively.
+* MI changes
+
+** The "-trace-save" command no longer supports the "-ctf" flag.
+
* Changed commands
+tsave
+ This command no longer supports the "-ctf" flag.
+
maintenance info program-spaces
This command no longer displays the core file name.
@@ -147,6 +164,9 @@ New command class for help
* Removed commands
+target ctf
+ Support for the Common Trace Format (CTF) has been removed.
+
maint check psymtabs
maint info psymtabs
maint print psymbols
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 56ab86d9356..2f05daf614f 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -2332,49 +2332,6 @@ fi
AC_SUBST(LIBBACKTRACE_INC)
AC_SUBST(LIBBACKTRACE_LIB)
-# Check for babeltrace and babeltrace-ctf
-AC_ARG_WITH(babeltrace,
- AS_HELP_STRING([--with-babeltrace], [include babeltrace support (auto/yes/no)]),
- [], [with_babeltrace=auto])
-AC_MSG_CHECKING([whether to use babeltrace])
-AC_MSG_RESULT([$with_babeltrace])
-
-if test "x$with_babeltrace" = "xno"; then
- AC_MSG_WARN([babeltrace support disabled; GDB is unable to read CTF data.])
-else
- # Append -Werror to CFLAGS so that configure can catch the warning
- # "assignment from incompatible pointer type", which is related to
- # the babeltrace change from 1.0.3 to 1.1.0. Babeltrace 1.1.0 works
- # in GDB, while babeltrace 1.0.3 is broken.
- # AC_LIB_HAVE_LINKFLAGS may modify CPPFLAGS in it, so it should be
- # safe to save and restore CFLAGS here.
- saved_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS -Werror"
- AC_LIB_HAVE_LINKFLAGS([babeltrace], [babeltrace-ctf],
- [#include <babeltrace/babeltrace.h>
- #include <babeltrace/ctf/events.h>
- #include <babeltrace/ctf/iterator.h>],
- [struct bt_iter_pos *pos = bt_iter_get_pos (bt_ctf_get_iter (NULL));
- struct bt_ctf_event *event = NULL;
- const struct bt_definition *scope;
-
- pos->type = BT_SEEK_BEGIN;
- bt_iter_set_pos (bt_ctf_get_iter (NULL), pos);
- scope = bt_ctf_get_top_level_scope (event,
- BT_STREAM_EVENT_HEADER);
- bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, "id"));
- ])
- CFLAGS=$saved_CFLAGS
-
- if test "$HAVE_LIBBABELTRACE" != yes; then
- if test "$with_babeltrace" = yes; then
- AC_MSG_ERROR([babeltrace is missing or unusable])
- else
- AC_MSG_WARN([babeltrace is missing or unusable; GDB is unable to read CTF data.])
- fi
- fi
-fi
-
GCC_ENABLE([libctf], [yes], [], [Handle .ctf type-info sections])
if test "${enable_libctf}" = yes; then
AC_DEFINE(ENABLE_LIBCTF, 1, [Handle .ctf type-info sections])
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 68e760699bc..40f381f812d 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -16547,7 +16547,7 @@ of trace data, via the @code{target tfile} command.
@kindex tsave
@item tsave [ -r ] @var{filename}
-@itemx tsave [-ctf] @var{dirname}
+@itemx tsave @var{dirname}
Save the trace data to @var{filename}. By default, this command
assumes that @var{filename} refers to the host filesystem, so if
necessary @value{GDBN} will copy raw trace data up from the target and
@@ -16556,44 +16556,6 @@ optional argument @code{-r} (``remote'') to direct the target to save
the data directly into @var{filename} in its own filesystem, which may be
more efficient if the trace buffer is very large. (Note, however, that
@code{target tfile} can only read from files accessible to the host.)
-By default, this command will save trace frame in tfile format.
-You can supply the optional argument @code{-ctf} to save data in CTF
-format. The @dfn{Common Trace Format} (CTF) is proposed as a trace format
-that can be shared by multiple debugging and tracing tools. Please go to
-@indicateurl{http://www.efficios.com/ctf} to get more information.
-
-@kindex target tfile
-@kindex tfile
-@kindex target ctf
-@kindex ctf
-@item target tfile @var{filename}
-@itemx target ctf @var{dirname}
-Use the file named @var{filename} or directory named @var{dirname} as
-a source of trace data. Commands that examine data work as they do with
-a live target, but it is not possible to run any new trace experiments.
-@code{tstatus} will report the state of the trace run at the moment
-the data was saved, as well as the current trace frame you are examining.
-Both @var{filename} and @var{dirname} must be on a filesystem accessible to
-the host.
-
-The @var{filename} and @var{dirname} arguments supports escaping and
-quoting, see @ref{Filename Arguments,,Filenames As Command Arguments}.
-
-@smallexample
-(@value{GDBP}) target ctf ctf.ctf
-(@value{GDBP}) tfind
-Found trace frame 0, tracepoint 2
-39 ++a; /* set tracepoint 1 here */
-(@value{GDBP}) tdump
-Data collected at tracepoint 2, trace frame 0:
-i = 0
-a = 0
-b = 1 '\001'
-c = @{"123", "456", "789", "123", "456", "789"@}
-d = @{@{@{a = 1, b = 2@}, @{a = 3, b = 4@}@}, @{@{a = 5, b = 6@}, @{a = 7, b = 8@}@}@}
-(@value{GDBP}) p b
-$1 = 1
-@end smallexample
@end table
@@ -37487,7 +37449,7 @@ body=[variable=@{name="$trace_timestamp",initial="0"@}
@subsubheading Synopsis
@smallexample
- -trace-save [ -r ] [ -ctf ] @var{filename}
+ -trace-save [ -r ] @var{filename}
@end smallexample
Saves the collected trace data to @var{filename}. Without the
@@ -37495,10 +37457,6 @@ Saves the collected trace data to @var{filename}. Without the
in a local file. With the @samp{-r} option the target is asked
to perform the save.
-By default, this command will save the trace in the tfile format. You can
-supply the optional @samp{-ctf} argument to save it the CTF format. See
-@ref{Trace Files} for more information about CTF.
-
@subsubheading @value{GDBN} Command
The corresponding @value{GDBN} command is @samp{tsave}.
@@ -41411,7 +41369,7 @@ distribution; if it is not, you can get the latest version from
@url{http://zlib.net}.
@c FIXME: what about other optional libraries: debuginfod, zstd,
-@c libipt, babeltrace, xxhash, source-highlight?
+@c libipt, xxhash, source-highlight?
@end table
@node Running Configure
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 4dd4a7f9a6c..52e642e1464 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -2395,19 +2395,17 @@ void
mi_cmd_trace_save (const char *command, const char *const *argv, int argc)
{
int target_saves = 0;
- int generate_ctf = 0;
const char *filename;
int oind = 0;
const char *oarg;
enum opt
{
- TARGET_SAVE_OPT, CTF_OPT
+ TARGET_SAVE_OPT,
};
static const struct mi_opt opts[] =
{
{"r", TARGET_SAVE_OPT, 0},
- {"ctf", CTF_OPT, 0},
{ 0, 0, 0 }
};
@@ -2423,9 +2421,6 @@ mi_cmd_trace_save (const char *command, const char *const *argv, int argc)
case TARGET_SAVE_OPT:
target_saves = 1;
break;
- case CTF_OPT:
- generate_ctf = 1;
- break;
}
}
@@ -2435,10 +2430,7 @@ mi_cmd_trace_save (const char *command, const char *const *argv, int argc)
filename = argv[oind];
- if (generate_ctf)
- trace_save_ctf (filename, target_saves);
- else
- trace_save_tfile (filename, target_saves);
+ trace_save_tfile (filename, target_saves);
}
void
diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
index e7407e75ee0..44cf649d5b6 100644
--- a/gdb/testsuite/gdb.base/completion.exp
+++ b/gdb/testsuite/gdb.base/completion.exp
@@ -90,16 +90,6 @@ gdb_test "complete set cp-abi aut" "set cp-abi auto"
# Test that completion of commands 'target FOO' works well.
set targets [list "core" "tfile" "exec"]
-# Test that completion of command 'target ctf' if GDB supports ctf
-# target.
-gdb_test_multiple "target ctf" "" {
- -re "Undefined target command: \"ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
- }
- -re "No CTF directory specified.*\r\n$gdb_prompt $" {
- lappend targets "ctf"
- }
-}
-
# Test artifacts are put in different locations depending on test
# is a parallel run or not. Firstly check file exists, and then
# do the test on file completion.
diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index 07c5de664da..8a8a08d0f9e 100644
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -318,9 +318,6 @@ set tracefile [standard_output_file ${testfile}]
gdb_test "tsave ${tracefile}.tf" \
"Trace data saved to file '${tracefile}.tf'\." \
"tsave ${testfile}.tf"
-gdb_test "tsave -ctf ${tracefile}.ctf" \
- "Trace data saved to directory '${tracefile}.ctf'\\." \
- "save ctf trace file"
# Restart GDB and read the trace data in tfile target.
clean_restart
@@ -328,22 +325,3 @@ gdb_file_cmd $binfile
gdb_test "target tfile ${tracefile}.tf" ".*" \
"change to tfile target"
check_tracepoint "tfile"
-
-# Try to read ctf data if GDB supports.
-set gdb_can_read_ctf_data 0
-gdb_test_multiple "target ctf" "" {
- -re "Undefined target command: \"ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
- set gdb_can_read_ctf_data 0
- }
- -re "No CTF directory specified.*\r\n$gdb_prompt $" {
- set gdb_can_read_ctf_data 1
- }
-}
-
-if { $gdb_can_read_ctf_data } {
- clean_restart
- gdb_file_cmd $binfile
- gdb_test "target ctf ${tracefile}.ctf" ".*" \
- "change to ctf target"
- check_tracepoint "ctf"
-}
diff --git a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
index 5ad8dabde47..78e8c942b57 100644
--- a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
+++ b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
@@ -74,9 +74,6 @@ mi_gdb_test "-trace-stop" {.*\^done,stop-reason=.*} "trace stop"
set tracefile [standard_output_file ${testfile}]
mi_gdb_test "-trace-save ${tracefile}.tf" ".*\\^done" \
"save tfile trace file"
-# Save trace frames to ctf.
-mi_gdb_test "-trace-save -ctf ${tracefile}.ctf" ".*\\^done" \
- "save ctf trace file"
# Test the MI command '-trace-frame-collected' with DATA_SOURCE as
# trace data source.
@@ -138,26 +135,6 @@ proc test_trace_frame_collected { data_source } {
test_trace_frame_collected "live"
-# Change target to ctf if GDB supports it.
-set msg "-target-select ctf"
-send_gdb "-target-select ctf ${tracefile}.ctf\n"
-gdb_expect {
- -re ".*\\^connected.*${mi_gdb_prompt}$" {
- # GDB supports ctf, do the test.
- test_trace_frame_collected "ctf"
- }
- -re ".*\\^error,msg=\"Undefined target command.*${mi_gdb_prompt}$" {
- # GDB doesn't support ctf, skip the test.
- unsupported "gdb does not support ctf target"
- }
- -re ".*$mi_gdb_prompt$" {
- fail "$msg"
- }
- timeout {
- fail "$msg (timeout)"
- }
-}
-
# Change target to tfile.
mi_gdb_test "-target-select tfile ${tracefile}.tf" ".*\\^connected.*" \
"-target-select tfile"
diff --git a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
index 58e41db1d51..9facc8dee17 100644
--- a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
+++ b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
@@ -68,9 +68,6 @@ mi_gdb_test "-trace-stop" {.*} "trace stop"
set tracefile [standard_output_file ${testfile}]
mi_gdb_test "-trace-save ${tracefile}.tf" ".*\\^done" \
"save tfile trace file"
-# Save trace frames to ctf.
-mi_gdb_test "-trace-save -ctf ${tracefile}.ctf" ".*\\^done" \
- "save ctf trace file"
proc test_trace_unavailable { data_source } {
global decimal
@@ -174,26 +171,6 @@ proc test_trace_unavailable { data_source } {
test_trace_unavailable "live"
-# Change target to ctf if GDB supports it.
-set msg "-target-select ctf"
-send_gdb "-target-select ctf ${tracefile}.ctf\n"
-gdb_expect {
- -re ".*\\^connected.*${mi_gdb_prompt}$" {
- # GDB supports ctf, do the test.
- test_trace_unavailable "ctf"
- }
- -re ".*\\^error,msg=\"Undefined target command.*${mi_gdb_prompt}$" {
- # GDB doesn't support ctf, skip the test.
- unsupported "gdb does not support ctf target"
- }
- -re ".*$mi_gdb_prompt$" {
- fail "$msg"
- }
- timeout {
- fail "$msg (timeout)"
- }
-}
-
# Change target to tfile.
mi_gdb_test "-target-select tfile ${tracefile}.tf" ".*\\^connected.*" \
"-target-select tfile"
diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index 5ddffad076f..c67634e4ce7 100644
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -399,11 +399,6 @@ gdb_test "tsave ${tracefile}.tf" \
"Trace data saved to file '${tracefile}.tf'.*" \
"save tfile trace file"
-# Save trace frames to ctf.
-gdb_test "tsave -ctf ${tracefile}.ctf" \
- "Trace data saved to directory '${tracefile}.ctf'.*" \
- "save ctf trace file"
-
# Change target to tfile.
set test "change to tfile target"
gdb_test_multiple "target tfile ${tracefile}.tf" "$test" {
@@ -417,12 +412,3 @@ gdb_test_multiple "target tfile ${tracefile}.tf" "$test" {
}
# Test the collected trace frames from tfile.
use_collected_data "tfile"
-
-# Try to read ctf data if GDB supports.
-gdb_test_multiple "target ctf ${tracefile}.ctf" "" {
- -re "Undefined target command: \"ctf ${tracefile}.ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
- }
- -re ".*\r\n$gdb_prompt $" {
- use_collected_data "ctf"
- }
-}
diff --git a/gdb/testsuite/gdb.trace/tstatus.exp b/gdb/testsuite/gdb.trace/tstatus.exp
index 4ab6e2cbfc5..f8bc72e8cfc 100644
--- a/gdb/testsuite/gdb.trace/tstatus.exp
+++ b/gdb/testsuite/gdb.trace/tstatus.exp
@@ -142,10 +142,6 @@ set tracefile [standard_output_file ${testfile}]
gdb_test "tsave ${tracefile}.tf" \
"Trace data saved to file '${tracefile}.tf'.*" \
"save tfile trace file"
-# Save trace frames to CTF.
-gdb_test "tsave -ctf ${tracefile}.ctf" \
- "Trace data saved to directory '${tracefile}.ctf'.*" \
- "save ctf trace file"
# Change target to tfile.
set test "change to tfile target"
@@ -166,13 +162,3 @@ set tstatus_output [string map {\) \\)} $tstatus_output]
# The status should be identical to the status of live inferior.
gdb_test "tstatus" "Using a trace file\.\r\n${tstatus_output}.*" \
"tstatus on tfile target"
-
-# Change target to ctf if GDB supports.
-gdb_test_multiple "target ctf ${tracefile}.ctf" "" {
- -re "Undefined target command: \"ctf ${tracefile}.ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
- }
- -re ".*\r\n$gdb_prompt $" {
- gdb_test "tstatus" "Using a trace file\.\r\n${tstatus_output}.*" \
- "tstatus on ctf target"
- }
-}
diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index 60f59f9ab89..78527e2c767 100644
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -150,10 +150,6 @@ set tracefile [standard_output_file ${testfile}]
gdb_test "tsave ${tracefile}.tf" \
"Trace data saved to file '${tracefile}.tf'.*" \
"save tfile trace file"
-# Save trace frames to ctf.
-gdb_test "tsave -ctf ${tracefile}.ctf" \
- "Trace data saved to directory '${tracefile}.ctf'.*" \
- "save ctf trace file"
proc check_tsv { data_source } {
with_test_prefix "${data_source}" {
@@ -183,14 +179,6 @@ gdb_test_multiple "target tfile ${tracefile}.tf" "$test" {
# Check the tsv from tfile.
check_tsv "tfile"
-# Try to read ctf data if GDB supports.
-gdb_test_multiple "target ctf ${tracefile}.ctf" "" {
- -re "Undefined target command: \"ctf ${tracefile}.ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
- }
- -re ".*\r\n$gdb_prompt $" {
- check_tsv "ctf"
- }
-}
# Restart.
clean_restart $testfile
diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp
index 295b0b42467..309ef2a8585 100644
--- a/gdb/testsuite/gdb.trace/unavailable.exp
+++ b/gdb/testsuite/gdb.trace/unavailable.exp
@@ -191,9 +191,6 @@ proc gdb_collect_args_test {} {
gdb_test "tsave ${tracefile}.args.tfile" \
"Trace data saved to file '${tracefile}.args.tfile'\\." \
"tsave ${testfile}.args.tfile"
- gdb_test "tsave -ctf ${tracefile}.args.ctf" \
- "Trace data saved to directory '${tracefile}.args.ctf'\\." \
- "save ctf trace file"
foreach target_name ${trace_file_targets} {
# Restart GDB and read the trace data in ${TARGET_NAME} target.
@@ -271,9 +268,6 @@ proc gdb_collect_locals_test { func msg } {
gdb_test "tsave ${tracefile}.locals.tfile" \
"Trace data saved to file '${tracefile}.locals.tfile'\\." \
"tsave ${testfile}.locals.tfile"
- gdb_test "tsave -ctf ${tracefile}.locals.ctf" \
- "Trace data saved to directory '${tracefile}.locals.ctf'\\." \
- "save ctf trace file"
foreach target_name ${trace_file_targets} {
# Restart GDB and read the trace data in ${TARGET_NAME} target.
@@ -352,9 +346,6 @@ proc gdb_unavailable_registers_test { } {
gdb_test "tsave ${tracefile}.registers.tfile" \
"Trace data saved to file '${tracefile}.registers.tfile'\\." \
"tsave ${testfile}.registers.tfile"
- gdb_test "tsave -ctf ${tracefile}.registers.ctf" \
- "Trace data saved to directory '${tracefile}.registers.ctf'\\." \
- "save ctf trace file"
foreach target_name ${trace_file_targets} {
# Restart GDB and read the trace data in ${TARGET_NAME} target.
@@ -414,9 +405,6 @@ proc gdb_unavailable_floats { } {
gdb_test "tsave ${tracefile}.floats.tfile" \
"Trace data saved to file '${tracefile}.floats.tfile'\\." \
"tsave ${testfile}.floats.tfile"
- gdb_test "tsave -ctf ${tracefile}.floats.ctf" \
- "Trace data saved to directory '${tracefile}.floats.ctf'\\." \
- "save ctf trace file"
foreach target_name ${trace_file_targets} {
# Restart GDB and read the trace data in ${TARGET_NAME} target.
@@ -679,9 +667,6 @@ proc gdb_collect_globals_test { } {
gdb_test "tsave ${tracefile}.globals.tfile" \
"Trace data saved to file '${tracefile}.globals.tfile'\\." \
"tsave ${testfile}.globals.tfile"
- gdb_test "tsave -ctf ${tracefile}.globals.ctf" \
- "Trace data saved to directory '${tracefile}.globals.ctf'\\." \
- "save ctf trace file"
foreach target_name ${trace_file_targets} {
# Restart GDB and read the trace data in ${TARGET_NAME} target.
@@ -719,13 +704,6 @@ if {![gdb_target_supports_trace]} {
}
set trace_file_targets [list "tfile"]
-gdb_test_multiple "target ctf" "" {
- -re "Undefined target command: \"ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
- }
- -re "No CTF directory specified.*\r\n$gdb_prompt $" {
- lappend trace_file_targets "ctf"
- }
-}
# Body of test encased in a proc so we can return prematurely.
gdb_trace_collection_test
diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp
index 0dde1a83418..f96034391a2 100644
--- a/gdb/testsuite/gdb.trace/while-stepping.exp
+++ b/gdb/testsuite/gdb.trace/while-stepping.exp
@@ -139,9 +139,6 @@ set tracefile [standard_output_file ${testfile}]
gdb_test "tsave ${tracefile}.tf" \
"Trace data saved to file '${tracefile}.tf'\\." \
"save tfile trace file"
-gdb_test "tsave -ctf ${tracefile}.ctf" \
- "Trace data saved to directory '${tracefile}.ctf'\\." \
- "save ctf trace file"
# Restart GDB and read the trace data in tfile target.
clean_restart
@@ -149,22 +146,3 @@ gdb_file_cmd $binfile
gdb_test "target tfile ${tracefile}.tf" ".*" \
"change to tfile target"
check_tracepoint "tfile"
-
-# Try to read ctf data if GDB supports.
-set gdb_can_read_ctf_data 0
-gdb_test_multiple "target ctf" "" {
- -re "Undefined target command: \"ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
- set gdb_can_read_ctf_data 0
- }
- -re "No CTF directory specified.*\r\n$gdb_prompt $" {
- set gdb_can_read_ctf_data 1
- }
-}
-
-if { $gdb_can_read_ctf_data } {
- clean_restart
- gdb_file_cmd $binfile
- gdb_test "target ctf ${tracefile}.ctf" ".*" \
- "change to ctf target"
- check_tracepoint "ctf"
-}
diff --git a/gdb/top.c b/gdb/top.c
index 7526c07a87b..477c385da61 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -1658,16 +1658,6 @@ This GDB was configured as follows:\n\
"));
#endif
-#if HAVE_LIBBABELTRACE
- gdb_printf (stream, _("\
- --with-babeltrace\n\
-"));
-#else
- gdb_printf (stream, _("\
- --without-babeltrace\n\
-"));
-#endif
-
#if HAVE_LIBIPT
gdb_printf (stream, _("\
--with-intel-pt\n\
diff --git a/gdb/tracectf.c b/gdb/tracectf.c
deleted file mode 100644
index 9246022b517..00000000000
--- a/gdb/tracectf.c
+++ /dev/null
@@ -1,1728 +0,0 @@
-/* CTF format support.
-
- Copyright (C) 2012-2026 Free Software Foundation, Inc.
- Contributed by Hui Zhu <hui_zhu@mentor.com>
- Contributed by Yao Qi <yao@codesourcery.com>
-
- This file is part of GDB.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-#include "tracectf.h"
-#include "tracepoint.h"
-#include "regcache.h"
-#include <sys/stat.h>
-#include "exec.h"
-#include "completer.h"
-#include "inferior.h"
-#include "gdbthread.h"
-#include "tracefile.h"
-#include <algorithm>
-#include "gdbsupport/filestuff.h"
-#include "gdbarch.h"
-#include "cli/cli-style.h"
-
-/* GDB saves trace buffers and other information (such as trace
- status) got from the remote target into Common Trace Format (CTF).
- The following types of information are expected to save in CTF:
-
- 1. The length (in bytes) of register cache. Event "register" will
- be defined in metadata, which includes the length.
-
- 2. Trace status. Event "status" is defined in metadata, which
- includes all aspects of trace status.
-
- 3. Uploaded trace variables. Event "tsv_def" is defined in
- metadata, which is about all aspects of a uploaded trace variable.
- Uploaded tracepoints. Event "tp_def" is defined in meta, which
- is about all aspects of an uploaded tracepoint. Note that the
- "sequence" (a CTF type, which is a dynamically-sized array.) is
- used for "actions" "step_actions" and "cmd_strings".
-
- 4. Trace frames. Each trace frame is composed by several blocks
- of different types ('R', 'M', 'V'). One trace frame is saved in
- one CTF packet and the blocks of this frame are saved as events.
- 4.1: The trace frame related information (such as the number of
- tracepoint associated with this frame) is saved in the packet
- context.
- 4.2: The block 'M', 'R' and 'V' are saved in event "memory",
- "register" and "tsv" respectively.
- 4.3: When iterating over events, babeltrace can't tell iterator
- goes to a new packet, so we need a marker or anchor to tell GDB
- that iterator goes into a new packet or frame. We define event
- "frame". */
-
-#define CTF_MAGIC 0xC1FC1FC1
-#define CTF_SAVE_MAJOR 1
-#define CTF_SAVE_MINOR 8
-
-#define CTF_METADATA_NAME "metadata"
-#define CTF_DATASTREAM_NAME "datastream"
-
-/* Reserved event id. */
-
-#define CTF_EVENT_ID_REGISTER 0
-#define CTF_EVENT_ID_TSV 1
-#define CTF_EVENT_ID_MEMORY 2
-#define CTF_EVENT_ID_FRAME 3
-#define CTF_EVENT_ID_STATUS 4
-#define CTF_EVENT_ID_TSV_DEF 5
-#define CTF_EVENT_ID_TP_DEF 6
-
-#define CTF_PID (2)
-
-/* The state kept while writing the CTF datastream file. */
-
-struct trace_write_handler
-{
- /* File descriptor of metadata. */
- FILE *metadata_fd;
- /* File descriptor of traceframes. */
- FILE *datastream_fd;
-
- /* This is the content size of the current packet. */
- size_t content_size;
-
- /* This is the start offset of current packet. */
- long packet_start;
-};
-
-/* Write metadata in FORMAT. */
-
-static void
-ctf_save_write_metadata (struct trace_write_handler *handler,
- const char *format, ...)
- ATTRIBUTE_PRINTF (2, 3);
-
-static void
-ctf_save_write_metadata (struct trace_write_handler *handler,
- const char *format, ...)
-{
- va_list args;
-
- va_start (args, format);
- if (vfprintf (handler->metadata_fd, format, args) < 0)
- error (_("Unable to write metadata file (%s)"),
- safe_strerror (errno));
- va_end (args);
-}
-
-/* Write BUF of length SIZE to datastream file represented by
- HANDLER. */
-
-static int
-ctf_save_write (struct trace_write_handler *handler,
- const gdb_byte *buf, size_t size)
-{
- if (fwrite (buf, size, 1, handler->datastream_fd) != 1)
- error (_("Unable to write file for saving trace data (%s)"),
- safe_strerror (errno));
-
- handler->content_size += size;
-
- return 0;
-}
-
-/* Write a unsigned 32-bit integer to datastream file represented by
- HANDLER. */
-
-#define ctf_save_write_uint32(HANDLER, U32) \
- ctf_save_write (HANDLER, (gdb_byte *) &U32, 4)
-
-/* Write a signed 32-bit integer to datastream file represented by
- HANDLER. */
-
-#define ctf_save_write_int32(HANDLER, INT32) \
- ctf_save_write ((HANDLER), (gdb_byte *) &(INT32), 4)
-
-/* Set datastream file position. Update HANDLER->content_size
- if WHENCE is SEEK_CUR. */
-
-static int
-ctf_save_fseek (struct trace_write_handler *handler, long offset,
- int whence)
-{
- gdb_assert (whence != SEEK_END);
- gdb_assert (whence != SEEK_SET
- || offset <= handler->content_size + handler->packet_start);
-
- if (fseek (handler->datastream_fd, offset, whence))
- error (_("Unable to seek file for saving trace data (%s)"),
- safe_strerror (errno));
-
- if (whence == SEEK_CUR)
- handler->content_size += offset;
-
- return 0;
-}
-
-/* Change the datastream file position to align on ALIGN_SIZE,
- and write BUF to datastream file. The size of BUF is SIZE. */
-
-static int
-ctf_save_align_write (struct trace_write_handler *handler,
- const gdb_byte *buf,
- size_t size, size_t align_size)
-{
- long offset
- = (align_up (handler->content_size, align_size)
- - handler->content_size);
-
- if (ctf_save_fseek (handler, offset, SEEK_CUR))
- return -1;
-
- if (ctf_save_write (handler, buf, size))
- return -1;
-
- return 0;
-}
-
-/* Write events to next new packet. */
-
-static void
-ctf_save_next_packet (struct trace_write_handler *handler)
-{
- handler->packet_start += (handler->content_size + 4);
- ctf_save_fseek (handler, handler->packet_start, SEEK_SET);
- handler->content_size = 0;
-}
-
-/* Write the CTF metadata header. */
-
-static void
-ctf_save_metadata_header (struct trace_write_handler *handler)
-{
- ctf_save_write_metadata (handler, "/* CTF %d.%d */\n",
- CTF_SAVE_MAJOR, CTF_SAVE_MINOR);
- ctf_save_write_metadata (handler,
- "typealias integer { size = 8; align = 8; "
- "signed = false; encoding = ascii;}"
- " := ascii;\n");
- ctf_save_write_metadata (handler,
- "typealias integer { size = 8; align = 8; "
- "signed = false; }"
- " := uint8_t;\n");
- ctf_save_write_metadata (handler,
- "typealias integer { size = 16; align = 16;"
- "signed = false; } := uint16_t;\n");
- ctf_save_write_metadata (handler,
- "typealias integer { size = 32; align = 32;"
- "signed = false; } := uint32_t;\n");
- ctf_save_write_metadata (handler,
- "typealias integer { size = 64; align = 64;"
- "signed = false; base = hex;}"
- " := uint64_t;\n");
- ctf_save_write_metadata (handler,
- "typealias integer { size = 32; align = 32;"
- "signed = true; } := int32_t;\n");
- ctf_save_write_metadata (handler,
- "typealias integer { size = 64; align = 64;"
- "signed = true; } := int64_t;\n");
- ctf_save_write_metadata (handler,
- "typealias string { encoding = ascii;"
- " } := chars;\n");
- ctf_save_write_metadata (handler, "\n");
-
- /* Get the byte order of the host and write CTF data in this byte
- order. */
-#if WORDS_BIGENDIAN
-#define HOST_ENDIANNESS "be"
-#else
-#define HOST_ENDIANNESS "le"
-#endif
-
- ctf_save_write_metadata (handler,
- "\ntrace {\n"
- " major = %u;\n"
- " minor = %u;\n"
- " byte_order = %s;\n"
- " packet.header := struct {\n"
- " uint32_t magic;\n"
- " };\n"
- "};\n"
- "\n"
- "stream {\n"
- " packet.context := struct {\n"
- " uint32_t content_size;\n"
- " uint32_t packet_size;\n"
- " uint16_t tpnum;\n"
- " };\n"
- " event.header := struct {\n"
- " uint32_t id;\n"
- " };\n"
- "};\n",
- CTF_SAVE_MAJOR, CTF_SAVE_MINOR,
- HOST_ENDIANNESS);
- ctf_save_write_metadata (handler, "\n");
-}
-
-/* CTF trace writer. */
-
-struct ctf_trace_file_writer
-{
- struct trace_file_writer base;
-
- /* States related to writing CTF trace file. */
- struct trace_write_handler tcs;
-};
-
-/* This is the implementation of trace_file_write_ops method
- dtor. */
-
-static void
-ctf_dtor (struct trace_file_writer *self)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
-
- if (writer->tcs.metadata_fd != NULL)
- fclose (writer->tcs.metadata_fd);
-
- if (writer->tcs.datastream_fd != NULL)
- fclose (writer->tcs.datastream_fd);
-
-}
-
-/* This is the implementation of trace_file_write_ops method
- target_save. */
-
-static int
-ctf_target_save (struct trace_file_writer *self,
- const char *dirname)
-{
- /* Don't support save trace file to CTF format in the target. */
- return 0;
-}
-
-/* This is the implementation of trace_file_write_ops method
- start. It creates the directory DIRNAME, metadata and datastream
- in the directory. */
-
-static void
-ctf_start (struct trace_file_writer *self, const char *dirname)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- mode_t hmode = S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH;
-
- /* Create DIRNAME. */
- if (mkdir (dirname, hmode) && errno != EEXIST)
- error (_("Unable to open directory '%ps' for saving trace data (%s)"),
- styled_string (file_name_style.style (), dirname),
- safe_strerror (errno));
-
- memset (&writer->tcs, '\0', sizeof (writer->tcs));
-
- std::string file_name = string_printf ("%s/%s", dirname, CTF_METADATA_NAME);
-
- writer->tcs.metadata_fd
- = gdb_fopen_cloexec (file_name.c_str (), "w").release ();
- if (writer->tcs.metadata_fd == NULL)
- error (_("Unable to open file '%ps' for saving trace data (%s)"),
- styled_string (file_name_style.style (), file_name.c_str ()),
- safe_strerror (errno));
-
- ctf_save_metadata_header (&writer->tcs);
-
- file_name = string_printf ("%s/%s", dirname, CTF_DATASTREAM_NAME);
- writer->tcs.datastream_fd
- = gdb_fopen_cloexec (file_name.c_str (), "w").release ();
- if (writer->tcs.datastream_fd == NULL)
- error (_("Unable to open file '%ps' for saving trace data (%s)"),
- styled_string (file_name_style.style (), file_name.c_str ()),
- safe_strerror (errno));
-}
-
-/* This is the implementation of trace_file_write_ops method
- write_header. Write the types of events on trace variable and
- frame. */
-
-static void
-ctf_write_header (struct trace_file_writer *self)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
-
-
- ctf_save_write_metadata (&writer->tcs, "\n");
- ctf_save_write_metadata (&writer->tcs,
- "event {\n\tname = \"memory\";\n\tid = %u;\n"
- "\tfields := struct { \n"
- "\t\tuint64_t address;\n"
- "\t\tuint16_t length;\n"
- "\t\tuint8_t contents[length];\n"
- "\t};\n"
- "};\n", CTF_EVENT_ID_MEMORY);
-
- ctf_save_write_metadata (&writer->tcs, "\n");
- ctf_save_write_metadata (&writer->tcs,
- "event {\n\tname = \"tsv\";\n\tid = %u;\n"
- "\tfields := struct { \n"
- "\t\tuint64_t val;\n"
- "\t\tuint32_t num;\n"
- "\t};\n"
- "};\n", CTF_EVENT_ID_TSV);
-
- ctf_save_write_metadata (&writer->tcs, "\n");
- ctf_save_write_metadata (&writer->tcs,
- "event {\n\tname = \"frame\";\n\tid = %u;\n"
- "\tfields := struct { \n"
- "\t};\n"
- "};\n", CTF_EVENT_ID_FRAME);
-
- ctf_save_write_metadata (&writer->tcs, "\n");
- ctf_save_write_metadata (&writer->tcs,
- "event {\n\tname = \"tsv_def\";\n"
- "\tid = %u;\n\tfields := struct { \n"
- "\t\tint64_t initial_value;\n"
- "\t\tint32_t number;\n"
- "\t\tint32_t builtin;\n"
- "\t\tchars name;\n"
- "\t};\n"
- "};\n", CTF_EVENT_ID_TSV_DEF);
-
- ctf_save_write_metadata (&writer->tcs, "\n");
- ctf_save_write_metadata (&writer->tcs,
- "event {\n\tname = \"tp_def\";\n"
- "\tid = %u;\n\tfields := struct { \n"
- "\t\tuint64_t addr;\n"
- "\t\tuint64_t traceframe_usage;\n"
- "\t\tint32_t number;\n"
- "\t\tint32_t enabled;\n"
- "\t\tint32_t step;\n"
- "\t\tint32_t pass;\n"
- "\t\tint32_t hit_count;\n"
- "\t\tint32_t type;\n"
- "\t\tchars cond;\n"
-
- "\t\tuint32_t action_num;\n"
- "\t\tchars actions[action_num];\n"
-
- "\t\tuint32_t step_action_num;\n"
- "\t\tchars step_actions[step_action_num];\n"
-
- "\t\tchars at_string;\n"
- "\t\tchars cond_string;\n"
-
- "\t\tuint32_t cmd_num;\n"
- "\t\tchars cmd_strings[cmd_num];\n"
- "\t};\n"
- "};\n", CTF_EVENT_ID_TP_DEF);
-
- gdb_assert (writer->tcs.content_size == 0);
- gdb_assert (writer->tcs.packet_start == 0);
-
- /* Create a new packet to contain this event. */
- self->ops->frame_ops->start (self, 0);
-}
-
-/* This is the implementation of trace_file_write_ops method
- write_regblock_type. Write the type of register event in
- metadata. */
-
-static void
-ctf_write_regblock_type (struct trace_file_writer *self, int size)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
-
- ctf_save_write_metadata (&writer->tcs, "\n");
-
- ctf_save_write_metadata (&writer->tcs,
- "event {\n\tname = \"register\";\n\tid = %u;\n"
- "\tfields := struct { \n"
- "\t\tascii contents[%d];\n"
- "\t};\n"
- "};\n",
- CTF_EVENT_ID_REGISTER, size);
-}
-
-/* This is the implementation of trace_file_write_ops method
- write_status. */
-
-static void
-ctf_write_status (struct trace_file_writer *self,
- struct trace_status *ts)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- uint32_t id;
-
- ctf_save_write_metadata (&writer->tcs, "\n");
- ctf_save_write_metadata (&writer->tcs,
- "event {\n\tname = \"status\";\n\tid = %u;\n"
- "\tfields := struct { \n"
- "\t\tint32_t stop_reason;\n"
- "\t\tint32_t stopping_tracepoint;\n"
- "\t\tint32_t traceframe_count;\n"
- "\t\tint32_t traceframes_created;\n"
- "\t\tint32_t buffer_free;\n"
- "\t\tint32_t buffer_size;\n"
- "\t\tint32_t disconnected_tracing;\n"
- "\t\tint32_t circular_buffer;\n"
- "\t};\n"
- "};\n",
- CTF_EVENT_ID_STATUS);
-
- id = CTF_EVENT_ID_STATUS;
- /* Event Id. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &id, 4, 4);
-
- ctf_save_write_int32 (&writer->tcs, ts->stop_reason);
- ctf_save_write_int32 (&writer->tcs, ts->stopping_tracepoint);
- ctf_save_write_int32 (&writer->tcs, ts->traceframe_count);
- ctf_save_write_int32 (&writer->tcs, ts->traceframes_created);
- ctf_save_write_int32 (&writer->tcs, ts->buffer_free);
- ctf_save_write_int32 (&writer->tcs, ts->buffer_size);
- ctf_save_write_int32 (&writer->tcs, ts->disconnected_tracing);
- ctf_save_write_int32 (&writer->tcs, ts->circular_buffer);
-}
-
-/* This is the implementation of trace_file_write_ops method
- write_uploaded_tsv. */
-
-static void
-ctf_write_uploaded_tsv (struct trace_file_writer *self,
- struct uploaded_tsv *tsv)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- int32_t int32;
- int64_t int64;
- const gdb_byte zero = 0;
-
- /* Event Id. */
- int32 = CTF_EVENT_ID_TSV_DEF;
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &int32, 4, 4);
-
- /* initial_value */
- int64 = tsv->initial_value;
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &int64, 8, 8);
-
- /* number */
- ctf_save_write_int32 (&writer->tcs, tsv->number);
-
- /* builtin */
- ctf_save_write_int32 (&writer->tcs, tsv->builtin);
-
- /* name */
- if (tsv->name != NULL)
- ctf_save_write (&writer->tcs, (gdb_byte *) tsv->name,
- strlen (tsv->name));
- ctf_save_write (&writer->tcs, &zero, 1);
-}
-
-/* This is the implementation of trace_file_write_ops method
- write_uploaded_tp. */
-
-static void
-ctf_write_uploaded_tp (struct trace_file_writer *self,
- struct uploaded_tp *tp)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- int32_t int32;
- int64_t int64;
- uint32_t u32;
- const gdb_byte zero = 0;
-
- /* Event Id. */
- int32 = CTF_EVENT_ID_TP_DEF;
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &int32, 4, 4);
-
- /* address */
- int64 = tp->addr;
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &int64, 8, 8);
-
- /* traceframe_usage */
- int64 = tp->traceframe_usage;
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &int64, 8, 8);
-
- /* number */
- ctf_save_write_int32 (&writer->tcs, tp->number);
-
- /* enabled */
- ctf_save_write_int32 (&writer->tcs, tp->enabled);
-
- /* step */
- ctf_save_write_int32 (&writer->tcs, tp->step);
-
- /* pass */
- ctf_save_write_int32 (&writer->tcs, tp->pass);
-
- /* hit_count */
- ctf_save_write_int32 (&writer->tcs, tp->hit_count);
-
- /* type */
- ctf_save_write_int32 (&writer->tcs, tp->type);
-
- /* condition */
- if (tp->cond != NULL)
- ctf_save_write (&writer->tcs, (gdb_byte *) tp->cond.get (),
- strlen (tp->cond.get ()));
- ctf_save_write (&writer->tcs, &zero, 1);
-
- /* actions */
- u32 = tp->actions.size ();
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &u32, 4, 4);
- for (const auto &act : tp->actions)
- ctf_save_write (&writer->tcs, (gdb_byte *) act.get (),
- strlen (act.get ()) + 1);
-
- /* step_actions */
- u32 = tp->step_actions.size ();
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &u32, 4, 4);
- for (const auto &act : tp->step_actions)
- ctf_save_write (&writer->tcs, (gdb_byte *) act.get (),
- strlen (act.get ()) + 1);
-
- /* at_string */
- if (tp->at_string != NULL)
- ctf_save_write (&writer->tcs, (gdb_byte *) tp->at_string.get (),
- strlen (tp->at_string.get ()));
- ctf_save_write (&writer->tcs, &zero, 1);
-
- /* cond_string */
- if (tp->cond_string != NULL)
- ctf_save_write (&writer->tcs, (gdb_byte *) tp->cond_string.get (),
- strlen (tp->cond_string.get ()));
- ctf_save_write (&writer->tcs, &zero, 1);
-
- /* cmd_strings */
- u32 = tp->cmd_strings.size ();
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &u32, 4, 4);
- for (const auto &act : tp->cmd_strings)
- ctf_save_write (&writer->tcs, (gdb_byte *) act.get (),
- strlen (act.get ()) + 1);
-
-}
-
-/* This is the implementation of trace_file_write_ops method
- write_tdesc. */
-
-static void
-ctf_write_tdesc (struct trace_file_writer *self)
-{
- /* Nothing so far. */
-}
-
-/* This is the implementation of trace_file_write_ops method
- write_definition_end. */
-
-static void
-ctf_write_definition_end (struct trace_file_writer *self)
-{
- self->ops->frame_ops->end (self);
-}
-
-/* This is the implementation of trace_file_write_ops method
- end. */
-
-static void
-ctf_end (struct trace_file_writer *self)
-{
- struct ctf_trace_file_writer *writer = (struct ctf_trace_file_writer *) self;
-
- gdb_assert (writer->tcs.content_size == 0);
-}
-
-/* This is the implementation of trace_frame_write_ops method
- start. */
-
-static void
-ctf_write_frame_start (struct trace_file_writer *self, uint16_t tpnum)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- uint32_t id = CTF_EVENT_ID_FRAME;
- uint32_t u32;
-
- /* Step 1: Write packet context. */
- /* magic. */
- u32 = CTF_MAGIC;
- ctf_save_write_uint32 (&writer->tcs, u32);
- /* content_size and packet_size.. We still don't know the value,
- write it later. */
- ctf_save_fseek (&writer->tcs, 4, SEEK_CUR);
- ctf_save_fseek (&writer->tcs, 4, SEEK_CUR);
- /* Tracepoint number. */
- ctf_save_write (&writer->tcs, (gdb_byte *) &tpnum, 2);
-
- /* Step 2: Write event "frame". */
- /* Event Id. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &id, 4, 4);
-}
-
-/* This is the implementation of trace_frame_write_ops method
- write_r_block. */
-
-static void
-ctf_write_frame_r_block (struct trace_file_writer *self,
- gdb_byte *buf, int32_t size)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- uint32_t id = CTF_EVENT_ID_REGISTER;
-
- /* Event Id. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &id, 4, 4);
-
- /* array contents. */
- ctf_save_align_write (&writer->tcs, buf, size, 1);
-}
-
-/* This is the implementation of trace_frame_write_ops method
- write_m_block_header. */
-
-static void
-ctf_write_frame_m_block_header (struct trace_file_writer *self,
- uint64_t addr, uint16_t length)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- uint32_t event_id = CTF_EVENT_ID_MEMORY;
-
- /* Event Id. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &event_id, 4, 4);
-
- /* Address. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &addr, 8, 8);
-
- /* Length. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &length, 2, 2);
-}
-
-/* This is the implementation of trace_frame_write_ops method
- write_m_block_memory. */
-
-static void
-ctf_write_frame_m_block_memory (struct trace_file_writer *self,
- gdb_byte *buf, uint16_t length)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
-
- /* Contents. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) buf, length, 1);
-}
-
-/* This is the implementation of trace_frame_write_ops method
- write_v_block. */
-
-static void
-ctf_write_frame_v_block (struct trace_file_writer *self,
- int32_t num, uint64_t val)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- uint32_t id = CTF_EVENT_ID_TSV;
-
- /* Event Id. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &id, 4, 4);
-
- /* val. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &val, 8, 8);
- /* num. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &num, 4, 4);
-}
-
-/* This is the implementation of trace_frame_write_ops method
- end. */
-
-static void
-ctf_write_frame_end (struct trace_file_writer *self)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- uint32_t u32;
- uint32_t t;
-
- /* Write the content size to packet header. */
- ctf_save_fseek (&writer->tcs, writer->tcs.packet_start + 4,
- SEEK_SET);
- u32 = writer->tcs.content_size * TARGET_CHAR_BIT;
-
- t = writer->tcs.content_size;
- ctf_save_write_uint32 (&writer->tcs, u32);
-
- /* Write the packet size. */
- u32 += 4 * TARGET_CHAR_BIT;
- ctf_save_write_uint32 (&writer->tcs, u32);
-
- writer->tcs.content_size = t;
-
- /* Write zero at the end of the packet. */
- ctf_save_fseek (&writer->tcs, writer->tcs.packet_start + t,
- SEEK_SET);
- u32 = 0;
- ctf_save_write_uint32 (&writer->tcs, u32);
- writer->tcs.content_size = t;
-
- ctf_save_next_packet (&writer->tcs);
-}
-
-/* Operations to write various types of trace frames into CTF
- format. */
-
-static const struct trace_frame_write_ops ctf_write_frame_ops =
-{
- ctf_write_frame_start,
- ctf_write_frame_r_block,
- ctf_write_frame_m_block_header,
- ctf_write_frame_m_block_memory,
- ctf_write_frame_v_block,
- ctf_write_frame_end,
-};
-
-/* Operations to write trace buffers into CTF format. */
-
-static const struct trace_file_write_ops ctf_write_ops =
-{
- ctf_dtor,
- ctf_target_save,
- ctf_start,
- ctf_write_header,
- ctf_write_regblock_type,
- ctf_write_status,
- ctf_write_uploaded_tsv,
- ctf_write_uploaded_tp,
- ctf_write_tdesc,
- ctf_write_definition_end,
- NULL,
- &ctf_write_frame_ops,
- ctf_end,
-};
-
-/* Return a trace writer for CTF format. */
-
-struct trace_file_writer *
-ctf_trace_file_writer_new (void)
-{
- struct ctf_trace_file_writer *writer = XNEW (struct ctf_trace_file_writer);
-
- writer->base.ops = &ctf_write_ops;
-
- return (struct trace_file_writer *) writer;
-}
-
-#if HAVE_LIBBABELTRACE
-/* Use libbabeltrace to read CTF data. The libbabeltrace provides
- iterator to iterate over each event in CTF data and APIs to get
- details of event and packet, so it is very convenient to use
- libbabeltrace to access events in CTF. */
-
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/ctf/events.h>
-#include <babeltrace/ctf/iterator.h>
-
-/* The CTF target. */
-
-static const target_info ctf_target_info = {
- "ctf",
- N_("CTF file"),
- N_("(Use a CTF directory as a target.\n\
-Specify the filename of the CTF directory.")
-};
-
-class ctf_target final : public tracefile_target
-{
-public:
- const target_info &info () const override
- { return ctf_target_info; }
-
- void close () override;
- void fetch_registers (struct regcache *, int) override;
- enum target_xfer_status xfer_partial (enum target_object object,
- const char *annex,
- gdb_byte *readbuf,
- const gdb_byte *writebuf,
- ULONGEST offset, ULONGEST len,
- ULONGEST *xfered_len) override;
- void files_info () override;
- int trace_find (enum trace_find_type type, int num,
- CORE_ADDR addr1, CORE_ADDR addr2, int *tpp) override;
- bool get_trace_state_variable_value (int tsv, LONGEST *val) override;
- traceframe_info_up traceframe_info () override;
-};
-
-/* The struct pointer for current CTF directory. */
-static struct bt_context *ctx = NULL;
-static struct bt_ctf_iter *ctf_iter = NULL;
-/* The position of the first packet containing trace frame. */
-static struct bt_iter_pos *start_pos;
-
-/* The name of CTF directory. */
-static gdb::unique_xmalloc_ptr<char> trace_dirname;
-
-static ctf_target ctf_ops;
-
-/* Destroy ctf iterator and context. */
-
-static void
-ctf_destroy (void)
-{
- if (ctf_iter != NULL)
- {
- bt_ctf_iter_destroy (ctf_iter);
- ctf_iter = NULL;
- }
- if (ctx != NULL)
- {
- bt_context_put (ctx);
- ctx = NULL;
- }
-}
-
-/* Open CTF trace data in DIRNAME. */
-
-static void
-ctf_open_dir (const char *dirname)
-{
- struct bt_iter_pos begin_pos;
- unsigned int count, i;
- struct bt_ctf_event_decl * const *list;
-
- ctx = bt_context_create ();
- if (ctx == NULL)
- error (_("Unable to create bt_context"));
- int handle_id = bt_context_add_trace (ctx, dirname, "ctf", NULL, NULL, NULL);
- if (handle_id < 0)
- {
- ctf_destroy ();
- error (_("Unable to use libbabeltrace on directory \"%s\""),
- dirname);
- }
-
- begin_pos.type = BT_SEEK_BEGIN;
- ctf_iter = bt_ctf_iter_create (ctx, &begin_pos, NULL);
- if (ctf_iter == NULL)
- {
- ctf_destroy ();
- error (_("Unable to create bt_iterator"));
- }
-
- /* Look for the declaration of register block. Get the length of
- array "contents" to set trace_regblock_size. */
-
- bt_ctf_get_event_decl_list (handle_id, ctx, &list, &count);
- for (i = 0; i < count; i++)
- if (streq ("register", bt_ctf_get_decl_event_name (list[i])))
- {
- const struct bt_ctf_field_decl * const *field_list;
- const struct bt_declaration *decl;
-
- bt_ctf_get_decl_fields (list[i], BT_EVENT_FIELDS, &field_list,
- &count);
-
- gdb_assert (count == 1);
- gdb_assert (streq ("contents",
- bt_ctf_get_decl_field_name (field_list[0])));
- decl = bt_ctf_get_decl_from_field_decl (field_list[0]);
- trace_regblock_size = bt_ctf_get_array_len (decl);
-
- break;
- }
-}
-
-#define SET_INT32_FIELD(EVENT, SCOPE, VAR, FIELD) \
- (VAR)->FIELD = (int) bt_ctf_get_int64 (bt_ctf_get_field ((EVENT), \
- (SCOPE), \
- #FIELD))
-
-#define SET_ENUM_FIELD(EVENT, SCOPE, VAR, TYPE, FIELD) \
- (VAR)->FIELD = (TYPE) bt_ctf_get_int64 (bt_ctf_get_field ((EVENT), \
- (SCOPE), \
- #FIELD))
-
-
-/* EVENT is the "status" event and TS is filled in. */
-
-static void
-ctf_read_status (struct bt_ctf_event *event, struct trace_status *ts)
-{
- const struct bt_definition *scope
- = bt_ctf_get_top_level_scope (event, BT_EVENT_FIELDS);
-
- SET_ENUM_FIELD (event, scope, ts, enum trace_stop_reason, stop_reason);
- SET_INT32_FIELD (event, scope, ts, stopping_tracepoint);
- SET_INT32_FIELD (event, scope, ts, traceframe_count);
- SET_INT32_FIELD (event, scope, ts, traceframes_created);
- SET_INT32_FIELD (event, scope, ts, buffer_free);
- SET_INT32_FIELD (event, scope, ts, buffer_size);
- SET_INT32_FIELD (event, scope, ts, disconnected_tracing);
- SET_INT32_FIELD (event, scope, ts, circular_buffer);
-
- bt_iter_next (bt_ctf_get_iter (ctf_iter));
-}
-
-/* Read the events "tsv_def" one by one, extract its contents and fill
- in the list UPLOADED_TSVS. */
-
-static void
-ctf_read_tsv (struct uploaded_tsv **uploaded_tsvs)
-{
- gdb_assert (ctf_iter != NULL);
-
- while (1)
- {
- struct bt_ctf_event *event;
- const struct bt_definition *scope;
- const struct bt_definition *def;
- uint32_t event_id;
- struct uploaded_tsv *utsv = NULL;
-
- event = bt_ctf_iter_read_event (ctf_iter);
- scope = bt_ctf_get_top_level_scope (event,
- BT_STREAM_EVENT_HEADER);
- event_id = bt_ctf_get_uint64 (bt_ctf_get_field (event, scope,
- "id"));
- if (event_id != CTF_EVENT_ID_TSV_DEF)
- break;
-
- scope = bt_ctf_get_top_level_scope (event,
- BT_EVENT_FIELDS);
-
- def = bt_ctf_get_field (event, scope, "number");
- utsv = get_uploaded_tsv ((int32_t) bt_ctf_get_int64 (def),
- uploaded_tsvs);
-
- def = bt_ctf_get_field (event, scope, "builtin");
- utsv->builtin = (int32_t) bt_ctf_get_int64 (def);
- def = bt_ctf_get_field (event, scope, "initial_value");
- utsv->initial_value = bt_ctf_get_int64 (def);
-
- def = bt_ctf_get_field (event, scope, "name");
- utsv->name = xstrdup (bt_ctf_get_string (def));
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
-
-}
-
-/* Read the value of element whose index is NUM from CTF and write it
- to the corresponding VAR->ARRAY. */
-
-#define SET_ARRAY_FIELD(EVENT, SCOPE, VAR, NUM, ARRAY) \
- do \
- { \
- uint32_t lu32, i; \
- const struct bt_definition *def; \
- \
- lu32 = (uint32_t) bt_ctf_get_uint64 (bt_ctf_get_field ((EVENT), \
- (SCOPE), \
- #NUM)); \
- def = bt_ctf_get_field ((EVENT), (SCOPE), #ARRAY); \
- for (i = 0; i < lu32; i++) \
- { \
- const struct bt_definition *element \
- = bt_ctf_get_index ((EVENT), def, i); \
- \
- (VAR)->ARRAY.emplace_back \
- (xstrdup (bt_ctf_get_string (element))); \
- } \
- } \
- while (0)
-
-/* Read a string from CTF and set VAR->FIELD. If the length of string
- is zero, set VAR->FIELD to NULL. */
-
-#define SET_STRING_FIELD(EVENT, SCOPE, VAR, FIELD) \
- do \
- { \
- const char *p = bt_ctf_get_string (bt_ctf_get_field ((EVENT), \
- (SCOPE), \
- #FIELD)); \
- \
- if (strlen (p) > 0) \
- (VAR)->FIELD = make_unique_xstrdup (p); \
- else \
- (VAR)->FIELD = nullptr; \
- } \
- while (0)
-
-/* Read the events "tp_def" one by one, extract its contents and fill
- in the list UPLOADED_TPS. */
-
-static void
-ctf_read_tp (struct uploaded_tp **uploaded_tps)
-{
- gdb_assert (ctf_iter != NULL);
-
- while (1)
- {
- struct bt_ctf_event *event;
- const struct bt_definition *scope;
- uint32_t u32;
- int32_t int32;
- uint64_t u64;
- struct uploaded_tp *utp = NULL;
-
- event = bt_ctf_iter_read_event (ctf_iter);
- scope = bt_ctf_get_top_level_scope (event,
- BT_STREAM_EVENT_HEADER);
- u32 = bt_ctf_get_uint64 (bt_ctf_get_field (event, scope,
- "id"));
- if (u32 != CTF_EVENT_ID_TP_DEF)
- break;
-
- scope = bt_ctf_get_top_level_scope (event,
- BT_EVENT_FIELDS);
- int32 = (int32_t) bt_ctf_get_int64 (bt_ctf_get_field (event,
- scope,
- "number"));
- u64 = bt_ctf_get_uint64 (bt_ctf_get_field (event, scope,
- "addr"));
- utp = get_uploaded_tp (int32, u64, uploaded_tps);
-
- SET_INT32_FIELD (event, scope, utp, enabled);
- SET_INT32_FIELD (event, scope, utp, step);
- SET_INT32_FIELD (event, scope, utp, pass);
- SET_INT32_FIELD (event, scope, utp, hit_count);
- SET_ENUM_FIELD (event, scope, utp, enum bptype, type);
-
- /* Read 'cmd_strings'. */
- SET_ARRAY_FIELD (event, scope, utp, cmd_num, cmd_strings);
- /* Read 'actions'. */
- SET_ARRAY_FIELD (event, scope, utp, action_num, actions);
- /* Read 'step_actions'. */
- SET_ARRAY_FIELD (event, scope, utp, step_action_num,
- step_actions);
-
- SET_STRING_FIELD(event, scope, utp, at_string);
- SET_STRING_FIELD(event, scope, utp, cond_string);
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
-}
-
-/* This is the implementation of target_ops method to_open. Open CTF
- trace data, read trace status, trace state variables and tracepoint
- definitions from the first packet. Set the start position at the
- second packet which contains events on trace blocks. */
-
-static void
-ctf_target_open (const char *args, int from_tty)
-{
- struct bt_ctf_event *event;
- uint32_t event_id;
- const struct bt_definition *scope;
- struct uploaded_tsv *uploaded_tsvs = NULL;
- struct uploaded_tp *uploaded_tps = NULL;
-
- std::string dirname = extract_single_filename_arg (args);
- if (dirname.empty ())
- error (_("No CTF directory specified."));
-
- ctf_open_dir (dirname.c_str ());
-
- target_preopen (from_tty);
-
- /* Skip the first packet which about the trace status. The first
- event is "frame". */
- event = bt_ctf_iter_read_event (ctf_iter);
- scope = bt_ctf_get_top_level_scope (event, BT_STREAM_EVENT_HEADER);
- event_id = bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, "id"));
- if (event_id != CTF_EVENT_ID_FRAME)
- error (_("Wrong event id of the first event"));
- /* The second event is "status". */
- bt_iter_next (bt_ctf_get_iter (ctf_iter));
- event = bt_ctf_iter_read_event (ctf_iter);
- scope = bt_ctf_get_top_level_scope (event, BT_STREAM_EVENT_HEADER);
- event_id = bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, "id"));
- if (event_id != CTF_EVENT_ID_STATUS)
- error (_("Wrong event id of the second event"));
- ctf_read_status (event, current_trace_status ());
-
- ctf_read_tsv (&uploaded_tsvs);
-
- ctf_read_tp (&uploaded_tps);
-
- event = bt_ctf_iter_read_event (ctf_iter);
- /* EVENT can be NULL if we've already gone to the end of stream of
- events. */
- if (event != NULL)
- {
- scope = bt_ctf_get_top_level_scope (event,
- BT_STREAM_EVENT_HEADER);
- event_id = bt_ctf_get_uint64 (bt_ctf_get_field (event,
- scope, "id"));
- if (event_id != CTF_EVENT_ID_FRAME)
- error (_("Wrong event id of the first event of the second packet"));
- }
-
- start_pos = bt_iter_get_pos (bt_ctf_get_iter (ctf_iter));
- gdb_assert (start_pos->type == BT_SEEK_RESTORE);
-
- trace_dirname = make_unique_xstrdup (dirname.c_str ());
- current_inferior ()->push_target (&ctf_ops);
-
- inferior_appeared (current_inferior (), CTF_PID);
-
- thread_info *thr = add_thread_silent (&ctf_ops, ptid_t (CTF_PID));
- switch_to_thread (thr);
-
- merge_uploaded_trace_state_variables (&uploaded_tsvs);
- merge_uploaded_tracepoints (&uploaded_tps);
-
- post_create_inferior (from_tty, true);
-}
-
-/* This is the implementation of target_ops method to_close. Destroy
- CTF iterator and context. */
-
-void
-ctf_target::close ()
-{
- ctf_destroy ();
- trace_dirname.reset ();
-
- switch_to_no_thread (); /* Avoid confusion from thread stuff. */
- exit_inferior (current_inferior ());
-
- trace_reset_local_state ();
-}
-
-/* This is the implementation of target_ops method to_files_info.
- Print the directory name of CTF trace data. */
-
-void
-ctf_target::files_info ()
-{
- gdb_printf ("\t`%s'\n", trace_dirname.get ());
-}
-
-/* This is the implementation of target_ops method to_fetch_registers.
- Iterate over events whose name is "register" in current frame,
- extract contents from events, and set REGCACHE with the contents.
- If no matched events are found, mark registers unavailable. */
-
-void
-ctf_target::fetch_registers (struct regcache *regcache, int regno)
-{
- struct gdbarch *gdbarch = regcache->arch ();
- struct bt_ctf_event *event = NULL;
- struct bt_iter_pos *pos;
-
- /* An uninitialized reg size says we're not going to be
- successful at getting register blocks. */
- if (trace_regblock_size == 0)
- return;
-
- gdb_assert (ctf_iter != NULL);
- /* Save the current position. */
- pos = bt_iter_get_pos (bt_ctf_get_iter (ctf_iter));
- gdb_assert (pos->type == BT_SEEK_RESTORE);
-
- while (1)
- {
- const char *name;
- struct bt_ctf_event *event1;
-
- event1 = bt_ctf_iter_read_event (ctf_iter);
-
- name = bt_ctf_event_name (event1);
-
- if (name == NULL || streq (name, "frame"))
- break;
- else if (streq (name, "register"))
- {
- event = event1;
- break;
- }
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
-
- /* Restore the position. */
- bt_iter_set_pos (bt_ctf_get_iter (ctf_iter), pos);
-
- if (event != NULL)
- {
- int offset, regsize, regn;
- const struct bt_definition *scope
- = bt_ctf_get_top_level_scope (event,
- BT_EVENT_FIELDS);
- const struct bt_definition *array
- = bt_ctf_get_field (event, scope, "contents");
- gdb_byte *regs = (gdb_byte *) bt_ctf_get_char_array (array);
-
- /* Assume the block is laid out in GDB register number order,
- each register with the size that it has in GDB. */
- offset = 0;
- for (regn = 0; regn < gdbarch_num_regs (gdbarch); regn++)
- {
- regsize = register_size (gdbarch, regn);
- /* Make sure we stay within block bounds. */
- if (offset + regsize >= trace_regblock_size)
- break;
- if (regcache->get_register_status (regn) == REG_UNKNOWN)
- {
- if (regno == regn)
- {
- regcache->raw_supply (regno, regs + offset);
- break;
- }
- else if (regno == -1)
- {
- regcache->raw_supply (regn, regs + offset);
- }
- }
- offset += regsize;
- }
- }
- else
- tracefile_fetch_registers (regcache, regno);
-}
-
-/* This is the implementation of target_ops method to_xfer_partial.
- Iterate over events whose name is "memory" in
- current frame, extract the address and length from events. If
- OFFSET is within the range, read the contents from events to
- READBUF. */
-
-enum target_xfer_status
-ctf_target::xfer_partial (enum target_object object,
- const char *annex, gdb_byte *readbuf,
- const gdb_byte *writebuf, ULONGEST offset,
- ULONGEST len, ULONGEST *xfered_len)
-{
- /* We're only doing regular memory for now. */
- if (object != TARGET_OBJECT_MEMORY)
- return TARGET_XFER_E_IO;
-
- if (readbuf == NULL)
- error (_("ctf_xfer_partial: trace file is read-only"));
-
- if (get_traceframe_number () != -1)
- {
- struct bt_iter_pos *pos;
- enum target_xfer_status res;
- /* Records the lowest available address of all blocks that
- intersects the requested range. */
- ULONGEST low_addr_available = 0;
-
- gdb_assert (ctf_iter != NULL);
- /* Save the current position. */
- pos = bt_iter_get_pos (bt_ctf_get_iter (ctf_iter));
- gdb_assert (pos->type == BT_SEEK_RESTORE);
-
- /* Iterate through the traceframe's blocks, looking for
- memory. */
- while (1)
- {
- ULONGEST amt;
- uint64_t maddr;
- uint16_t mlen;
- const struct bt_definition *scope;
- const struct bt_definition *def;
- struct bt_ctf_event *event
- = bt_ctf_iter_read_event (ctf_iter);
- const char *name = bt_ctf_event_name (event);
-
- if (name == NULL || streq (name, "frame"))
- break;
- else if (!streq (name, "memory"))
- {
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
-
- continue;
- }
-
- scope = bt_ctf_get_top_level_scope (event,
- BT_EVENT_FIELDS);
-
- def = bt_ctf_get_field (event, scope, "address");
- maddr = bt_ctf_get_uint64 (def);
- def = bt_ctf_get_field (event, scope, "length");
- mlen = (uint16_t) bt_ctf_get_uint64 (def);
-
- /* If the block includes the first part of the desired
- range, return as much it has; GDB will re-request the
- remainder, which might be in a different block of this
- trace frame. */
- if (maddr <= offset && offset < (maddr + mlen))
- {
- const struct bt_definition *array
- = bt_ctf_get_field (event, scope, "contents");
- int k;
-
- gdb::byte_vector contents (mlen);
-
- for (k = 0; k < mlen; k++)
- {
- const struct bt_definition *element
- = bt_ctf_get_index (event, array, k);
-
- contents[k] = (gdb_byte) bt_ctf_get_uint64 (element);
- }
-
- amt = (maddr + mlen) - offset;
- if (amt > len)
- amt = len;
-
- memcpy (readbuf, &contents[offset - maddr], amt);
-
- /* Restore the position. */
- bt_iter_set_pos (bt_ctf_get_iter (ctf_iter), pos);
-
- if (amt == 0)
- return TARGET_XFER_EOF;
- else
- {
- *xfered_len = amt;
- return TARGET_XFER_OK;
- }
- }
-
- if (offset < maddr && maddr < (offset + len))
- if (low_addr_available == 0 || low_addr_available > maddr)
- low_addr_available = maddr;
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
-
- /* Restore the position. */
- bt_iter_set_pos (bt_ctf_get_iter (ctf_iter), pos);
-
- /* Requested memory is unavailable in the context of traceframes,
- and this address falls within a read-only section, fallback
- to reading from executable, up to LOW_ADDR_AVAILABLE */
- if (offset < low_addr_available)
- len = std::min (len, low_addr_available - offset);
- res = exec_read_partial_read_only (readbuf, offset, len, xfered_len);
-
- if (res == TARGET_XFER_OK)
- return TARGET_XFER_OK;
- else
- {
- /* No use trying further, we know some memory starting
- at MEMADDR isn't available. */
- *xfered_len = len;
- return TARGET_XFER_UNAVAILABLE;
- }
- }
- else
- {
- /* Fallback to reading from read-only sections. */
- return section_table_read_available_memory (readbuf, offset, len, xfered_len);
- }
-}
-
-/* This is the implementation of target_ops method
- to_get_trace_state_variable_value.
- Iterate over events whose name is "tsv" in current frame. When the
- trace variable is found, set the value of it to *VAL and return
- true, otherwise return false. */
-
-bool
-ctf_target::get_trace_state_variable_value (int tsvnum, LONGEST *val)
-{
- struct bt_iter_pos *pos;
- bool found = false;
-
- gdb_assert (ctf_iter != NULL);
- /* Save the current position. */
- pos = bt_iter_get_pos (bt_ctf_get_iter (ctf_iter));
- gdb_assert (pos->type == BT_SEEK_RESTORE);
-
- /* Iterate through the traceframe's blocks, looking for 'V'
- block. */
- while (1)
- {
- struct bt_ctf_event *event
- = bt_ctf_iter_read_event (ctf_iter);
- const char *name = bt_ctf_event_name (event);
-
- if (name == NULL || streq (name, "frame"))
- break;
- else if (streq (name, "tsv"))
- {
- const struct bt_definition *scope;
- const struct bt_definition *def;
-
- scope = bt_ctf_get_top_level_scope (event,
- BT_EVENT_FIELDS);
-
- def = bt_ctf_get_field (event, scope, "num");
- if (tsvnum == (int32_t) bt_ctf_get_uint64 (def))
- {
- def = bt_ctf_get_field (event, scope, "val");
- *val = bt_ctf_get_uint64 (def);
-
- found = true;
- }
- }
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
-
- /* Restore the position. */
- bt_iter_set_pos (bt_ctf_get_iter (ctf_iter), pos);
-
- return found;
-}
-
-/* Return the tracepoint number in "frame" event. */
-
-static int
-ctf_get_tpnum_from_frame_event (struct bt_ctf_event *event)
-{
- /* The packet context of events has a field "tpnum". */
- const struct bt_definition *scope
- = bt_ctf_get_top_level_scope (event, BT_STREAM_PACKET_CONTEXT);
- uint64_t tpnum
- = bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, "tpnum"));
-
- return (int) tpnum;
-}
-
-/* Return the address at which the current frame was collected. */
-
-static CORE_ADDR
-ctf_get_traceframe_address (void)
-{
- struct bt_ctf_event *event = NULL;
- struct bt_iter_pos *pos;
- CORE_ADDR addr = 0;
-
- gdb_assert (ctf_iter != NULL);
- pos = bt_iter_get_pos (bt_ctf_get_iter (ctf_iter));
- gdb_assert (pos->type == BT_SEEK_RESTORE);
-
- while (1)
- {
- const char *name;
- struct bt_ctf_event *event1;
-
- event1 = bt_ctf_iter_read_event (ctf_iter);
-
- name = bt_ctf_event_name (event1);
-
- if (name == NULL)
- break;
- else if (streq (name, "frame"))
- {
- event = event1;
- break;
- }
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
-
- if (event != NULL)
- {
- int tpnum = ctf_get_tpnum_from_frame_event (event);
- struct tracepoint *tp
- = get_tracepoint_by_number_on_target (tpnum);
-
- if (tp != nullptr && tp->has_locations ())
- addr = tp->first_loc ().address;
- }
-
- /* Restore the position. */
- bt_iter_set_pos (bt_ctf_get_iter (ctf_iter), pos);
-
- return addr;
-}
-
-/* This is the implementation of target_ops method to_trace_find.
- Iterate the events whose name is "frame", extract the tracepoint
- number in it. Return traceframe number when matched. */
-
-int
-ctf_target::trace_find (enum trace_find_type type, int num,
- CORE_ADDR addr1, CORE_ADDR addr2, int *tpp)
-{
- int tfnum = 0;
- int found = 0;
-
- if (num == -1)
- {
- if (tpp != NULL)
- *tpp = -1;
- return -1;
- }
-
- gdb_assert (ctf_iter != NULL);
- /* Set iterator back to the start. */
- bt_iter_set_pos (bt_ctf_get_iter (ctf_iter), start_pos);
-
- while (1)
- {
- struct bt_ctf_event *event;
- const char *name;
-
- event = bt_ctf_iter_read_event (ctf_iter);
-
- name = bt_ctf_event_name (event);
-
- if (event == NULL || name == NULL)
- break;
-
- if (streq (name, "frame"))
- {
- CORE_ADDR tfaddr;
-
- if (type == tfind_number)
- {
- /* Looking for a specific trace frame. */
- if (tfnum == num)
- found = 1;
- }
- else
- {
- /* Start from the _next_ trace frame. */
- if (tfnum > get_traceframe_number ())
- {
- switch (type)
- {
- case tfind_tp:
- {
- struct tracepoint *tp = get_tracepoint (num);
-
- if (tp != NULL
- && (tp->number_on_target
- == ctf_get_tpnum_from_frame_event (event)))
- found = 1;
- break;
- }
- case tfind_pc:
- tfaddr = ctf_get_traceframe_address ();
- if (tfaddr == addr1)
- found = 1;
- break;
- case tfind_range:
- tfaddr = ctf_get_traceframe_address ();
- if (addr1 <= tfaddr && tfaddr <= addr2)
- found = 1;
- break;
- case tfind_outside:
- tfaddr = ctf_get_traceframe_address ();
- if (!(addr1 <= tfaddr && tfaddr <= addr2))
- found = 1;
- break;
- default:
- internal_error (_("unknown tfind type"));
- }
- }
- }
- if (found)
- {
- if (tpp != NULL)
- *tpp = ctf_get_tpnum_from_frame_event (event);
-
- /* Skip the event "frame". */
- bt_iter_next (bt_ctf_get_iter (ctf_iter));
-
- return tfnum;
- }
- tfnum++;
- }
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
-
- return -1;
-}
-
-/* This is the implementation of target_ops method to_traceframe_info.
- Iterate the events whose name is "memory", in current
- frame, extract memory range information, and return them in
- traceframe_info. */
-
-traceframe_info_up
-ctf_target::traceframe_info ()
-{
- traceframe_info_up info (new struct traceframe_info);
- const char *name;
- struct bt_iter_pos *pos;
-
- gdb_assert (ctf_iter != NULL);
- /* Save the current position. */
- pos = bt_iter_get_pos (bt_ctf_get_iter (ctf_iter));
- gdb_assert (pos->type == BT_SEEK_RESTORE);
-
- do
- {
- struct bt_ctf_event *event
- = bt_ctf_iter_read_event (ctf_iter);
-
- name = bt_ctf_event_name (event);
-
- if (name == nullptr || streq (name, "register") || streq (name, "frame"))
- ;
- else if (streq (name, "memory"))
- {
- const struct bt_definition *scope
- = bt_ctf_get_top_level_scope (event,
- BT_EVENT_FIELDS);
- const struct bt_definition *def;
-
- def = bt_ctf_get_field (event, scope, "address");
- CORE_ADDR start = bt_ctf_get_uint64 (def);
-
- def = bt_ctf_get_field (event, scope, "length");
- int length = (uint16_t) bt_ctf_get_uint64 (def);
-
- info->memory.emplace_back (start, length);
- }
- else if (streq (name, "tsv"))
- {
- int vnum;
- const struct bt_definition *scope
- = bt_ctf_get_top_level_scope (event,
- BT_EVENT_FIELDS);
- const struct bt_definition *def;
-
- def = bt_ctf_get_field (event, scope, "num");
- vnum = (int) bt_ctf_get_uint64 (def);
- info->tvars.push_back (vnum);
- }
- else
- {
- warning (_("Unhandled trace block type (%s) "
- "while building trace frame info."),
- name);
- }
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
- while (name != NULL && !streq (name, "frame"));
-
- /* Restore the position. */
- bt_iter_set_pos (bt_ctf_get_iter (ctf_iter), pos);
-
- return info;
-}
-
-#endif
-
-/* module initialization */
-
-INIT_GDB_FILE (ctf)
-{
-#if HAVE_LIBBABELTRACE
- add_target (ctf_target_info, ctf_target_open,
- filename_maybe_quoted_completer);
-#endif
-}
diff --git a/gdb/tracectf.h b/gdb/tracectf.h
deleted file mode 100644
index b0aa35f4621..00000000000
--- a/gdb/tracectf.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* CTF format support.
-
- Copyright (C) 2012-2026 Free Software Foundation, Inc.
-
- This file is part of GDB.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef GDB_TRACECTF_H
-#define GDB_TRACECTF_H
-
-extern struct trace_file_writer *ctf_trace_file_writer_new (void);
-
-#endif /* GDB_TRACECTF_H */
diff --git a/gdb/tracefile.c b/gdb/tracefile.c
index 6dc699f3efe..c4ebb823126 100644
--- a/gdb/tracefile.c
+++ b/gdb/tracefile.c
@@ -19,7 +19,6 @@
#include "tracefile.h"
#include "extract-store-integer.h"
-#include "tracectf.h"
#include "exec.h"
#include "regcache.h"
#include "gdbsupport/byte-vector.h"
@@ -323,7 +322,6 @@ tsave_command (const char *args, int from_tty)
int target_does_save = 0;
char **argv;
char *filename = NULL;
- int generate_ctf = 0;
if (args == NULL)
error_no_arg (_("file in which to save trace data"));
@@ -335,8 +333,6 @@ tsave_command (const char *args, int from_tty)
{
if (streq (*argv, "-r"))
target_does_save = 1;
- else if (streq (*argv, "-ctf"))
- generate_ctf = 1;
else if (**argv == '-')
error (_("unknown option `%s'"), *argv);
else
@@ -346,14 +342,10 @@ tsave_command (const char *args, int from_tty)
if (!filename)
error_no_arg (_("file in which to save trace data"));
- if (generate_ctf)
- trace_save_ctf (filename, target_does_save);
- else
- trace_save_tfile (filename, target_does_save);
+ trace_save_tfile (filename, target_does_save);
if (from_tty)
- gdb_printf (_("Trace data saved to %s '%s'.\n"),
- generate_ctf ? "directory" : "file", filename);
+ gdb_printf (_("Trace data saved to file '%s'.\n"), filename);
}
/* Save the trace data to file FILENAME of tfile format. */
@@ -365,17 +357,7 @@ trace_save_tfile (const char *filename, int target_does_save)
trace_save (filename, writer.get (), target_does_save);
}
-/* Save the trace data to dir DIRNAME of ctf format. */
-
-void
-trace_save_ctf (const char *dirname, int target_does_save)
-{
- trace_file_writer_up writer (ctf_trace_file_writer_new ());
- trace_save (dirname, writer.get (), target_does_save);
-}
-
-/* Fetch register data from tracefile, shared for both tfile and
- ctf. */
+/* Fetch register data from tracefile. */
void
tracefile_fetch_registers (struct regcache *regcache, int regno)
@@ -477,7 +459,6 @@ INIT_GDB_FILE (tracefile)
{
add_com ("tsave", class_trace, tsave_command, _("\
Save the trace data to a file.\n\
-Use the '-ctf' option to save the data to CTF format.\n\
Use the '-r' option to direct the target to save directly to the file,\n\
using its own filesystem."));
}
diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
index 247723aa7ee..19742c9c235 100644
--- a/gdb/tracepoint.h
+++ b/gdb/tracepoint.h
@@ -416,8 +416,6 @@ extern void tfind_1 (enum trace_find_type type, int num,
extern void trace_save_tfile (const char *filename,
int target_does_save);
-extern void trace_save_ctf (const char *dirname,
- int target_does_save);
extern traceframe_info_up parse_traceframe_info (const char *tframe_info);
--
2.53.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Remove support for the Common Trace Format (CTF)
2026-05-10 2:28 [PATCH] Remove support for the Common Trace Format (CTF) Sergio Durigan Junior
@ 2026-05-10 4:47 ` Eli Zaretskii
2026-05-10 12:43 ` Simon Marchi
1 sibling, 0 replies; 7+ messages in thread
From: Eli Zaretskii @ 2026-05-10 4:47 UTC (permalink / raw)
To: Sergio Durigan Junior; +Cc: gdb-patches, simon.marchi, doko, mjeanson
> From: Sergio Durigan Junior <sergiodj@sergiodj.net>
> Cc: Simon Marchi <simon.marchi@polymtl.ca>, doko@debian.org,
> Michael Jeanson <mjeanson@debian.org>,
> Sergio Durigan Junior <sergiodj@sergiodj.net>
> Date: Sat, 9 May 2026 22:28:13 -0400
>
> gdb/Makefile.in | 10 +-
> gdb/NEWS | 22 +-
> gdb/configure.ac | 43 -
> gdb/doc/gdb.texinfo | 48 +-
> gdb/mi/mi-main.c | 12 +-
> gdb/testsuite/gdb.base/completion.exp | 10 -
> gdb/testsuite/gdb.trace/actions.exp | 22 -
> .../gdb.trace/mi-trace-frame-collected.exp | 23 -
> .../gdb.trace/mi-trace-unavailable.exp | 23 -
> gdb/testsuite/gdb.trace/report.exp | 14 -
> gdb/testsuite/gdb.trace/tstatus.exp | 14 -
> gdb/testsuite/gdb.trace/tsv.exp | 12 -
> gdb/testsuite/gdb.trace/unavailable.exp | 22 -
> gdb/testsuite/gdb.trace/while-stepping.exp | 22 -
> gdb/top.c | 10 -
> gdb/tracectf.c | 1728 -----------------
> gdb/tracectf.h | 25 -
> gdb/tracefile.c | 25 +-
> gdb/tracepoint.h | 2 -
> 19 files changed, 31 insertions(+), 2056 deletions(-)
> delete mode 100644 gdb/tracectf.c
> delete mode 100644 gdb/tracectf.h
Thanks, the documentation parts are okay.
Reviewed-By: Eli Zaretskii <eliz@gnu.org>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Remove support for the Common Trace Format (CTF)
2026-05-10 2:28 [PATCH] Remove support for the Common Trace Format (CTF) Sergio Durigan Junior
2026-05-10 4:47 ` Eli Zaretskii
@ 2026-05-10 12:43 ` Simon Marchi
2026-05-10 16:42 ` Sergio Durigan Junior
1 sibling, 1 reply; 7+ messages in thread
From: Simon Marchi @ 2026-05-10 12:43 UTC (permalink / raw)
To: Sergio Durigan Junior, GDB Patches; +Cc: doko, Michael Jeanson
On 5/9/26 10:28 PM, Sergio Durigan Junior wrote:
> Hi there,
Hi Sergio!
> The Debian maintainer of babeltrace (Michael, in CC) is working
> towards removing the version 1 package from the archive in favour of
> version 2. This makes sense as version 1 is unsupported and projects
> should move to version 2.
>
> While digging through the archives I found PR buid/27142 (from
> Matthias, also in Cc) which was filed 5 years ago requesting GDB to
> support babeltrace v2. At the time Simon started a thread on gdb@
> suggesting that we should actually remove the support for CTF (Common
> Trace Format) altogether, since it's a niche feature (CTF) within a
> niche feature (tracepoints) and apparently GDB itself records CTF data
> in an unconventional way that might break other tools. You can see
> the thread here:
>
> https://inbox.sourceware.org/gdb/3fb1fbb6-836a-0e39-73a9-ef721630da88@polymtl.ca/
>
> Long story short, the consensus seems to be that CTF support is ripe
> to be removed, so that's what this patch does. I think I covered all
> places that referred to either CTF or babeltrace; I recompiled GDB
> here and things are still working as expected. I ran the tests I
> touched and there are some failures, but they're unrelated to CTF and
> I could reproduce them in a pristine tree as well.
>
> I've been a bit distant from the community so I don't know whether we
> have a specific procedure to remove features from GDB. I remember
> that when we removed support for an architecture, we used to deprecate
> it in release N and then proceed with the removal on release N+1. Not
> sure if this is applicable here, but let me know.
>
> Either way, I intend to disable support for babeltrace on Debian's GDB
> soon.
>
> WDYT?
>
> Signed-off-by: Sergio Durigan Junior <sergiodj@sergiodj.net>
>
> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=27142
Thanks for doing this, it's been in the back of my mind for 5 years :).
I wonder if the blank line between your two trailers is valid, or if
they should be contiguous. Also, we don't use the Signed-off-by tag,
but I don't think it hurts to have it.
The patch doesn't contain the generated files (configure & al), please
submit a patch with the generated files.
> diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
> index 68e760699bc..40f381f812d 100644
> --- a/gdb/doc/gdb.texinfo
> +++ b/gdb/doc/gdb.texinfo
> @@ -16547,7 +16547,7 @@ of trace data, via the @code{target tfile} command.
>
> @kindex tsave
> @item tsave [ -r ] @var{filename}
> -@itemx tsave [-ctf] @var{dirname}
> +@itemx tsave @var{dirname}
The dirname version can be removed, as that was CTF-specific.
> Save the trace data to @var{filename}. By default, this command
> assumes that @var{filename} refers to the host filesystem, so if
> necessary @value{GDBN} will copy raw trace data up from the target and
> @@ -16556,44 +16556,6 @@ optional argument @code{-r} (``remote'') to direct the target to save
> the data directly into @var{filename} in its own filesystem, which may be
> more efficient if the trace buffer is very large. (Note, however, that
> @code{target tfile} can only read from files accessible to the host.)
> -By default, this command will save trace frame in tfile format.
> -You can supply the optional argument @code{-ctf} to save data in CTF
> -format. The @dfn{Common Trace Format} (CTF) is proposed as a trace format
> -that can be shared by multiple debugging and tracing tools. Please go to
> -@indicateurl{http://www.efficios.com/ctf} to get more information.
> -
> -@kindex target tfile
> -@kindex tfile
> -@kindex target ctf
> -@kindex ctf
> -@item target tfile @var{filename}
> -@itemx target ctf @var{dirname}
> -Use the file named @var{filename} or directory named @var{dirname} as
> -a source of trace data. Commands that examine data work as they do with
> -a live target, but it is not possible to run any new trace experiments.
> -@code{tstatus} will report the state of the trace run at the moment
> -the data was saved, as well as the current trace frame you are examining.
> -Both @var{filename} and @var{dirname} must be on a filesystem accessible to
> -the host.
This removes the doc for "target tfile" entirely, that is too much.
The rest looks fine.
Simon
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Remove support for the Common Trace Format (CTF)
2026-05-10 12:43 ` Simon Marchi
@ 2026-05-10 16:42 ` Sergio Durigan Junior
2026-05-11 1:25 ` Simon Marchi
0 siblings, 1 reply; 7+ messages in thread
From: Sergio Durigan Junior @ 2026-05-10 16:42 UTC (permalink / raw)
To: Simon Marchi; +Cc: GDB Patches, doko, Michael Jeanson
On Sunday, 10 May 2026, Simon Marchi wrote:
> On 5/9/26 10:28 PM, Sergio Durigan Junior wrote:
>> Hi there,
>
> Hi Sergio!
Hey Simon :-).
>> The Debian maintainer of babeltrace (Michael, in CC) is working
>> towards removing the version 1 package from the archive in favour of
>> version 2. This makes sense as version 1 is unsupported and projects
>> should move to version 2.
>>
>> While digging through the archives I found PR buid/27142 (from
>> Matthias, also in Cc) which was filed 5 years ago requesting GDB to
>> support babeltrace v2. At the time Simon started a thread on gdb@
>> suggesting that we should actually remove the support for CTF (Common
>> Trace Format) altogether, since it's a niche feature (CTF) within a
>> niche feature (tracepoints) and apparently GDB itself records CTF data
>> in an unconventional way that might break other tools. You can see
>> the thread here:
>>
>> https://inbox.sourceware.org/gdb/3fb1fbb6-836a-0e39-73a9-ef721630da88@polymtl.ca/
>>
>> Long story short, the consensus seems to be that CTF support is ripe
>> to be removed, so that's what this patch does. I think I covered all
>> places that referred to either CTF or babeltrace; I recompiled GDB
>> here and things are still working as expected. I ran the tests I
>> touched and there are some failures, but they're unrelated to CTF and
>> I could reproduce them in a pristine tree as well.
>>
>> I've been a bit distant from the community so I don't know whether we
>> have a specific procedure to remove features from GDB. I remember
>> that when we removed support for an architecture, we used to deprecate
>> it in release N and then proceed with the removal on release N+1. Not
>> sure if this is applicable here, but let me know.
>>
>> Either way, I intend to disable support for babeltrace on Debian's GDB
>> soon.
>>
>> WDYT?
>>
>> Signed-off-by: Sergio Durigan Junior <sergiodj@sergiodj.net>
>>
>> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=27142
>
> Thanks for doing this, it's been in the back of my mind for 5 years :).
Yeah, I know the feeling!
> I wonder if the blank line between your two trailers is valid, or if
> they should be contiguous. Also, we don't use the Signed-off-by tag,
> but I don't think it hurts to have it.
Ah, got it. I can remove the Signed-off-by, no problem.
> The patch doesn't contain the generated files (configure & al), please
> submit a patch with the generated files.
Hm, I was following the instructions from
<https://sourceware.org/gdb/wiki/DeveloperTips#Editing_configure.ac>.
Are they out-of-date? I'm happy to update the wiki if that's the case.
>> diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
>> index 68e760699bc..40f381f812d 100644
>> --- a/gdb/doc/gdb.texinfo
>> +++ b/gdb/doc/gdb.texinfo
>> @@ -16547,7 +16547,7 @@ of trace data, via the @code{target tfile} command.
>>
>> @kindex tsave
>> @item tsave [ -r ] @var{filename}
>> -@itemx tsave [-ctf] @var{dirname}
>> +@itemx tsave @var{dirname}
>
> The dirname version can be removed, as that was CTF-specific.
Ah, true. In fact, I believe the entire @itemx becomes unnecessary, so
I've removed it altogether.
>> Save the trace data to @var{filename}. By default, this command
>> assumes that @var{filename} refers to the host filesystem, so if
>> necessary @value{GDBN} will copy raw trace data up from the target and
>> @@ -16556,44 +16556,6 @@ optional argument @code{-r} (``remote'') to direct the target to save
>> the data directly into @var{filename} in its own filesystem, which may be
>> more efficient if the trace buffer is very large. (Note, however, that
>> @code{target tfile} can only read from files accessible to the host.)
>> -By default, this command will save trace frame in tfile format.
>> -You can supply the optional argument @code{-ctf} to save data in CTF
>> -format. The @dfn{Common Trace Format} (CTF) is proposed as a trace format
>> -that can be shared by multiple debugging and tracing tools. Please go to
>> -@indicateurl{http://www.efficios.com/ctf} to get more information.
>> -
>> -@kindex target tfile
>> -@kindex tfile
>> -@kindex target ctf
>> -@kindex ctf
>> -@item target tfile @var{filename}
>> -@itemx target ctf @var{dirname}
>> -Use the file named @var{filename} or directory named @var{dirname} as
>> -a source of trace data. Commands that examine data work as they do with
>> -a live target, but it is not possible to run any new trace experiments.
>> -@code{tstatus} will report the state of the trace run at the moment
>> -the data was saved, as well as the current trace frame you are examining.
>> -Both @var{filename} and @var{dirname} must be on a filesystem accessible to
>> -the host.
>
> This removes the doc for "target tfile" entirely, that is too much.
Oh, sorry, that was a mistake indeed. Let me reintroduce the applicable
parts.
Here's the updated patch, including the auto-generated files.
Thanks,
--
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
https://sergiodj.net/
From 52e93159b41c7251b87425fb7daf8927c992ae09 Mon Sep 17 00:00:00 2001
From: Sergio Durigan Junior <sergiodj@sergiodj.net>
Date: Sat, 9 May 2026 22:15:38 -0400
Subject: [PATCH] Remove support for the Common Trace Format (CTF)
Hi there,
The Debian maintainer of babeltrace (Michael, in CC) is working
towards removing the version 1 package from the archive in favour of
version 2. This makes sense as version 1 is unsupported and projects
should move to version 2.
While digging through the archives I found PR buid/27142 (from
Matthias, also in Cc) which was filed 5 years ago requesting GDB to
support babeltrace v2. At the time Simon started a thread on gdb@
suggesting that we should actually remove the support for CTF (Common
Trace Format) altogether, since it's a niche feature (CTF) within a
niche feature (tracepoints) and apparently GDB itself records CTF data
in an unconventional way that might break other tools. You can see
the thread here:
https://inbox.sourceware.org/gdb/3fb1fbb6-836a-0e39-73a9-ef721630da88@polymtl.ca/
Long story short, the consensus seems to be that CTF support is ripe
to be removed, so that's what this patch does. I think I covered all
places that referred to either CTF or babeltrace; I recompiled GDB
here and things are still working as expected. I ran the tests I
touched and there are some failures, but they're unrelated to CTF and
I could reproduce them in a pristine tree as well.
I've been a bit distant from the community so I don't know whether we
have a specific procedure to remove features from GDB. I remember
that when we removed support for an architecture, we used to deprecate
it in release N and then proceed with the removal on release N+1. Not
sure if this is applicable here, but let me know.
Either way, I intend to disable support for babeltrace on Debian's GDB
soon.
WDYT?
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=27142
---
gdb/Makefile.in | 10 +-
gdb/NEWS | 22 +-
gdb/config.in | 3 -
gdb/configure | 540 +-----
gdb/configure.ac | 43 -
gdb/doc/gdb.texinfo | 52 +-
gdb/mi/mi-main.c | 12 +-
gdb/testsuite/gdb.base/completion.exp | 10 -
gdb/testsuite/gdb.trace/actions.exp | 22 -
.../gdb.trace/mi-trace-frame-collected.exp | 23 -
.../gdb.trace/mi-trace-unavailable.exp | 23 -
gdb/testsuite/gdb.trace/report.exp | 14 -
gdb/testsuite/gdb.trace/tstatus.exp | 14 -
gdb/testsuite/gdb.trace/tsv.exp | 12 -
gdb/testsuite/gdb.trace/unavailable.exp | 22 -
gdb/testsuite/gdb.trace/while-stepping.exp | 22 -
gdb/top.c | 10 -
gdb/tracectf.c | 1728 -----------------
gdb/tracectf.h | 25 -
gdb/tracefile.c | 25 +-
gdb/tracepoint.h | 2 -
21 files changed, 41 insertions(+), 2593 deletions(-)
delete mode 100644 gdb/tracectf.c
delete mode 100644 gdb/tracectf.h
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index e38ba95eebd..a0c11f5eb57 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -197,10 +197,6 @@ LIBEXPAT = @LIBEXPAT@
# Where is lzma? This will be empty if lzma was not available.
LIBLZMA = @LIBLZMA@
-# Where is libbabeltrace? This will be empty if libbabeltrace was not
-# available.
-LIBBABELTRACE = @LIBBABELTRACE@
-
# Where is libxxhash? This will be empty if libxxhash was not
# available.
LIBXXHASH = @LIBXXHASH@
@@ -677,10 +673,10 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(LIBCTF) $(BFD) $(ZLIB) $(ZSTD_LIBS) \
$(LIBSUPPORT) $(INTL) $(LIBIBERTY) $(LIBDECNUMBER) \
$(XM_CLIBS) $(GDBTKLIBS) $(LIBBACKTRACE_LIB) \
@LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ $(AMD_DBGAPI_LIBS) \
- $(LIBEXPAT) $(LIBLZMA) $(LIBBABELTRACE) $(LIBIPT) \
+ $(LIBEXPAT) $(LIBLZMA) $(LIBIPT) \
$(WIN32LIBS) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) $(LIBICONV) \
$(GMPLIBS) $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS) \
- $(DEBUGINFOD_LIBS) $(LIBBABELTRACE_LIB)
+ $(DEBUGINFOD_LIBS)
CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) $(CTF_DEPS) \
$(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) \
$(LIBSUPPORT)
@@ -1208,7 +1204,6 @@ COMMON_SFILES = \
thread-iter.c \
tid-parse.c \
top.c \
- tracectf.c \
tracefile.c \
tracefile-tfile.c \
tracepoint.c \
@@ -1697,7 +1692,6 @@ HFILES_NO_SRCDIR = \
tid-parse.h \
tilegx-tdep.h \
top.h \
- tracectf.h \
tracefile.h \
tracepoint.h \
trad-frame.h \
diff --git a/gdb/NEWS b/gdb/NEWS
index 480e1854002..48a80856aa1 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -3,6 +3,9 @@
*** Changes since GDB 17
+* Support for the Common Trace Format (CTF) has been removed. GDB now
+ saves trace information exclusively in its own "tfile" format.
+
* Support for .gdb_index sections with version less than 7 has been
removed.
@@ -78,6 +81,12 @@
* The Windows native target now supports non-stop mode. This feature
requires Windows 10 or later.
+* Configure changes
+
+** --with-babeltrace has been removed. The babeltrace library was
+ only used to help GDB parse Common Trace Format (CTF) data. The
+ support for CTF has also been removed.
+
* New targets
GNU/Linux/MicroBlaze (gdbserver) microblazeel-*linux*
@@ -112,7 +121,8 @@ show debug gnu-ifunc
set debug ctf on|off
show debug ctf
- Turn on or off debug messages about CTF reading.
+ Turn on or off debug messages about Compact C Type Format (CTF)
+ reading.
set progress-bars enabled on|off
show progress-bars enabled
@@ -130,8 +140,15 @@ disable skip
These are new aliases for 'skip delete', 'skip enable', and 'skip
disable' respectively.
+* MI changes
+
+** The "-trace-save" command no longer supports the "-ctf" flag.
+
* Changed commands
+tsave
+ This command no longer supports the "-ctf" flag.
+
maintenance info program-spaces
This command no longer displays the core file name.
@@ -147,6 +164,9 @@ New command class for help
* Removed commands
+target ctf
+ Support for the Common Trace Format (CTF) has been removed.
+
maint check psymtabs
maint info psymtabs
maint print psymbols
diff --git a/gdb/config.in b/gdb/config.in
index e357c22e411..73d0b1913ce 100644
--- a/gdb/config.in
+++ b/gdb/config.in
@@ -268,9 +268,6 @@
/* Define to 1 if you have the `atomic' library (-latomic). */
#undef HAVE_LIBATOMIC
-/* Define if you have the babeltrace library. */
-#undef HAVE_LIBBABELTRACE
-
/* Define if libbacktrace is being used. */
#undef HAVE_LIBBACKTRACE
diff --git a/gdb/configure b/gdb/configure
index 2fc0b583702..17c95930f60 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -641,9 +641,6 @@ NM_H
GDB_NM_FILE
CTF_DEPS
LIBCTF
-LTLIBBABELTRACE
-LIBBABELTRACE
-HAVE_LIBBABELTRACE
LIBBACKTRACE_LIB
LIBBACKTRACE_INC
HAVE_NATIVE_GCORE_HOST
@@ -977,9 +974,6 @@ with_tk
with_x
enable_sim
enable_libbacktrace
-with_babeltrace
-with_libbabeltrace_prefix
-with_libbabeltrace_type
enable_libctf
enable_unit_tests
'
@@ -1757,10 +1751,6 @@ Optional Packages:
--with-tcl directory containing tcl configuration (tclConfig.sh)
--with-tk directory containing tk configuration (tkConfig.sh)
--with-x use the X Window System
- --with-babeltrace include babeltrace support (auto/yes/no)
- --with-libbabeltrace-prefix[=DIR] search for libbabeltrace in DIR/include and DIR/lib
- --without-libbabeltrace-prefix don't search for libbabeltrace in includedir and libdir
- --with-libbabeltrace-type=TYPE type of library to search for (auto/static/shared)
Some influential environment variables:
CC C compiler command
@@ -11888,7 +11878,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11891 "configure"
+#line 11881 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11994,7 +11984,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11997 "configure"
+#line 11987 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -33544,532 +33534,6 @@ fi
-# Check for babeltrace and babeltrace-ctf
-
-# Check whether --with-babeltrace was given.
-if test "${with_babeltrace+set}" = set; then :
- withval=$with_babeltrace;
-else
- with_babeltrace=auto
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use babeltrace" >&5
-$as_echo_n "checking whether to use babeltrace... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_babeltrace" >&5
-$as_echo "$with_babeltrace" >&6; }
-
-if test "x$with_babeltrace" = "xno"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: babeltrace support disabled; GDB is unable to read CTF data." >&5
-$as_echo "$as_me: WARNING: babeltrace support disabled; GDB is unable to read CTF data." >&2;}
-else
- # Append -Werror to CFLAGS so that configure can catch the warning
- # "assignment from incompatible pointer type", which is related to
- # the babeltrace change from 1.0.3 to 1.1.0. Babeltrace 1.1.0 works
- # in GDB, while babeltrace 1.0.3 is broken.
- # AC_LIB_HAVE_LINKFLAGS may modify CPPFLAGS in it, so it should be
- # safe to save and restore CFLAGS here.
- saved_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS -Werror"
-
-
-
-
-
-
-
-
- use_additional=yes
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
-
-# Check whether --with-libbabeltrace-prefix was given.
-if test "${with_libbabeltrace_prefix+set}" = set; then :
- withval=$with_libbabeltrace_prefix;
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
-
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
-
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/lib"
- fi
- fi
-
-fi
-
-
-# Check whether --with-libbabeltrace-type was given.
-if test "${with_libbabeltrace_type+set}" = set; then :
- withval=$with_libbabeltrace_type; with_libbabeltrace_type=$withval
-else
- with_libbabeltrace_type=auto
-fi
-
- lib_type=`eval echo \$with_libbabeltrace_type`
-
- LIBBABELTRACE=
- LTLIBBABELTRACE=
- INCBABELTRACE=
- rpathdirs=
- ltrpathdirs=
- names_already_handled=
- names_next_round='babeltrace babeltrace-ctf'
- while test -n "$names_next_round"; do
- names_this_round="$names_next_round"
- names_next_round=
- for name in $names_this_round; do
- already_handled=
- for n in $names_already_handled; do
- if test "$n" = "$name"; then
- already_handled=yes
- break
- fi
- done
- if test -z "$already_handled"; then
- names_already_handled="$names_already_handled $name"
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
- eval value=\"\$HAVE_LIB$uppername\"
- if test -n "$value"; then
- if test "$value" = yes; then
- eval value=\"\$LIB$uppername\"
- test -z "$value" || LIBBABELTRACE="${LIBBABELTRACE}${LIBBABELTRACE:+ }$value"
- eval value=\"\$LTLIB$uppername\"
- test -z "$value" || LTLIBBABELTRACE="${LTLIBBABELTRACE}${LTLIBBABELTRACE:+ }$value"
- else
- :
- fi
- else
- found_dir=
- found_la=
- found_so=
- found_a=
- if test $use_additional = yes; then
- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test x$lib_type != xstatic; then
- found_dir="$additional_libdir"
- found_so="$additional_libdir/lib$name.$shlibext"
- if test -f "$additional_libdir/lib$name.la"; then
- found_la="$additional_libdir/lib$name.la"
- fi
- elif test x$lib_type != xshared; then
- if test -f "$additional_libdir/lib$name.$libext"; then
- found_dir="$additional_libdir"
- found_a="$additional_libdir/lib$name.$libext"
- if test -f "$additional_libdir/lib$name.la"; then
- found_la="$additional_libdir/lib$name.la"
- fi
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LTLIBBABELTRACE; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- case "$x" in
- -L*)
- dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext" && test x$lib_type != xstatic; then
- found_dir="$dir"
- found_so="$dir/lib$name.$shlibext"
- if test -f "$dir/lib$name.la"; then
- found_la="$dir/lib$name.la"
- fi
- elif test x$lib_type != xshared; then
- if test -f "$dir/lib$name.$libext"; then
- found_dir="$dir"
- found_a="$dir/lib$name.$libext"
- if test -f "$dir/lib$name.la"; then
- found_la="$dir/lib$name.la"
- fi
- fi
- fi
- ;;
- esac
- if test "X$found_dir" != "X"; then
- break
- fi
- done
- fi
- if test "X$found_dir" != "X"; then
- LTLIBBABELTRACE="${LTLIBBABELTRACE}${LTLIBBABELTRACE:+ }-L$found_dir -l$name"
- if test "X$found_so" != "X"; then
- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
- LIBBABELTRACE="${LIBBABELTRACE}${LIBBABELTRACE:+ }$found_so"
- else
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $found_dir"
- fi
- if test "$hardcode_direct" = yes; then
- LIBBABELTRACE="${LIBBABELTRACE}${LIBBABELTRACE:+ }$found_so"
- else
- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
- LIBBABELTRACE="${LIBBABELTRACE}${LIBBABELTRACE:+ }$found_so"
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
- fi
- else
- haveit=
- for x in $LDFLAGS $LIBBABELTRACE; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIBBABELTRACE="${LIBBABELTRACE}${LIBBABELTRACE:+ }-L$found_dir"
- fi
- if test "$hardcode_minus_L" != no; then
- LIBBABELTRACE="${LIBBABELTRACE}${LIBBABELTRACE:+ }$found_so"
- else
- LIBBABELTRACE="${LIBBABELTRACE}${LIBBABELTRACE:+ }-l$name"
- fi
- fi
- fi
- fi
- else
- if test "X$found_a" != "X"; then
- LIBBABELTRACE="${LIBBABELTRACE}${LIBBABELTRACE:+ }$found_a"
- else
- LIBBABELTRACE="${LIBBABELTRACE}${LIBBABELTRACE:+ }-L$found_dir -l$name"
- fi
- fi
- additional_includedir=
- case "$found_dir" in
- */lib | */lib/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
- additional_includedir="$basedir/include"
- ;;
- esac
- if test "X$additional_includedir" != "X"; then
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- for x in $CPPFLAGS $INCBABELTRACE; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- INCBABELTRACE="${INCBABELTRACE}${INCBABELTRACE:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- fi
- if test -n "$found_la"; then
- save_libdir="$libdir"
- case "$found_la" in
- */* | *\\*) . "$found_la" ;;
- *) . "./$found_la" ;;
- esac
- libdir="$save_libdir"
- for dep in $dependency_libs; do
- case "$dep" in
- -L*)
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- if test "X$additional_libdir" != "X/usr/lib"; then
- haveit=
- if test "X$additional_libdir" = "X/usr/local/lib"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- haveit=
- for x in $LDFLAGS $LIBBABELTRACE; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LIBBABELTRACE="${LIBBABELTRACE}${LIBBABELTRACE:+ }-L$additional_libdir"
- fi
- fi
- haveit=
- for x in $LDFLAGS $LTLIBBABELTRACE; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LTLIBBABELTRACE="${LTLIBBABELTRACE}${LTLIBBABELTRACE:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- ;;
- -R*)
- dir=`echo "X$dep" | sed -e 's/^X-R//'`
- if test "$enable_rpath" != no; then
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $dir"
- fi
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $dir"
- fi
- fi
- ;;
- -l*)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
- ;;
- *.la)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
- ;;
- *)
- LIBBABELTRACE="${LIBBABELTRACE}${LIBBABELTRACE:+ }$dep"
- LTLIBBABELTRACE="${LTLIBBABELTRACE}${LTLIBBABELTRACE:+ }$dep"
- ;;
- esac
- done
- fi
- else
- if test "x$lib_type" = "xauto" || test "x$lib_type" = "xshared"; then
- LIBBABELTRACE="${LIBBABELTRACE}${LIBBABELTRACE:+ }-l$name"
- LTLIBBABELTRACE="${LTLIBBABELTRACE}${LTLIBBABELTRACE:+ }-l$name"
- else
- LIBBABELTRACE="${LIBBABELTRACE}${LIBBABELTRACE:+ }-l:lib$name.$libext"
- LTLIBBABELTRACE="${LTLIBBABELTRACE}${LTLIBBABELTRACE:+ }-l:lib$name.$libext"
- fi
- fi
- fi
- fi
- done
- done
- if test "X$rpathdirs" != "X"; then
- if test -n "$hardcode_libdir_separator"; then
- alldirs=
- for found_dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
- done
- acl_save_libdir="$libdir"
- libdir="$alldirs"
- eval flag=\"$hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBBABELTRACE="${LIBBABELTRACE}${LIBBABELTRACE:+ }$flag"
- else
- for found_dir in $rpathdirs; do
- acl_save_libdir="$libdir"
- libdir="$found_dir"
- eval flag=\"$hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIBBABELTRACE="${LIBBABELTRACE}${LIBBABELTRACE:+ }$flag"
- done
- fi
- fi
- if test "X$ltrpathdirs" != "X"; then
- for found_dir in $ltrpathdirs; do
- LTLIBBABELTRACE="${LTLIBBABELTRACE}${LTLIBBABELTRACE:+ }-R$found_dir"
- done
- fi
-
-
- ac_save_CPPFLAGS="$CPPFLAGS"
-
- for element in $INCBABELTRACE; do
- haveit=
- for x in $CPPFLAGS; do
-
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
- fi
- done
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libbabeltrace" >&5
-$as_echo_n "checking for libbabeltrace... " >&6; }
-if ${ac_cv_libbabeltrace+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- ac_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBBABELTRACE"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <babeltrace/babeltrace.h>
- #include <babeltrace/ctf/events.h>
- #include <babeltrace/ctf/iterator.h>
-int
-main ()
-{
-struct bt_iter_pos *pos = bt_iter_get_pos (bt_ctf_get_iter (NULL));
- struct bt_ctf_event *event = NULL;
- const struct bt_definition *scope;
-
- pos->type = BT_SEEK_BEGIN;
- bt_iter_set_pos (bt_ctf_get_iter (NULL), pos);
- scope = bt_ctf_get_top_level_scope (event,
- BT_STREAM_EVENT_HEADER);
- bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, "id"));
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_libbabeltrace=yes
-else
- ac_cv_libbabeltrace=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS="$ac_save_LIBS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libbabeltrace" >&5
-$as_echo "$ac_cv_libbabeltrace" >&6; }
- if test "$ac_cv_libbabeltrace" = yes; then
- HAVE_LIBBABELTRACE=yes
-
-$as_echo "#define HAVE_LIBBABELTRACE 1" >>confdefs.h
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libbabeltrace" >&5
-$as_echo_n "checking how to link with libbabeltrace... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBBABELTRACE" >&5
-$as_echo "$LIBBABELTRACE" >&6; }
- else
- HAVE_LIBBABELTRACE=no
- CPPFLAGS="$ac_save_CPPFLAGS"
- LIBBABELTRACE=
- LTLIBBABELTRACE=
- fi
-
-
-
-
-
-
- CFLAGS=$saved_CFLAGS
-
- if test "$HAVE_LIBBABELTRACE" != yes; then
- if test "$with_babeltrace" = yes; then
- as_fn_error $? "babeltrace is missing or unusable" "$LINENO" 5
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: babeltrace is missing or unusable; GDB is unable to read CTF data." >&5
-$as_echo "$as_me: WARNING: babeltrace is missing or unusable; GDB is unable to read CTF data." >&2;}
- fi
- fi
-fi
-
# Check whether --enable-libctf was given.
if test "${enable_libctf+set}" = set; then :
enableval=$enable_libctf;
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 56ab86d9356..2f05daf614f 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -2332,49 +2332,6 @@ fi
AC_SUBST(LIBBACKTRACE_INC)
AC_SUBST(LIBBACKTRACE_LIB)
-# Check for babeltrace and babeltrace-ctf
-AC_ARG_WITH(babeltrace,
- AS_HELP_STRING([--with-babeltrace], [include babeltrace support (auto/yes/no)]),
- [], [with_babeltrace=auto])
-AC_MSG_CHECKING([whether to use babeltrace])
-AC_MSG_RESULT([$with_babeltrace])
-
-if test "x$with_babeltrace" = "xno"; then
- AC_MSG_WARN([babeltrace support disabled; GDB is unable to read CTF data.])
-else
- # Append -Werror to CFLAGS so that configure can catch the warning
- # "assignment from incompatible pointer type", which is related to
- # the babeltrace change from 1.0.3 to 1.1.0. Babeltrace 1.1.0 works
- # in GDB, while babeltrace 1.0.3 is broken.
- # AC_LIB_HAVE_LINKFLAGS may modify CPPFLAGS in it, so it should be
- # safe to save and restore CFLAGS here.
- saved_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS -Werror"
- AC_LIB_HAVE_LINKFLAGS([babeltrace], [babeltrace-ctf],
- [#include <babeltrace/babeltrace.h>
- #include <babeltrace/ctf/events.h>
- #include <babeltrace/ctf/iterator.h>],
- [struct bt_iter_pos *pos = bt_iter_get_pos (bt_ctf_get_iter (NULL));
- struct bt_ctf_event *event = NULL;
- const struct bt_definition *scope;
-
- pos->type = BT_SEEK_BEGIN;
- bt_iter_set_pos (bt_ctf_get_iter (NULL), pos);
- scope = bt_ctf_get_top_level_scope (event,
- BT_STREAM_EVENT_HEADER);
- bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, "id"));
- ])
- CFLAGS=$saved_CFLAGS
-
- if test "$HAVE_LIBBABELTRACE" != yes; then
- if test "$with_babeltrace" = yes; then
- AC_MSG_ERROR([babeltrace is missing or unusable])
- else
- AC_MSG_WARN([babeltrace is missing or unusable; GDB is unable to read CTF data.])
- fi
- fi
-fi
-
GCC_ENABLE([libctf], [yes], [], [Handle .ctf type-info sections])
if test "${enable_libctf}" = yes; then
AC_DEFINE(ENABLE_LIBCTF, 1, [Handle .ctf type-info sections])
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 68e760699bc..f6b3b114278 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -16547,7 +16547,6 @@ of trace data, via the @code{target tfile} command.
@kindex tsave
@item tsave [ -r ] @var{filename}
-@itemx tsave [-ctf] @var{dirname}
Save the trace data to @var{filename}. By default, this command
assumes that @var{filename} refers to the host filesystem, so if
necessary @value{GDBN} will copy raw trace data up from the target and
@@ -16556,44 +16555,19 @@ optional argument @code{-r} (``remote'') to direct the target to save
the data directly into @var{filename} in its own filesystem, which may be
more efficient if the trace buffer is very large. (Note, however, that
@code{target tfile} can only read from files accessible to the host.)
-By default, this command will save trace frame in tfile format.
-You can supply the optional argument @code{-ctf} to save data in CTF
-format. The @dfn{Common Trace Format} (CTF) is proposed as a trace format
-that can be shared by multiple debugging and tracing tools. Please go to
-@indicateurl{http://www.efficios.com/ctf} to get more information.
@kindex target tfile
@kindex tfile
-@kindex target ctf
-@kindex ctf
@item target tfile @var{filename}
-@itemx target ctf @var{dirname}
-Use the file named @var{filename} or directory named @var{dirname} as
-a source of trace data. Commands that examine data work as they do with
-a live target, but it is not possible to run any new trace experiments.
-@code{tstatus} will report the state of the trace run at the moment
-the data was saved, as well as the current trace frame you are examining.
-Both @var{filename} and @var{dirname} must be on a filesystem accessible to
-the host.
-
-The @var{filename} and @var{dirname} arguments supports escaping and
-quoting, see @ref{Filename Arguments,,Filenames As Command Arguments}.
-
-@smallexample
-(@value{GDBP}) target ctf ctf.ctf
-(@value{GDBP}) tfind
-Found trace frame 0, tracepoint 2
-39 ++a; /* set tracepoint 1 here */
-(@value{GDBP}) tdump
-Data collected at tracepoint 2, trace frame 0:
-i = 0
-a = 0
-b = 1 '\001'
-c = @{"123", "456", "789", "123", "456", "789"@}
-d = @{@{@{a = 1, b = 2@}, @{a = 3, b = 4@}@}, @{@{a = 5, b = 6@}, @{a = 7, b = 8@}@}@}
-(@value{GDBP}) p b
-$1 = 1
-@end smallexample
+Use the file named @var{filename} as a source of trace data. Commands
+that examine data work as they do with a live target, but it is not
+possible to run any new trace experiments. @code{tstatus} will report
+the state of the trace run at the moment the data was saved, as well
+as the current trace frame you are examining. @var{filename} must be
+on a filesystem accessible to the host.
+
+The @var{filename} argument supports escaping and quoting, see
+@ref{Filename Arguments,,Filenames As Command Arguments}.
@end table
@@ -37487,7 +37461,7 @@ body=[variable=@{name="$trace_timestamp",initial="0"@}
@subsubheading Synopsis
@smallexample
- -trace-save [ -r ] [ -ctf ] @var{filename}
+ -trace-save [ -r ] @var{filename}
@end smallexample
Saves the collected trace data to @var{filename}. Without the
@@ -37495,10 +37469,6 @@ Saves the collected trace data to @var{filename}. Without the
in a local file. With the @samp{-r} option the target is asked
to perform the save.
-By default, this command will save the trace in the tfile format. You can
-supply the optional @samp{-ctf} argument to save it the CTF format. See
-@ref{Trace Files} for more information about CTF.
-
@subsubheading @value{GDBN} Command
The corresponding @value{GDBN} command is @samp{tsave}.
@@ -41411,7 +41381,7 @@ distribution; if it is not, you can get the latest version from
@url{http://zlib.net}.
@c FIXME: what about other optional libraries: debuginfod, zstd,
-@c libipt, babeltrace, xxhash, source-highlight?
+@c libipt, xxhash, source-highlight?
@end table
@node Running Configure
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 4dd4a7f9a6c..52e642e1464 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -2395,19 +2395,17 @@ void
mi_cmd_trace_save (const char *command, const char *const *argv, int argc)
{
int target_saves = 0;
- int generate_ctf = 0;
const char *filename;
int oind = 0;
const char *oarg;
enum opt
{
- TARGET_SAVE_OPT, CTF_OPT
+ TARGET_SAVE_OPT,
};
static const struct mi_opt opts[] =
{
{"r", TARGET_SAVE_OPT, 0},
- {"ctf", CTF_OPT, 0},
{ 0, 0, 0 }
};
@@ -2423,9 +2421,6 @@ mi_cmd_trace_save (const char *command, const char *const *argv, int argc)
case TARGET_SAVE_OPT:
target_saves = 1;
break;
- case CTF_OPT:
- generate_ctf = 1;
- break;
}
}
@@ -2435,10 +2430,7 @@ mi_cmd_trace_save (const char *command, const char *const *argv, int argc)
filename = argv[oind];
- if (generate_ctf)
- trace_save_ctf (filename, target_saves);
- else
- trace_save_tfile (filename, target_saves);
+ trace_save_tfile (filename, target_saves);
}
void
diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
index e7407e75ee0..44cf649d5b6 100644
--- a/gdb/testsuite/gdb.base/completion.exp
+++ b/gdb/testsuite/gdb.base/completion.exp
@@ -90,16 +90,6 @@ gdb_test "complete set cp-abi aut" "set cp-abi auto"
# Test that completion of commands 'target FOO' works well.
set targets [list "core" "tfile" "exec"]
-# Test that completion of command 'target ctf' if GDB supports ctf
-# target.
-gdb_test_multiple "target ctf" "" {
- -re "Undefined target command: \"ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
- }
- -re "No CTF directory specified.*\r\n$gdb_prompt $" {
- lappend targets "ctf"
- }
-}
-
# Test artifacts are put in different locations depending on test
# is a parallel run or not. Firstly check file exists, and then
# do the test on file completion.
diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index 07c5de664da..8a8a08d0f9e 100644
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -318,9 +318,6 @@ set tracefile [standard_output_file ${testfile}]
gdb_test "tsave ${tracefile}.tf" \
"Trace data saved to file '${tracefile}.tf'\." \
"tsave ${testfile}.tf"
-gdb_test "tsave -ctf ${tracefile}.ctf" \
- "Trace data saved to directory '${tracefile}.ctf'\\." \
- "save ctf trace file"
# Restart GDB and read the trace data in tfile target.
clean_restart
@@ -328,22 +325,3 @@ gdb_file_cmd $binfile
gdb_test "target tfile ${tracefile}.tf" ".*" \
"change to tfile target"
check_tracepoint "tfile"
-
-# Try to read ctf data if GDB supports.
-set gdb_can_read_ctf_data 0
-gdb_test_multiple "target ctf" "" {
- -re "Undefined target command: \"ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
- set gdb_can_read_ctf_data 0
- }
- -re "No CTF directory specified.*\r\n$gdb_prompt $" {
- set gdb_can_read_ctf_data 1
- }
-}
-
-if { $gdb_can_read_ctf_data } {
- clean_restart
- gdb_file_cmd $binfile
- gdb_test "target ctf ${tracefile}.ctf" ".*" \
- "change to ctf target"
- check_tracepoint "ctf"
-}
diff --git a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
index 5ad8dabde47..78e8c942b57 100644
--- a/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
+++ b/gdb/testsuite/gdb.trace/mi-trace-frame-collected.exp
@@ -74,9 +74,6 @@ mi_gdb_test "-trace-stop" {.*\^done,stop-reason=.*} "trace stop"
set tracefile [standard_output_file ${testfile}]
mi_gdb_test "-trace-save ${tracefile}.tf" ".*\\^done" \
"save tfile trace file"
-# Save trace frames to ctf.
-mi_gdb_test "-trace-save -ctf ${tracefile}.ctf" ".*\\^done" \
- "save ctf trace file"
# Test the MI command '-trace-frame-collected' with DATA_SOURCE as
# trace data source.
@@ -138,26 +135,6 @@ proc test_trace_frame_collected { data_source } {
test_trace_frame_collected "live"
-# Change target to ctf if GDB supports it.
-set msg "-target-select ctf"
-send_gdb "-target-select ctf ${tracefile}.ctf\n"
-gdb_expect {
- -re ".*\\^connected.*${mi_gdb_prompt}$" {
- # GDB supports ctf, do the test.
- test_trace_frame_collected "ctf"
- }
- -re ".*\\^error,msg=\"Undefined target command.*${mi_gdb_prompt}$" {
- # GDB doesn't support ctf, skip the test.
- unsupported "gdb does not support ctf target"
- }
- -re ".*$mi_gdb_prompt$" {
- fail "$msg"
- }
- timeout {
- fail "$msg (timeout)"
- }
-}
-
# Change target to tfile.
mi_gdb_test "-target-select tfile ${tracefile}.tf" ".*\\^connected.*" \
"-target-select tfile"
diff --git a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
index 58e41db1d51..9facc8dee17 100644
--- a/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
+++ b/gdb/testsuite/gdb.trace/mi-trace-unavailable.exp
@@ -68,9 +68,6 @@ mi_gdb_test "-trace-stop" {.*} "trace stop"
set tracefile [standard_output_file ${testfile}]
mi_gdb_test "-trace-save ${tracefile}.tf" ".*\\^done" \
"save tfile trace file"
-# Save trace frames to ctf.
-mi_gdb_test "-trace-save -ctf ${tracefile}.ctf" ".*\\^done" \
- "save ctf trace file"
proc test_trace_unavailable { data_source } {
global decimal
@@ -174,26 +171,6 @@ proc test_trace_unavailable { data_source } {
test_trace_unavailable "live"
-# Change target to ctf if GDB supports it.
-set msg "-target-select ctf"
-send_gdb "-target-select ctf ${tracefile}.ctf\n"
-gdb_expect {
- -re ".*\\^connected.*${mi_gdb_prompt}$" {
- # GDB supports ctf, do the test.
- test_trace_unavailable "ctf"
- }
- -re ".*\\^error,msg=\"Undefined target command.*${mi_gdb_prompt}$" {
- # GDB doesn't support ctf, skip the test.
- unsupported "gdb does not support ctf target"
- }
- -re ".*$mi_gdb_prompt$" {
- fail "$msg"
- }
- timeout {
- fail "$msg (timeout)"
- }
-}
-
# Change target to tfile.
mi_gdb_test "-target-select tfile ${tracefile}.tf" ".*\\^connected.*" \
"-target-select tfile"
diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index 5ddffad076f..c67634e4ce7 100644
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -399,11 +399,6 @@ gdb_test "tsave ${tracefile}.tf" \
"Trace data saved to file '${tracefile}.tf'.*" \
"save tfile trace file"
-# Save trace frames to ctf.
-gdb_test "tsave -ctf ${tracefile}.ctf" \
- "Trace data saved to directory '${tracefile}.ctf'.*" \
- "save ctf trace file"
-
# Change target to tfile.
set test "change to tfile target"
gdb_test_multiple "target tfile ${tracefile}.tf" "$test" {
@@ -417,12 +412,3 @@ gdb_test_multiple "target tfile ${tracefile}.tf" "$test" {
}
# Test the collected trace frames from tfile.
use_collected_data "tfile"
-
-# Try to read ctf data if GDB supports.
-gdb_test_multiple "target ctf ${tracefile}.ctf" "" {
- -re "Undefined target command: \"ctf ${tracefile}.ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
- }
- -re ".*\r\n$gdb_prompt $" {
- use_collected_data "ctf"
- }
-}
diff --git a/gdb/testsuite/gdb.trace/tstatus.exp b/gdb/testsuite/gdb.trace/tstatus.exp
index 4ab6e2cbfc5..f8bc72e8cfc 100644
--- a/gdb/testsuite/gdb.trace/tstatus.exp
+++ b/gdb/testsuite/gdb.trace/tstatus.exp
@@ -142,10 +142,6 @@ set tracefile [standard_output_file ${testfile}]
gdb_test "tsave ${tracefile}.tf" \
"Trace data saved to file '${tracefile}.tf'.*" \
"save tfile trace file"
-# Save trace frames to CTF.
-gdb_test "tsave -ctf ${tracefile}.ctf" \
- "Trace data saved to directory '${tracefile}.ctf'.*" \
- "save ctf trace file"
# Change target to tfile.
set test "change to tfile target"
@@ -166,13 +162,3 @@ set tstatus_output [string map {\) \\)} $tstatus_output]
# The status should be identical to the status of live inferior.
gdb_test "tstatus" "Using a trace file\.\r\n${tstatus_output}.*" \
"tstatus on tfile target"
-
-# Change target to ctf if GDB supports.
-gdb_test_multiple "target ctf ${tracefile}.ctf" "" {
- -re "Undefined target command: \"ctf ${tracefile}.ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
- }
- -re ".*\r\n$gdb_prompt $" {
- gdb_test "tstatus" "Using a trace file\.\r\n${tstatus_output}.*" \
- "tstatus on ctf target"
- }
-}
diff --git a/gdb/testsuite/gdb.trace/tsv.exp b/gdb/testsuite/gdb.trace/tsv.exp
index 60f59f9ab89..78527e2c767 100644
--- a/gdb/testsuite/gdb.trace/tsv.exp
+++ b/gdb/testsuite/gdb.trace/tsv.exp
@@ -150,10 +150,6 @@ set tracefile [standard_output_file ${testfile}]
gdb_test "tsave ${tracefile}.tf" \
"Trace data saved to file '${tracefile}.tf'.*" \
"save tfile trace file"
-# Save trace frames to ctf.
-gdb_test "tsave -ctf ${tracefile}.ctf" \
- "Trace data saved to directory '${tracefile}.ctf'.*" \
- "save ctf trace file"
proc check_tsv { data_source } {
with_test_prefix "${data_source}" {
@@ -183,14 +179,6 @@ gdb_test_multiple "target tfile ${tracefile}.tf" "$test" {
# Check the tsv from tfile.
check_tsv "tfile"
-# Try to read ctf data if GDB supports.
-gdb_test_multiple "target ctf ${tracefile}.ctf" "" {
- -re "Undefined target command: \"ctf ${tracefile}.ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
- }
- -re ".*\r\n$gdb_prompt $" {
- check_tsv "ctf"
- }
-}
# Restart.
clean_restart $testfile
diff --git a/gdb/testsuite/gdb.trace/unavailable.exp b/gdb/testsuite/gdb.trace/unavailable.exp
index 295b0b42467..309ef2a8585 100644
--- a/gdb/testsuite/gdb.trace/unavailable.exp
+++ b/gdb/testsuite/gdb.trace/unavailable.exp
@@ -191,9 +191,6 @@ proc gdb_collect_args_test {} {
gdb_test "tsave ${tracefile}.args.tfile" \
"Trace data saved to file '${tracefile}.args.tfile'\\." \
"tsave ${testfile}.args.tfile"
- gdb_test "tsave -ctf ${tracefile}.args.ctf" \
- "Trace data saved to directory '${tracefile}.args.ctf'\\." \
- "save ctf trace file"
foreach target_name ${trace_file_targets} {
# Restart GDB and read the trace data in ${TARGET_NAME} target.
@@ -271,9 +268,6 @@ proc gdb_collect_locals_test { func msg } {
gdb_test "tsave ${tracefile}.locals.tfile" \
"Trace data saved to file '${tracefile}.locals.tfile'\\." \
"tsave ${testfile}.locals.tfile"
- gdb_test "tsave -ctf ${tracefile}.locals.ctf" \
- "Trace data saved to directory '${tracefile}.locals.ctf'\\." \
- "save ctf trace file"
foreach target_name ${trace_file_targets} {
# Restart GDB and read the trace data in ${TARGET_NAME} target.
@@ -352,9 +346,6 @@ proc gdb_unavailable_registers_test { } {
gdb_test "tsave ${tracefile}.registers.tfile" \
"Trace data saved to file '${tracefile}.registers.tfile'\\." \
"tsave ${testfile}.registers.tfile"
- gdb_test "tsave -ctf ${tracefile}.registers.ctf" \
- "Trace data saved to directory '${tracefile}.registers.ctf'\\." \
- "save ctf trace file"
foreach target_name ${trace_file_targets} {
# Restart GDB and read the trace data in ${TARGET_NAME} target.
@@ -414,9 +405,6 @@ proc gdb_unavailable_floats { } {
gdb_test "tsave ${tracefile}.floats.tfile" \
"Trace data saved to file '${tracefile}.floats.tfile'\\." \
"tsave ${testfile}.floats.tfile"
- gdb_test "tsave -ctf ${tracefile}.floats.ctf" \
- "Trace data saved to directory '${tracefile}.floats.ctf'\\." \
- "save ctf trace file"
foreach target_name ${trace_file_targets} {
# Restart GDB and read the trace data in ${TARGET_NAME} target.
@@ -679,9 +667,6 @@ proc gdb_collect_globals_test { } {
gdb_test "tsave ${tracefile}.globals.tfile" \
"Trace data saved to file '${tracefile}.globals.tfile'\\." \
"tsave ${testfile}.globals.tfile"
- gdb_test "tsave -ctf ${tracefile}.globals.ctf" \
- "Trace data saved to directory '${tracefile}.globals.ctf'\\." \
- "save ctf trace file"
foreach target_name ${trace_file_targets} {
# Restart GDB and read the trace data in ${TARGET_NAME} target.
@@ -719,13 +704,6 @@ if {![gdb_target_supports_trace]} {
}
set trace_file_targets [list "tfile"]
-gdb_test_multiple "target ctf" "" {
- -re "Undefined target command: \"ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
- }
- -re "No CTF directory specified.*\r\n$gdb_prompt $" {
- lappend trace_file_targets "ctf"
- }
-}
# Body of test encased in a proc so we can return prematurely.
gdb_trace_collection_test
diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp
index 0dde1a83418..f96034391a2 100644
--- a/gdb/testsuite/gdb.trace/while-stepping.exp
+++ b/gdb/testsuite/gdb.trace/while-stepping.exp
@@ -139,9 +139,6 @@ set tracefile [standard_output_file ${testfile}]
gdb_test "tsave ${tracefile}.tf" \
"Trace data saved to file '${tracefile}.tf'\\." \
"save tfile trace file"
-gdb_test "tsave -ctf ${tracefile}.ctf" \
- "Trace data saved to directory '${tracefile}.ctf'\\." \
- "save ctf trace file"
# Restart GDB and read the trace data in tfile target.
clean_restart
@@ -149,22 +146,3 @@ gdb_file_cmd $binfile
gdb_test "target tfile ${tracefile}.tf" ".*" \
"change to tfile target"
check_tracepoint "tfile"
-
-# Try to read ctf data if GDB supports.
-set gdb_can_read_ctf_data 0
-gdb_test_multiple "target ctf" "" {
- -re "Undefined target command: \"ctf\"\. Try \"help target\"\.\r\n$gdb_prompt $" {
- set gdb_can_read_ctf_data 0
- }
- -re "No CTF directory specified.*\r\n$gdb_prompt $" {
- set gdb_can_read_ctf_data 1
- }
-}
-
-if { $gdb_can_read_ctf_data } {
- clean_restart
- gdb_file_cmd $binfile
- gdb_test "target ctf ${tracefile}.ctf" ".*" \
- "change to ctf target"
- check_tracepoint "ctf"
-}
diff --git a/gdb/top.c b/gdb/top.c
index 7526c07a87b..477c385da61 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -1658,16 +1658,6 @@ This GDB was configured as follows:\n\
"));
#endif
-#if HAVE_LIBBABELTRACE
- gdb_printf (stream, _("\
- --with-babeltrace\n\
-"));
-#else
- gdb_printf (stream, _("\
- --without-babeltrace\n\
-"));
-#endif
-
#if HAVE_LIBIPT
gdb_printf (stream, _("\
--with-intel-pt\n\
diff --git a/gdb/tracectf.c b/gdb/tracectf.c
deleted file mode 100644
index 9246022b517..00000000000
--- a/gdb/tracectf.c
+++ /dev/null
@@ -1,1728 +0,0 @@
-/* CTF format support.
-
- Copyright (C) 2012-2026 Free Software Foundation, Inc.
- Contributed by Hui Zhu <hui_zhu@mentor.com>
- Contributed by Yao Qi <yao@codesourcery.com>
-
- This file is part of GDB.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-#include "tracectf.h"
-#include "tracepoint.h"
-#include "regcache.h"
-#include <sys/stat.h>
-#include "exec.h"
-#include "completer.h"
-#include "inferior.h"
-#include "gdbthread.h"
-#include "tracefile.h"
-#include <algorithm>
-#include "gdbsupport/filestuff.h"
-#include "gdbarch.h"
-#include "cli/cli-style.h"
-
-/* GDB saves trace buffers and other information (such as trace
- status) got from the remote target into Common Trace Format (CTF).
- The following types of information are expected to save in CTF:
-
- 1. The length (in bytes) of register cache. Event "register" will
- be defined in metadata, which includes the length.
-
- 2. Trace status. Event "status" is defined in metadata, which
- includes all aspects of trace status.
-
- 3. Uploaded trace variables. Event "tsv_def" is defined in
- metadata, which is about all aspects of a uploaded trace variable.
- Uploaded tracepoints. Event "tp_def" is defined in meta, which
- is about all aspects of an uploaded tracepoint. Note that the
- "sequence" (a CTF type, which is a dynamically-sized array.) is
- used for "actions" "step_actions" and "cmd_strings".
-
- 4. Trace frames. Each trace frame is composed by several blocks
- of different types ('R', 'M', 'V'). One trace frame is saved in
- one CTF packet and the blocks of this frame are saved as events.
- 4.1: The trace frame related information (such as the number of
- tracepoint associated with this frame) is saved in the packet
- context.
- 4.2: The block 'M', 'R' and 'V' are saved in event "memory",
- "register" and "tsv" respectively.
- 4.3: When iterating over events, babeltrace can't tell iterator
- goes to a new packet, so we need a marker or anchor to tell GDB
- that iterator goes into a new packet or frame. We define event
- "frame". */
-
-#define CTF_MAGIC 0xC1FC1FC1
-#define CTF_SAVE_MAJOR 1
-#define CTF_SAVE_MINOR 8
-
-#define CTF_METADATA_NAME "metadata"
-#define CTF_DATASTREAM_NAME "datastream"
-
-/* Reserved event id. */
-
-#define CTF_EVENT_ID_REGISTER 0
-#define CTF_EVENT_ID_TSV 1
-#define CTF_EVENT_ID_MEMORY 2
-#define CTF_EVENT_ID_FRAME 3
-#define CTF_EVENT_ID_STATUS 4
-#define CTF_EVENT_ID_TSV_DEF 5
-#define CTF_EVENT_ID_TP_DEF 6
-
-#define CTF_PID (2)
-
-/* The state kept while writing the CTF datastream file. */
-
-struct trace_write_handler
-{
- /* File descriptor of metadata. */
- FILE *metadata_fd;
- /* File descriptor of traceframes. */
- FILE *datastream_fd;
-
- /* This is the content size of the current packet. */
- size_t content_size;
-
- /* This is the start offset of current packet. */
- long packet_start;
-};
-
-/* Write metadata in FORMAT. */
-
-static void
-ctf_save_write_metadata (struct trace_write_handler *handler,
- const char *format, ...)
- ATTRIBUTE_PRINTF (2, 3);
-
-static void
-ctf_save_write_metadata (struct trace_write_handler *handler,
- const char *format, ...)
-{
- va_list args;
-
- va_start (args, format);
- if (vfprintf (handler->metadata_fd, format, args) < 0)
- error (_("Unable to write metadata file (%s)"),
- safe_strerror (errno));
- va_end (args);
-}
-
-/* Write BUF of length SIZE to datastream file represented by
- HANDLER. */
-
-static int
-ctf_save_write (struct trace_write_handler *handler,
- const gdb_byte *buf, size_t size)
-{
- if (fwrite (buf, size, 1, handler->datastream_fd) != 1)
- error (_("Unable to write file for saving trace data (%s)"),
- safe_strerror (errno));
-
- handler->content_size += size;
-
- return 0;
-}
-
-/* Write a unsigned 32-bit integer to datastream file represented by
- HANDLER. */
-
-#define ctf_save_write_uint32(HANDLER, U32) \
- ctf_save_write (HANDLER, (gdb_byte *) &U32, 4)
-
-/* Write a signed 32-bit integer to datastream file represented by
- HANDLER. */
-
-#define ctf_save_write_int32(HANDLER, INT32) \
- ctf_save_write ((HANDLER), (gdb_byte *) &(INT32), 4)
-
-/* Set datastream file position. Update HANDLER->content_size
- if WHENCE is SEEK_CUR. */
-
-static int
-ctf_save_fseek (struct trace_write_handler *handler, long offset,
- int whence)
-{
- gdb_assert (whence != SEEK_END);
- gdb_assert (whence != SEEK_SET
- || offset <= handler->content_size + handler->packet_start);
-
- if (fseek (handler->datastream_fd, offset, whence))
- error (_("Unable to seek file for saving trace data (%s)"),
- safe_strerror (errno));
-
- if (whence == SEEK_CUR)
- handler->content_size += offset;
-
- return 0;
-}
-
-/* Change the datastream file position to align on ALIGN_SIZE,
- and write BUF to datastream file. The size of BUF is SIZE. */
-
-static int
-ctf_save_align_write (struct trace_write_handler *handler,
- const gdb_byte *buf,
- size_t size, size_t align_size)
-{
- long offset
- = (align_up (handler->content_size, align_size)
- - handler->content_size);
-
- if (ctf_save_fseek (handler, offset, SEEK_CUR))
- return -1;
-
- if (ctf_save_write (handler, buf, size))
- return -1;
-
- return 0;
-}
-
-/* Write events to next new packet. */
-
-static void
-ctf_save_next_packet (struct trace_write_handler *handler)
-{
- handler->packet_start += (handler->content_size + 4);
- ctf_save_fseek (handler, handler->packet_start, SEEK_SET);
- handler->content_size = 0;
-}
-
-/* Write the CTF metadata header. */
-
-static void
-ctf_save_metadata_header (struct trace_write_handler *handler)
-{
- ctf_save_write_metadata (handler, "/* CTF %d.%d */\n",
- CTF_SAVE_MAJOR, CTF_SAVE_MINOR);
- ctf_save_write_metadata (handler,
- "typealias integer { size = 8; align = 8; "
- "signed = false; encoding = ascii;}"
- " := ascii;\n");
- ctf_save_write_metadata (handler,
- "typealias integer { size = 8; align = 8; "
- "signed = false; }"
- " := uint8_t;\n");
- ctf_save_write_metadata (handler,
- "typealias integer { size = 16; align = 16;"
- "signed = false; } := uint16_t;\n");
- ctf_save_write_metadata (handler,
- "typealias integer { size = 32; align = 32;"
- "signed = false; } := uint32_t;\n");
- ctf_save_write_metadata (handler,
- "typealias integer { size = 64; align = 64;"
- "signed = false; base = hex;}"
- " := uint64_t;\n");
- ctf_save_write_metadata (handler,
- "typealias integer { size = 32; align = 32;"
- "signed = true; } := int32_t;\n");
- ctf_save_write_metadata (handler,
- "typealias integer { size = 64; align = 64;"
- "signed = true; } := int64_t;\n");
- ctf_save_write_metadata (handler,
- "typealias string { encoding = ascii;"
- " } := chars;\n");
- ctf_save_write_metadata (handler, "\n");
-
- /* Get the byte order of the host and write CTF data in this byte
- order. */
-#if WORDS_BIGENDIAN
-#define HOST_ENDIANNESS "be"
-#else
-#define HOST_ENDIANNESS "le"
-#endif
-
- ctf_save_write_metadata (handler,
- "\ntrace {\n"
- " major = %u;\n"
- " minor = %u;\n"
- " byte_order = %s;\n"
- " packet.header := struct {\n"
- " uint32_t magic;\n"
- " };\n"
- "};\n"
- "\n"
- "stream {\n"
- " packet.context := struct {\n"
- " uint32_t content_size;\n"
- " uint32_t packet_size;\n"
- " uint16_t tpnum;\n"
- " };\n"
- " event.header := struct {\n"
- " uint32_t id;\n"
- " };\n"
- "};\n",
- CTF_SAVE_MAJOR, CTF_SAVE_MINOR,
- HOST_ENDIANNESS);
- ctf_save_write_metadata (handler, "\n");
-}
-
-/* CTF trace writer. */
-
-struct ctf_trace_file_writer
-{
- struct trace_file_writer base;
-
- /* States related to writing CTF trace file. */
- struct trace_write_handler tcs;
-};
-
-/* This is the implementation of trace_file_write_ops method
- dtor. */
-
-static void
-ctf_dtor (struct trace_file_writer *self)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
-
- if (writer->tcs.metadata_fd != NULL)
- fclose (writer->tcs.metadata_fd);
-
- if (writer->tcs.datastream_fd != NULL)
- fclose (writer->tcs.datastream_fd);
-
-}
-
-/* This is the implementation of trace_file_write_ops method
- target_save. */
-
-static int
-ctf_target_save (struct trace_file_writer *self,
- const char *dirname)
-{
- /* Don't support save trace file to CTF format in the target. */
- return 0;
-}
-
-/* This is the implementation of trace_file_write_ops method
- start. It creates the directory DIRNAME, metadata and datastream
- in the directory. */
-
-static void
-ctf_start (struct trace_file_writer *self, const char *dirname)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- mode_t hmode = S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH;
-
- /* Create DIRNAME. */
- if (mkdir (dirname, hmode) && errno != EEXIST)
- error (_("Unable to open directory '%ps' for saving trace data (%s)"),
- styled_string (file_name_style.style (), dirname),
- safe_strerror (errno));
-
- memset (&writer->tcs, '\0', sizeof (writer->tcs));
-
- std::string file_name = string_printf ("%s/%s", dirname, CTF_METADATA_NAME);
-
- writer->tcs.metadata_fd
- = gdb_fopen_cloexec (file_name.c_str (), "w").release ();
- if (writer->tcs.metadata_fd == NULL)
- error (_("Unable to open file '%ps' for saving trace data (%s)"),
- styled_string (file_name_style.style (), file_name.c_str ()),
- safe_strerror (errno));
-
- ctf_save_metadata_header (&writer->tcs);
-
- file_name = string_printf ("%s/%s", dirname, CTF_DATASTREAM_NAME);
- writer->tcs.datastream_fd
- = gdb_fopen_cloexec (file_name.c_str (), "w").release ();
- if (writer->tcs.datastream_fd == NULL)
- error (_("Unable to open file '%ps' for saving trace data (%s)"),
- styled_string (file_name_style.style (), file_name.c_str ()),
- safe_strerror (errno));
-}
-
-/* This is the implementation of trace_file_write_ops method
- write_header. Write the types of events on trace variable and
- frame. */
-
-static void
-ctf_write_header (struct trace_file_writer *self)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
-
-
- ctf_save_write_metadata (&writer->tcs, "\n");
- ctf_save_write_metadata (&writer->tcs,
- "event {\n\tname = \"memory\";\n\tid = %u;\n"
- "\tfields := struct { \n"
- "\t\tuint64_t address;\n"
- "\t\tuint16_t length;\n"
- "\t\tuint8_t contents[length];\n"
- "\t};\n"
- "};\n", CTF_EVENT_ID_MEMORY);
-
- ctf_save_write_metadata (&writer->tcs, "\n");
- ctf_save_write_metadata (&writer->tcs,
- "event {\n\tname = \"tsv\";\n\tid = %u;\n"
- "\tfields := struct { \n"
- "\t\tuint64_t val;\n"
- "\t\tuint32_t num;\n"
- "\t};\n"
- "};\n", CTF_EVENT_ID_TSV);
-
- ctf_save_write_metadata (&writer->tcs, "\n");
- ctf_save_write_metadata (&writer->tcs,
- "event {\n\tname = \"frame\";\n\tid = %u;\n"
- "\tfields := struct { \n"
- "\t};\n"
- "};\n", CTF_EVENT_ID_FRAME);
-
- ctf_save_write_metadata (&writer->tcs, "\n");
- ctf_save_write_metadata (&writer->tcs,
- "event {\n\tname = \"tsv_def\";\n"
- "\tid = %u;\n\tfields := struct { \n"
- "\t\tint64_t initial_value;\n"
- "\t\tint32_t number;\n"
- "\t\tint32_t builtin;\n"
- "\t\tchars name;\n"
- "\t};\n"
- "};\n", CTF_EVENT_ID_TSV_DEF);
-
- ctf_save_write_metadata (&writer->tcs, "\n");
- ctf_save_write_metadata (&writer->tcs,
- "event {\n\tname = \"tp_def\";\n"
- "\tid = %u;\n\tfields := struct { \n"
- "\t\tuint64_t addr;\n"
- "\t\tuint64_t traceframe_usage;\n"
- "\t\tint32_t number;\n"
- "\t\tint32_t enabled;\n"
- "\t\tint32_t step;\n"
- "\t\tint32_t pass;\n"
- "\t\tint32_t hit_count;\n"
- "\t\tint32_t type;\n"
- "\t\tchars cond;\n"
-
- "\t\tuint32_t action_num;\n"
- "\t\tchars actions[action_num];\n"
-
- "\t\tuint32_t step_action_num;\n"
- "\t\tchars step_actions[step_action_num];\n"
-
- "\t\tchars at_string;\n"
- "\t\tchars cond_string;\n"
-
- "\t\tuint32_t cmd_num;\n"
- "\t\tchars cmd_strings[cmd_num];\n"
- "\t};\n"
- "};\n", CTF_EVENT_ID_TP_DEF);
-
- gdb_assert (writer->tcs.content_size == 0);
- gdb_assert (writer->tcs.packet_start == 0);
-
- /* Create a new packet to contain this event. */
- self->ops->frame_ops->start (self, 0);
-}
-
-/* This is the implementation of trace_file_write_ops method
- write_regblock_type. Write the type of register event in
- metadata. */
-
-static void
-ctf_write_regblock_type (struct trace_file_writer *self, int size)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
-
- ctf_save_write_metadata (&writer->tcs, "\n");
-
- ctf_save_write_metadata (&writer->tcs,
- "event {\n\tname = \"register\";\n\tid = %u;\n"
- "\tfields := struct { \n"
- "\t\tascii contents[%d];\n"
- "\t};\n"
- "};\n",
- CTF_EVENT_ID_REGISTER, size);
-}
-
-/* This is the implementation of trace_file_write_ops method
- write_status. */
-
-static void
-ctf_write_status (struct trace_file_writer *self,
- struct trace_status *ts)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- uint32_t id;
-
- ctf_save_write_metadata (&writer->tcs, "\n");
- ctf_save_write_metadata (&writer->tcs,
- "event {\n\tname = \"status\";\n\tid = %u;\n"
- "\tfields := struct { \n"
- "\t\tint32_t stop_reason;\n"
- "\t\tint32_t stopping_tracepoint;\n"
- "\t\tint32_t traceframe_count;\n"
- "\t\tint32_t traceframes_created;\n"
- "\t\tint32_t buffer_free;\n"
- "\t\tint32_t buffer_size;\n"
- "\t\tint32_t disconnected_tracing;\n"
- "\t\tint32_t circular_buffer;\n"
- "\t};\n"
- "};\n",
- CTF_EVENT_ID_STATUS);
-
- id = CTF_EVENT_ID_STATUS;
- /* Event Id. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &id, 4, 4);
-
- ctf_save_write_int32 (&writer->tcs, ts->stop_reason);
- ctf_save_write_int32 (&writer->tcs, ts->stopping_tracepoint);
- ctf_save_write_int32 (&writer->tcs, ts->traceframe_count);
- ctf_save_write_int32 (&writer->tcs, ts->traceframes_created);
- ctf_save_write_int32 (&writer->tcs, ts->buffer_free);
- ctf_save_write_int32 (&writer->tcs, ts->buffer_size);
- ctf_save_write_int32 (&writer->tcs, ts->disconnected_tracing);
- ctf_save_write_int32 (&writer->tcs, ts->circular_buffer);
-}
-
-/* This is the implementation of trace_file_write_ops method
- write_uploaded_tsv. */
-
-static void
-ctf_write_uploaded_tsv (struct trace_file_writer *self,
- struct uploaded_tsv *tsv)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- int32_t int32;
- int64_t int64;
- const gdb_byte zero = 0;
-
- /* Event Id. */
- int32 = CTF_EVENT_ID_TSV_DEF;
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &int32, 4, 4);
-
- /* initial_value */
- int64 = tsv->initial_value;
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &int64, 8, 8);
-
- /* number */
- ctf_save_write_int32 (&writer->tcs, tsv->number);
-
- /* builtin */
- ctf_save_write_int32 (&writer->tcs, tsv->builtin);
-
- /* name */
- if (tsv->name != NULL)
- ctf_save_write (&writer->tcs, (gdb_byte *) tsv->name,
- strlen (tsv->name));
- ctf_save_write (&writer->tcs, &zero, 1);
-}
-
-/* This is the implementation of trace_file_write_ops method
- write_uploaded_tp. */
-
-static void
-ctf_write_uploaded_tp (struct trace_file_writer *self,
- struct uploaded_tp *tp)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- int32_t int32;
- int64_t int64;
- uint32_t u32;
- const gdb_byte zero = 0;
-
- /* Event Id. */
- int32 = CTF_EVENT_ID_TP_DEF;
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &int32, 4, 4);
-
- /* address */
- int64 = tp->addr;
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &int64, 8, 8);
-
- /* traceframe_usage */
- int64 = tp->traceframe_usage;
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &int64, 8, 8);
-
- /* number */
- ctf_save_write_int32 (&writer->tcs, tp->number);
-
- /* enabled */
- ctf_save_write_int32 (&writer->tcs, tp->enabled);
-
- /* step */
- ctf_save_write_int32 (&writer->tcs, tp->step);
-
- /* pass */
- ctf_save_write_int32 (&writer->tcs, tp->pass);
-
- /* hit_count */
- ctf_save_write_int32 (&writer->tcs, tp->hit_count);
-
- /* type */
- ctf_save_write_int32 (&writer->tcs, tp->type);
-
- /* condition */
- if (tp->cond != NULL)
- ctf_save_write (&writer->tcs, (gdb_byte *) tp->cond.get (),
- strlen (tp->cond.get ()));
- ctf_save_write (&writer->tcs, &zero, 1);
-
- /* actions */
- u32 = tp->actions.size ();
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &u32, 4, 4);
- for (const auto &act : tp->actions)
- ctf_save_write (&writer->tcs, (gdb_byte *) act.get (),
- strlen (act.get ()) + 1);
-
- /* step_actions */
- u32 = tp->step_actions.size ();
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &u32, 4, 4);
- for (const auto &act : tp->step_actions)
- ctf_save_write (&writer->tcs, (gdb_byte *) act.get (),
- strlen (act.get ()) + 1);
-
- /* at_string */
- if (tp->at_string != NULL)
- ctf_save_write (&writer->tcs, (gdb_byte *) tp->at_string.get (),
- strlen (tp->at_string.get ()));
- ctf_save_write (&writer->tcs, &zero, 1);
-
- /* cond_string */
- if (tp->cond_string != NULL)
- ctf_save_write (&writer->tcs, (gdb_byte *) tp->cond_string.get (),
- strlen (tp->cond_string.get ()));
- ctf_save_write (&writer->tcs, &zero, 1);
-
- /* cmd_strings */
- u32 = tp->cmd_strings.size ();
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &u32, 4, 4);
- for (const auto &act : tp->cmd_strings)
- ctf_save_write (&writer->tcs, (gdb_byte *) act.get (),
- strlen (act.get ()) + 1);
-
-}
-
-/* This is the implementation of trace_file_write_ops method
- write_tdesc. */
-
-static void
-ctf_write_tdesc (struct trace_file_writer *self)
-{
- /* Nothing so far. */
-}
-
-/* This is the implementation of trace_file_write_ops method
- write_definition_end. */
-
-static void
-ctf_write_definition_end (struct trace_file_writer *self)
-{
- self->ops->frame_ops->end (self);
-}
-
-/* This is the implementation of trace_file_write_ops method
- end. */
-
-static void
-ctf_end (struct trace_file_writer *self)
-{
- struct ctf_trace_file_writer *writer = (struct ctf_trace_file_writer *) self;
-
- gdb_assert (writer->tcs.content_size == 0);
-}
-
-/* This is the implementation of trace_frame_write_ops method
- start. */
-
-static void
-ctf_write_frame_start (struct trace_file_writer *self, uint16_t tpnum)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- uint32_t id = CTF_EVENT_ID_FRAME;
- uint32_t u32;
-
- /* Step 1: Write packet context. */
- /* magic. */
- u32 = CTF_MAGIC;
- ctf_save_write_uint32 (&writer->tcs, u32);
- /* content_size and packet_size.. We still don't know the value,
- write it later. */
- ctf_save_fseek (&writer->tcs, 4, SEEK_CUR);
- ctf_save_fseek (&writer->tcs, 4, SEEK_CUR);
- /* Tracepoint number. */
- ctf_save_write (&writer->tcs, (gdb_byte *) &tpnum, 2);
-
- /* Step 2: Write event "frame". */
- /* Event Id. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &id, 4, 4);
-}
-
-/* This is the implementation of trace_frame_write_ops method
- write_r_block. */
-
-static void
-ctf_write_frame_r_block (struct trace_file_writer *self,
- gdb_byte *buf, int32_t size)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- uint32_t id = CTF_EVENT_ID_REGISTER;
-
- /* Event Id. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &id, 4, 4);
-
- /* array contents. */
- ctf_save_align_write (&writer->tcs, buf, size, 1);
-}
-
-/* This is the implementation of trace_frame_write_ops method
- write_m_block_header. */
-
-static void
-ctf_write_frame_m_block_header (struct trace_file_writer *self,
- uint64_t addr, uint16_t length)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- uint32_t event_id = CTF_EVENT_ID_MEMORY;
-
- /* Event Id. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &event_id, 4, 4);
-
- /* Address. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &addr, 8, 8);
-
- /* Length. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &length, 2, 2);
-}
-
-/* This is the implementation of trace_frame_write_ops method
- write_m_block_memory. */
-
-static void
-ctf_write_frame_m_block_memory (struct trace_file_writer *self,
- gdb_byte *buf, uint16_t length)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
-
- /* Contents. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) buf, length, 1);
-}
-
-/* This is the implementation of trace_frame_write_ops method
- write_v_block. */
-
-static void
-ctf_write_frame_v_block (struct trace_file_writer *self,
- int32_t num, uint64_t val)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- uint32_t id = CTF_EVENT_ID_TSV;
-
- /* Event Id. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &id, 4, 4);
-
- /* val. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &val, 8, 8);
- /* num. */
- ctf_save_align_write (&writer->tcs, (gdb_byte *) &num, 4, 4);
-}
-
-/* This is the implementation of trace_frame_write_ops method
- end. */
-
-static void
-ctf_write_frame_end (struct trace_file_writer *self)
-{
- struct ctf_trace_file_writer *writer
- = (struct ctf_trace_file_writer *) self;
- uint32_t u32;
- uint32_t t;
-
- /* Write the content size to packet header. */
- ctf_save_fseek (&writer->tcs, writer->tcs.packet_start + 4,
- SEEK_SET);
- u32 = writer->tcs.content_size * TARGET_CHAR_BIT;
-
- t = writer->tcs.content_size;
- ctf_save_write_uint32 (&writer->tcs, u32);
-
- /* Write the packet size. */
- u32 += 4 * TARGET_CHAR_BIT;
- ctf_save_write_uint32 (&writer->tcs, u32);
-
- writer->tcs.content_size = t;
-
- /* Write zero at the end of the packet. */
- ctf_save_fseek (&writer->tcs, writer->tcs.packet_start + t,
- SEEK_SET);
- u32 = 0;
- ctf_save_write_uint32 (&writer->tcs, u32);
- writer->tcs.content_size = t;
-
- ctf_save_next_packet (&writer->tcs);
-}
-
-/* Operations to write various types of trace frames into CTF
- format. */
-
-static const struct trace_frame_write_ops ctf_write_frame_ops =
-{
- ctf_write_frame_start,
- ctf_write_frame_r_block,
- ctf_write_frame_m_block_header,
- ctf_write_frame_m_block_memory,
- ctf_write_frame_v_block,
- ctf_write_frame_end,
-};
-
-/* Operations to write trace buffers into CTF format. */
-
-static const struct trace_file_write_ops ctf_write_ops =
-{
- ctf_dtor,
- ctf_target_save,
- ctf_start,
- ctf_write_header,
- ctf_write_regblock_type,
- ctf_write_status,
- ctf_write_uploaded_tsv,
- ctf_write_uploaded_tp,
- ctf_write_tdesc,
- ctf_write_definition_end,
- NULL,
- &ctf_write_frame_ops,
- ctf_end,
-};
-
-/* Return a trace writer for CTF format. */
-
-struct trace_file_writer *
-ctf_trace_file_writer_new (void)
-{
- struct ctf_trace_file_writer *writer = XNEW (struct ctf_trace_file_writer);
-
- writer->base.ops = &ctf_write_ops;
-
- return (struct trace_file_writer *) writer;
-}
-
-#if HAVE_LIBBABELTRACE
-/* Use libbabeltrace to read CTF data. The libbabeltrace provides
- iterator to iterate over each event in CTF data and APIs to get
- details of event and packet, so it is very convenient to use
- libbabeltrace to access events in CTF. */
-
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/ctf/events.h>
-#include <babeltrace/ctf/iterator.h>
-
-/* The CTF target. */
-
-static const target_info ctf_target_info = {
- "ctf",
- N_("CTF file"),
- N_("(Use a CTF directory as a target.\n\
-Specify the filename of the CTF directory.")
-};
-
-class ctf_target final : public tracefile_target
-{
-public:
- const target_info &info () const override
- { return ctf_target_info; }
-
- void close () override;
- void fetch_registers (struct regcache *, int) override;
- enum target_xfer_status xfer_partial (enum target_object object,
- const char *annex,
- gdb_byte *readbuf,
- const gdb_byte *writebuf,
- ULONGEST offset, ULONGEST len,
- ULONGEST *xfered_len) override;
- void files_info () override;
- int trace_find (enum trace_find_type type, int num,
- CORE_ADDR addr1, CORE_ADDR addr2, int *tpp) override;
- bool get_trace_state_variable_value (int tsv, LONGEST *val) override;
- traceframe_info_up traceframe_info () override;
-};
-
-/* The struct pointer for current CTF directory. */
-static struct bt_context *ctx = NULL;
-static struct bt_ctf_iter *ctf_iter = NULL;
-/* The position of the first packet containing trace frame. */
-static struct bt_iter_pos *start_pos;
-
-/* The name of CTF directory. */
-static gdb::unique_xmalloc_ptr<char> trace_dirname;
-
-static ctf_target ctf_ops;
-
-/* Destroy ctf iterator and context. */
-
-static void
-ctf_destroy (void)
-{
- if (ctf_iter != NULL)
- {
- bt_ctf_iter_destroy (ctf_iter);
- ctf_iter = NULL;
- }
- if (ctx != NULL)
- {
- bt_context_put (ctx);
- ctx = NULL;
- }
-}
-
-/* Open CTF trace data in DIRNAME. */
-
-static void
-ctf_open_dir (const char *dirname)
-{
- struct bt_iter_pos begin_pos;
- unsigned int count, i;
- struct bt_ctf_event_decl * const *list;
-
- ctx = bt_context_create ();
- if (ctx == NULL)
- error (_("Unable to create bt_context"));
- int handle_id = bt_context_add_trace (ctx, dirname, "ctf", NULL, NULL, NULL);
- if (handle_id < 0)
- {
- ctf_destroy ();
- error (_("Unable to use libbabeltrace on directory \"%s\""),
- dirname);
- }
-
- begin_pos.type = BT_SEEK_BEGIN;
- ctf_iter = bt_ctf_iter_create (ctx, &begin_pos, NULL);
- if (ctf_iter == NULL)
- {
- ctf_destroy ();
- error (_("Unable to create bt_iterator"));
- }
-
- /* Look for the declaration of register block. Get the length of
- array "contents" to set trace_regblock_size. */
-
- bt_ctf_get_event_decl_list (handle_id, ctx, &list, &count);
- for (i = 0; i < count; i++)
- if (streq ("register", bt_ctf_get_decl_event_name (list[i])))
- {
- const struct bt_ctf_field_decl * const *field_list;
- const struct bt_declaration *decl;
-
- bt_ctf_get_decl_fields (list[i], BT_EVENT_FIELDS, &field_list,
- &count);
-
- gdb_assert (count == 1);
- gdb_assert (streq ("contents",
- bt_ctf_get_decl_field_name (field_list[0])));
- decl = bt_ctf_get_decl_from_field_decl (field_list[0]);
- trace_regblock_size = bt_ctf_get_array_len (decl);
-
- break;
- }
-}
-
-#define SET_INT32_FIELD(EVENT, SCOPE, VAR, FIELD) \
- (VAR)->FIELD = (int) bt_ctf_get_int64 (bt_ctf_get_field ((EVENT), \
- (SCOPE), \
- #FIELD))
-
-#define SET_ENUM_FIELD(EVENT, SCOPE, VAR, TYPE, FIELD) \
- (VAR)->FIELD = (TYPE) bt_ctf_get_int64 (bt_ctf_get_field ((EVENT), \
- (SCOPE), \
- #FIELD))
-
-
-/* EVENT is the "status" event and TS is filled in. */
-
-static void
-ctf_read_status (struct bt_ctf_event *event, struct trace_status *ts)
-{
- const struct bt_definition *scope
- = bt_ctf_get_top_level_scope (event, BT_EVENT_FIELDS);
-
- SET_ENUM_FIELD (event, scope, ts, enum trace_stop_reason, stop_reason);
- SET_INT32_FIELD (event, scope, ts, stopping_tracepoint);
- SET_INT32_FIELD (event, scope, ts, traceframe_count);
- SET_INT32_FIELD (event, scope, ts, traceframes_created);
- SET_INT32_FIELD (event, scope, ts, buffer_free);
- SET_INT32_FIELD (event, scope, ts, buffer_size);
- SET_INT32_FIELD (event, scope, ts, disconnected_tracing);
- SET_INT32_FIELD (event, scope, ts, circular_buffer);
-
- bt_iter_next (bt_ctf_get_iter (ctf_iter));
-}
-
-/* Read the events "tsv_def" one by one, extract its contents and fill
- in the list UPLOADED_TSVS. */
-
-static void
-ctf_read_tsv (struct uploaded_tsv **uploaded_tsvs)
-{
- gdb_assert (ctf_iter != NULL);
-
- while (1)
- {
- struct bt_ctf_event *event;
- const struct bt_definition *scope;
- const struct bt_definition *def;
- uint32_t event_id;
- struct uploaded_tsv *utsv = NULL;
-
- event = bt_ctf_iter_read_event (ctf_iter);
- scope = bt_ctf_get_top_level_scope (event,
- BT_STREAM_EVENT_HEADER);
- event_id = bt_ctf_get_uint64 (bt_ctf_get_field (event, scope,
- "id"));
- if (event_id != CTF_EVENT_ID_TSV_DEF)
- break;
-
- scope = bt_ctf_get_top_level_scope (event,
- BT_EVENT_FIELDS);
-
- def = bt_ctf_get_field (event, scope, "number");
- utsv = get_uploaded_tsv ((int32_t) bt_ctf_get_int64 (def),
- uploaded_tsvs);
-
- def = bt_ctf_get_field (event, scope, "builtin");
- utsv->builtin = (int32_t) bt_ctf_get_int64 (def);
- def = bt_ctf_get_field (event, scope, "initial_value");
- utsv->initial_value = bt_ctf_get_int64 (def);
-
- def = bt_ctf_get_field (event, scope, "name");
- utsv->name = xstrdup (bt_ctf_get_string (def));
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
-
-}
-
-/* Read the value of element whose index is NUM from CTF and write it
- to the corresponding VAR->ARRAY. */
-
-#define SET_ARRAY_FIELD(EVENT, SCOPE, VAR, NUM, ARRAY) \
- do \
- { \
- uint32_t lu32, i; \
- const struct bt_definition *def; \
- \
- lu32 = (uint32_t) bt_ctf_get_uint64 (bt_ctf_get_field ((EVENT), \
- (SCOPE), \
- #NUM)); \
- def = bt_ctf_get_field ((EVENT), (SCOPE), #ARRAY); \
- for (i = 0; i < lu32; i++) \
- { \
- const struct bt_definition *element \
- = bt_ctf_get_index ((EVENT), def, i); \
- \
- (VAR)->ARRAY.emplace_back \
- (xstrdup (bt_ctf_get_string (element))); \
- } \
- } \
- while (0)
-
-/* Read a string from CTF and set VAR->FIELD. If the length of string
- is zero, set VAR->FIELD to NULL. */
-
-#define SET_STRING_FIELD(EVENT, SCOPE, VAR, FIELD) \
- do \
- { \
- const char *p = bt_ctf_get_string (bt_ctf_get_field ((EVENT), \
- (SCOPE), \
- #FIELD)); \
- \
- if (strlen (p) > 0) \
- (VAR)->FIELD = make_unique_xstrdup (p); \
- else \
- (VAR)->FIELD = nullptr; \
- } \
- while (0)
-
-/* Read the events "tp_def" one by one, extract its contents and fill
- in the list UPLOADED_TPS. */
-
-static void
-ctf_read_tp (struct uploaded_tp **uploaded_tps)
-{
- gdb_assert (ctf_iter != NULL);
-
- while (1)
- {
- struct bt_ctf_event *event;
- const struct bt_definition *scope;
- uint32_t u32;
- int32_t int32;
- uint64_t u64;
- struct uploaded_tp *utp = NULL;
-
- event = bt_ctf_iter_read_event (ctf_iter);
- scope = bt_ctf_get_top_level_scope (event,
- BT_STREAM_EVENT_HEADER);
- u32 = bt_ctf_get_uint64 (bt_ctf_get_field (event, scope,
- "id"));
- if (u32 != CTF_EVENT_ID_TP_DEF)
- break;
-
- scope = bt_ctf_get_top_level_scope (event,
- BT_EVENT_FIELDS);
- int32 = (int32_t) bt_ctf_get_int64 (bt_ctf_get_field (event,
- scope,
- "number"));
- u64 = bt_ctf_get_uint64 (bt_ctf_get_field (event, scope,
- "addr"));
- utp = get_uploaded_tp (int32, u64, uploaded_tps);
-
- SET_INT32_FIELD (event, scope, utp, enabled);
- SET_INT32_FIELD (event, scope, utp, step);
- SET_INT32_FIELD (event, scope, utp, pass);
- SET_INT32_FIELD (event, scope, utp, hit_count);
- SET_ENUM_FIELD (event, scope, utp, enum bptype, type);
-
- /* Read 'cmd_strings'. */
- SET_ARRAY_FIELD (event, scope, utp, cmd_num, cmd_strings);
- /* Read 'actions'. */
- SET_ARRAY_FIELD (event, scope, utp, action_num, actions);
- /* Read 'step_actions'. */
- SET_ARRAY_FIELD (event, scope, utp, step_action_num,
- step_actions);
-
- SET_STRING_FIELD(event, scope, utp, at_string);
- SET_STRING_FIELD(event, scope, utp, cond_string);
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
-}
-
-/* This is the implementation of target_ops method to_open. Open CTF
- trace data, read trace status, trace state variables and tracepoint
- definitions from the first packet. Set the start position at the
- second packet which contains events on trace blocks. */
-
-static void
-ctf_target_open (const char *args, int from_tty)
-{
- struct bt_ctf_event *event;
- uint32_t event_id;
- const struct bt_definition *scope;
- struct uploaded_tsv *uploaded_tsvs = NULL;
- struct uploaded_tp *uploaded_tps = NULL;
-
- std::string dirname = extract_single_filename_arg (args);
- if (dirname.empty ())
- error (_("No CTF directory specified."));
-
- ctf_open_dir (dirname.c_str ());
-
- target_preopen (from_tty);
-
- /* Skip the first packet which about the trace status. The first
- event is "frame". */
- event = bt_ctf_iter_read_event (ctf_iter);
- scope = bt_ctf_get_top_level_scope (event, BT_STREAM_EVENT_HEADER);
- event_id = bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, "id"));
- if (event_id != CTF_EVENT_ID_FRAME)
- error (_("Wrong event id of the first event"));
- /* The second event is "status". */
- bt_iter_next (bt_ctf_get_iter (ctf_iter));
- event = bt_ctf_iter_read_event (ctf_iter);
- scope = bt_ctf_get_top_level_scope (event, BT_STREAM_EVENT_HEADER);
- event_id = bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, "id"));
- if (event_id != CTF_EVENT_ID_STATUS)
- error (_("Wrong event id of the second event"));
- ctf_read_status (event, current_trace_status ());
-
- ctf_read_tsv (&uploaded_tsvs);
-
- ctf_read_tp (&uploaded_tps);
-
- event = bt_ctf_iter_read_event (ctf_iter);
- /* EVENT can be NULL if we've already gone to the end of stream of
- events. */
- if (event != NULL)
- {
- scope = bt_ctf_get_top_level_scope (event,
- BT_STREAM_EVENT_HEADER);
- event_id = bt_ctf_get_uint64 (bt_ctf_get_field (event,
- scope, "id"));
- if (event_id != CTF_EVENT_ID_FRAME)
- error (_("Wrong event id of the first event of the second packet"));
- }
-
- start_pos = bt_iter_get_pos (bt_ctf_get_iter (ctf_iter));
- gdb_assert (start_pos->type == BT_SEEK_RESTORE);
-
- trace_dirname = make_unique_xstrdup (dirname.c_str ());
- current_inferior ()->push_target (&ctf_ops);
-
- inferior_appeared (current_inferior (), CTF_PID);
-
- thread_info *thr = add_thread_silent (&ctf_ops, ptid_t (CTF_PID));
- switch_to_thread (thr);
-
- merge_uploaded_trace_state_variables (&uploaded_tsvs);
- merge_uploaded_tracepoints (&uploaded_tps);
-
- post_create_inferior (from_tty, true);
-}
-
-/* This is the implementation of target_ops method to_close. Destroy
- CTF iterator and context. */
-
-void
-ctf_target::close ()
-{
- ctf_destroy ();
- trace_dirname.reset ();
-
- switch_to_no_thread (); /* Avoid confusion from thread stuff. */
- exit_inferior (current_inferior ());
-
- trace_reset_local_state ();
-}
-
-/* This is the implementation of target_ops method to_files_info.
- Print the directory name of CTF trace data. */
-
-void
-ctf_target::files_info ()
-{
- gdb_printf ("\t`%s'\n", trace_dirname.get ());
-}
-
-/* This is the implementation of target_ops method to_fetch_registers.
- Iterate over events whose name is "register" in current frame,
- extract contents from events, and set REGCACHE with the contents.
- If no matched events are found, mark registers unavailable. */
-
-void
-ctf_target::fetch_registers (struct regcache *regcache, int regno)
-{
- struct gdbarch *gdbarch = regcache->arch ();
- struct bt_ctf_event *event = NULL;
- struct bt_iter_pos *pos;
-
- /* An uninitialized reg size says we're not going to be
- successful at getting register blocks. */
- if (trace_regblock_size == 0)
- return;
-
- gdb_assert (ctf_iter != NULL);
- /* Save the current position. */
- pos = bt_iter_get_pos (bt_ctf_get_iter (ctf_iter));
- gdb_assert (pos->type == BT_SEEK_RESTORE);
-
- while (1)
- {
- const char *name;
- struct bt_ctf_event *event1;
-
- event1 = bt_ctf_iter_read_event (ctf_iter);
-
- name = bt_ctf_event_name (event1);
-
- if (name == NULL || streq (name, "frame"))
- break;
- else if (streq (name, "register"))
- {
- event = event1;
- break;
- }
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
-
- /* Restore the position. */
- bt_iter_set_pos (bt_ctf_get_iter (ctf_iter), pos);
-
- if (event != NULL)
- {
- int offset, regsize, regn;
- const struct bt_definition *scope
- = bt_ctf_get_top_level_scope (event,
- BT_EVENT_FIELDS);
- const struct bt_definition *array
- = bt_ctf_get_field (event, scope, "contents");
- gdb_byte *regs = (gdb_byte *) bt_ctf_get_char_array (array);
-
- /* Assume the block is laid out in GDB register number order,
- each register with the size that it has in GDB. */
- offset = 0;
- for (regn = 0; regn < gdbarch_num_regs (gdbarch); regn++)
- {
- regsize = register_size (gdbarch, regn);
- /* Make sure we stay within block bounds. */
- if (offset + regsize >= trace_regblock_size)
- break;
- if (regcache->get_register_status (regn) == REG_UNKNOWN)
- {
- if (regno == regn)
- {
- regcache->raw_supply (regno, regs + offset);
- break;
- }
- else if (regno == -1)
- {
- regcache->raw_supply (regn, regs + offset);
- }
- }
- offset += regsize;
- }
- }
- else
- tracefile_fetch_registers (regcache, regno);
-}
-
-/* This is the implementation of target_ops method to_xfer_partial.
- Iterate over events whose name is "memory" in
- current frame, extract the address and length from events. If
- OFFSET is within the range, read the contents from events to
- READBUF. */
-
-enum target_xfer_status
-ctf_target::xfer_partial (enum target_object object,
- const char *annex, gdb_byte *readbuf,
- const gdb_byte *writebuf, ULONGEST offset,
- ULONGEST len, ULONGEST *xfered_len)
-{
- /* We're only doing regular memory for now. */
- if (object != TARGET_OBJECT_MEMORY)
- return TARGET_XFER_E_IO;
-
- if (readbuf == NULL)
- error (_("ctf_xfer_partial: trace file is read-only"));
-
- if (get_traceframe_number () != -1)
- {
- struct bt_iter_pos *pos;
- enum target_xfer_status res;
- /* Records the lowest available address of all blocks that
- intersects the requested range. */
- ULONGEST low_addr_available = 0;
-
- gdb_assert (ctf_iter != NULL);
- /* Save the current position. */
- pos = bt_iter_get_pos (bt_ctf_get_iter (ctf_iter));
- gdb_assert (pos->type == BT_SEEK_RESTORE);
-
- /* Iterate through the traceframe's blocks, looking for
- memory. */
- while (1)
- {
- ULONGEST amt;
- uint64_t maddr;
- uint16_t mlen;
- const struct bt_definition *scope;
- const struct bt_definition *def;
- struct bt_ctf_event *event
- = bt_ctf_iter_read_event (ctf_iter);
- const char *name = bt_ctf_event_name (event);
-
- if (name == NULL || streq (name, "frame"))
- break;
- else if (!streq (name, "memory"))
- {
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
-
- continue;
- }
-
- scope = bt_ctf_get_top_level_scope (event,
- BT_EVENT_FIELDS);
-
- def = bt_ctf_get_field (event, scope, "address");
- maddr = bt_ctf_get_uint64 (def);
- def = bt_ctf_get_field (event, scope, "length");
- mlen = (uint16_t) bt_ctf_get_uint64 (def);
-
- /* If the block includes the first part of the desired
- range, return as much it has; GDB will re-request the
- remainder, which might be in a different block of this
- trace frame. */
- if (maddr <= offset && offset < (maddr + mlen))
- {
- const struct bt_definition *array
- = bt_ctf_get_field (event, scope, "contents");
- int k;
-
- gdb::byte_vector contents (mlen);
-
- for (k = 0; k < mlen; k++)
- {
- const struct bt_definition *element
- = bt_ctf_get_index (event, array, k);
-
- contents[k] = (gdb_byte) bt_ctf_get_uint64 (element);
- }
-
- amt = (maddr + mlen) - offset;
- if (amt > len)
- amt = len;
-
- memcpy (readbuf, &contents[offset - maddr], amt);
-
- /* Restore the position. */
- bt_iter_set_pos (bt_ctf_get_iter (ctf_iter), pos);
-
- if (amt == 0)
- return TARGET_XFER_EOF;
- else
- {
- *xfered_len = amt;
- return TARGET_XFER_OK;
- }
- }
-
- if (offset < maddr && maddr < (offset + len))
- if (low_addr_available == 0 || low_addr_available > maddr)
- low_addr_available = maddr;
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
-
- /* Restore the position. */
- bt_iter_set_pos (bt_ctf_get_iter (ctf_iter), pos);
-
- /* Requested memory is unavailable in the context of traceframes,
- and this address falls within a read-only section, fallback
- to reading from executable, up to LOW_ADDR_AVAILABLE */
- if (offset < low_addr_available)
- len = std::min (len, low_addr_available - offset);
- res = exec_read_partial_read_only (readbuf, offset, len, xfered_len);
-
- if (res == TARGET_XFER_OK)
- return TARGET_XFER_OK;
- else
- {
- /* No use trying further, we know some memory starting
- at MEMADDR isn't available. */
- *xfered_len = len;
- return TARGET_XFER_UNAVAILABLE;
- }
- }
- else
- {
- /* Fallback to reading from read-only sections. */
- return section_table_read_available_memory (readbuf, offset, len, xfered_len);
- }
-}
-
-/* This is the implementation of target_ops method
- to_get_trace_state_variable_value.
- Iterate over events whose name is "tsv" in current frame. When the
- trace variable is found, set the value of it to *VAL and return
- true, otherwise return false. */
-
-bool
-ctf_target::get_trace_state_variable_value (int tsvnum, LONGEST *val)
-{
- struct bt_iter_pos *pos;
- bool found = false;
-
- gdb_assert (ctf_iter != NULL);
- /* Save the current position. */
- pos = bt_iter_get_pos (bt_ctf_get_iter (ctf_iter));
- gdb_assert (pos->type == BT_SEEK_RESTORE);
-
- /* Iterate through the traceframe's blocks, looking for 'V'
- block. */
- while (1)
- {
- struct bt_ctf_event *event
- = bt_ctf_iter_read_event (ctf_iter);
- const char *name = bt_ctf_event_name (event);
-
- if (name == NULL || streq (name, "frame"))
- break;
- else if (streq (name, "tsv"))
- {
- const struct bt_definition *scope;
- const struct bt_definition *def;
-
- scope = bt_ctf_get_top_level_scope (event,
- BT_EVENT_FIELDS);
-
- def = bt_ctf_get_field (event, scope, "num");
- if (tsvnum == (int32_t) bt_ctf_get_uint64 (def))
- {
- def = bt_ctf_get_field (event, scope, "val");
- *val = bt_ctf_get_uint64 (def);
-
- found = true;
- }
- }
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
-
- /* Restore the position. */
- bt_iter_set_pos (bt_ctf_get_iter (ctf_iter), pos);
-
- return found;
-}
-
-/* Return the tracepoint number in "frame" event. */
-
-static int
-ctf_get_tpnum_from_frame_event (struct bt_ctf_event *event)
-{
- /* The packet context of events has a field "tpnum". */
- const struct bt_definition *scope
- = bt_ctf_get_top_level_scope (event, BT_STREAM_PACKET_CONTEXT);
- uint64_t tpnum
- = bt_ctf_get_uint64 (bt_ctf_get_field (event, scope, "tpnum"));
-
- return (int) tpnum;
-}
-
-/* Return the address at which the current frame was collected. */
-
-static CORE_ADDR
-ctf_get_traceframe_address (void)
-{
- struct bt_ctf_event *event = NULL;
- struct bt_iter_pos *pos;
- CORE_ADDR addr = 0;
-
- gdb_assert (ctf_iter != NULL);
- pos = bt_iter_get_pos (bt_ctf_get_iter (ctf_iter));
- gdb_assert (pos->type == BT_SEEK_RESTORE);
-
- while (1)
- {
- const char *name;
- struct bt_ctf_event *event1;
-
- event1 = bt_ctf_iter_read_event (ctf_iter);
-
- name = bt_ctf_event_name (event1);
-
- if (name == NULL)
- break;
- else if (streq (name, "frame"))
- {
- event = event1;
- break;
- }
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
-
- if (event != NULL)
- {
- int tpnum = ctf_get_tpnum_from_frame_event (event);
- struct tracepoint *tp
- = get_tracepoint_by_number_on_target (tpnum);
-
- if (tp != nullptr && tp->has_locations ())
- addr = tp->first_loc ().address;
- }
-
- /* Restore the position. */
- bt_iter_set_pos (bt_ctf_get_iter (ctf_iter), pos);
-
- return addr;
-}
-
-/* This is the implementation of target_ops method to_trace_find.
- Iterate the events whose name is "frame", extract the tracepoint
- number in it. Return traceframe number when matched. */
-
-int
-ctf_target::trace_find (enum trace_find_type type, int num,
- CORE_ADDR addr1, CORE_ADDR addr2, int *tpp)
-{
- int tfnum = 0;
- int found = 0;
-
- if (num == -1)
- {
- if (tpp != NULL)
- *tpp = -1;
- return -1;
- }
-
- gdb_assert (ctf_iter != NULL);
- /* Set iterator back to the start. */
- bt_iter_set_pos (bt_ctf_get_iter (ctf_iter), start_pos);
-
- while (1)
- {
- struct bt_ctf_event *event;
- const char *name;
-
- event = bt_ctf_iter_read_event (ctf_iter);
-
- name = bt_ctf_event_name (event);
-
- if (event == NULL || name == NULL)
- break;
-
- if (streq (name, "frame"))
- {
- CORE_ADDR tfaddr;
-
- if (type == tfind_number)
- {
- /* Looking for a specific trace frame. */
- if (tfnum == num)
- found = 1;
- }
- else
- {
- /* Start from the _next_ trace frame. */
- if (tfnum > get_traceframe_number ())
- {
- switch (type)
- {
- case tfind_tp:
- {
- struct tracepoint *tp = get_tracepoint (num);
-
- if (tp != NULL
- && (tp->number_on_target
- == ctf_get_tpnum_from_frame_event (event)))
- found = 1;
- break;
- }
- case tfind_pc:
- tfaddr = ctf_get_traceframe_address ();
- if (tfaddr == addr1)
- found = 1;
- break;
- case tfind_range:
- tfaddr = ctf_get_traceframe_address ();
- if (addr1 <= tfaddr && tfaddr <= addr2)
- found = 1;
- break;
- case tfind_outside:
- tfaddr = ctf_get_traceframe_address ();
- if (!(addr1 <= tfaddr && tfaddr <= addr2))
- found = 1;
- break;
- default:
- internal_error (_("unknown tfind type"));
- }
- }
- }
- if (found)
- {
- if (tpp != NULL)
- *tpp = ctf_get_tpnum_from_frame_event (event);
-
- /* Skip the event "frame". */
- bt_iter_next (bt_ctf_get_iter (ctf_iter));
-
- return tfnum;
- }
- tfnum++;
- }
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
-
- return -1;
-}
-
-/* This is the implementation of target_ops method to_traceframe_info.
- Iterate the events whose name is "memory", in current
- frame, extract memory range information, and return them in
- traceframe_info. */
-
-traceframe_info_up
-ctf_target::traceframe_info ()
-{
- traceframe_info_up info (new struct traceframe_info);
- const char *name;
- struct bt_iter_pos *pos;
-
- gdb_assert (ctf_iter != NULL);
- /* Save the current position. */
- pos = bt_iter_get_pos (bt_ctf_get_iter (ctf_iter));
- gdb_assert (pos->type == BT_SEEK_RESTORE);
-
- do
- {
- struct bt_ctf_event *event
- = bt_ctf_iter_read_event (ctf_iter);
-
- name = bt_ctf_event_name (event);
-
- if (name == nullptr || streq (name, "register") || streq (name, "frame"))
- ;
- else if (streq (name, "memory"))
- {
- const struct bt_definition *scope
- = bt_ctf_get_top_level_scope (event,
- BT_EVENT_FIELDS);
- const struct bt_definition *def;
-
- def = bt_ctf_get_field (event, scope, "address");
- CORE_ADDR start = bt_ctf_get_uint64 (def);
-
- def = bt_ctf_get_field (event, scope, "length");
- int length = (uint16_t) bt_ctf_get_uint64 (def);
-
- info->memory.emplace_back (start, length);
- }
- else if (streq (name, "tsv"))
- {
- int vnum;
- const struct bt_definition *scope
- = bt_ctf_get_top_level_scope (event,
- BT_EVENT_FIELDS);
- const struct bt_definition *def;
-
- def = bt_ctf_get_field (event, scope, "num");
- vnum = (int) bt_ctf_get_uint64 (def);
- info->tvars.push_back (vnum);
- }
- else
- {
- warning (_("Unhandled trace block type (%s) "
- "while building trace frame info."),
- name);
- }
-
- if (bt_iter_next (bt_ctf_get_iter (ctf_iter)) < 0)
- break;
- }
- while (name != NULL && !streq (name, "frame"));
-
- /* Restore the position. */
- bt_iter_set_pos (bt_ctf_get_iter (ctf_iter), pos);
-
- return info;
-}
-
-#endif
-
-/* module initialization */
-
-INIT_GDB_FILE (ctf)
-{
-#if HAVE_LIBBABELTRACE
- add_target (ctf_target_info, ctf_target_open,
- filename_maybe_quoted_completer);
-#endif
-}
diff --git a/gdb/tracectf.h b/gdb/tracectf.h
deleted file mode 100644
index b0aa35f4621..00000000000
--- a/gdb/tracectf.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* CTF format support.
-
- Copyright (C) 2012-2026 Free Software Foundation, Inc.
-
- This file is part of GDB.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef GDB_TRACECTF_H
-#define GDB_TRACECTF_H
-
-extern struct trace_file_writer *ctf_trace_file_writer_new (void);
-
-#endif /* GDB_TRACECTF_H */
diff --git a/gdb/tracefile.c b/gdb/tracefile.c
index 6dc699f3efe..c4ebb823126 100644
--- a/gdb/tracefile.c
+++ b/gdb/tracefile.c
@@ -19,7 +19,6 @@
#include "tracefile.h"
#include "extract-store-integer.h"
-#include "tracectf.h"
#include "exec.h"
#include "regcache.h"
#include "gdbsupport/byte-vector.h"
@@ -323,7 +322,6 @@ tsave_command (const char *args, int from_tty)
int target_does_save = 0;
char **argv;
char *filename = NULL;
- int generate_ctf = 0;
if (args == NULL)
error_no_arg (_("file in which to save trace data"));
@@ -335,8 +333,6 @@ tsave_command (const char *args, int from_tty)
{
if (streq (*argv, "-r"))
target_does_save = 1;
- else if (streq (*argv, "-ctf"))
- generate_ctf = 1;
else if (**argv == '-')
error (_("unknown option `%s'"), *argv);
else
@@ -346,14 +342,10 @@ tsave_command (const char *args, int from_tty)
if (!filename)
error_no_arg (_("file in which to save trace data"));
- if (generate_ctf)
- trace_save_ctf (filename, target_does_save);
- else
- trace_save_tfile (filename, target_does_save);
+ trace_save_tfile (filename, target_does_save);
if (from_tty)
- gdb_printf (_("Trace data saved to %s '%s'.\n"),
- generate_ctf ? "directory" : "file", filename);
+ gdb_printf (_("Trace data saved to file '%s'.\n"), filename);
}
/* Save the trace data to file FILENAME of tfile format. */
@@ -365,17 +357,7 @@ trace_save_tfile (const char *filename, int target_does_save)
trace_save (filename, writer.get (), target_does_save);
}
-/* Save the trace data to dir DIRNAME of ctf format. */
-
-void
-trace_save_ctf (const char *dirname, int target_does_save)
-{
- trace_file_writer_up writer (ctf_trace_file_writer_new ());
- trace_save (dirname, writer.get (), target_does_save);
-}
-
-/* Fetch register data from tracefile, shared for both tfile and
- ctf. */
+/* Fetch register data from tracefile. */
void
tracefile_fetch_registers (struct regcache *regcache, int regno)
@@ -477,7 +459,6 @@ INIT_GDB_FILE (tracefile)
{
add_com ("tsave", class_trace, tsave_command, _("\
Save the trace data to a file.\n\
-Use the '-ctf' option to save the data to CTF format.\n\
Use the '-r' option to direct the target to save directly to the file,\n\
using its own filesystem."));
}
diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
index 247723aa7ee..19742c9c235 100644
--- a/gdb/tracepoint.h
+++ b/gdb/tracepoint.h
@@ -416,8 +416,6 @@ extern void tfind_1 (enum trace_find_type type, int num,
extern void trace_save_tfile (const char *filename,
int target_does_save);
-extern void trace_save_ctf (const char *dirname,
- int target_does_save);
extern traceframe_info_up parse_traceframe_info (const char *tframe_info);
--
2.53.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Remove support for the Common Trace Format (CTF)
2026-05-10 16:42 ` Sergio Durigan Junior
@ 2026-05-11 1:25 ` Simon Marchi
2026-05-11 3:52 ` Sergio Durigan Junior
2026-05-11 3:56 ` Sergio Durigan Junior
0 siblings, 2 replies; 7+ messages in thread
From: Simon Marchi @ 2026-05-11 1:25 UTC (permalink / raw)
To: Sergio Durigan Junior; +Cc: GDB Patches, doko, Michael Jeanson
On 2026-05-10 12:42, Sergio Durigan Junior wrote:
> On Sunday, 10 May 2026, Simon Marchi wrote:
>
>> On 5/9/26 10:28 PM, Sergio Durigan Junior wrote:
>>> Hi there,
>>
>> Hi Sergio!
>
> Hey Simon :-).
>
>>> The Debian maintainer of babeltrace (Michael, in CC) is working
>>> towards removing the version 1 package from the archive in favour of
>>> version 2. This makes sense as version 1 is unsupported and projects
>>> should move to version 2.
>>>
>>> While digging through the archives I found PR buid/27142 (from
>>> Matthias, also in Cc) which was filed 5 years ago requesting GDB to
>>> support babeltrace v2. At the time Simon started a thread on gdb@
>>> suggesting that we should actually remove the support for CTF (Common
>>> Trace Format) altogether, since it's a niche feature (CTF) within a
>>> niche feature (tracepoints) and apparently GDB itself records CTF data
>>> in an unconventional way that might break other tools. You can see
>>> the thread here:
>>>
>>> https://inbox.sourceware.org/gdb/3fb1fbb6-836a-0e39-73a9-ef721630da88@polymtl.ca/
>>>
>>> Long story short, the consensus seems to be that CTF support is ripe
>>> to be removed, so that's what this patch does. I think I covered all
>>> places that referred to either CTF or babeltrace; I recompiled GDB
>>> here and things are still working as expected. I ran the tests I
>>> touched and there are some failures, but they're unrelated to CTF and
>>> I could reproduce them in a pristine tree as well.
>>>
>>> I've been a bit distant from the community so I don't know whether we
>>> have a specific procedure to remove features from GDB. I remember
>>> that when we removed support for an architecture, we used to deprecate
>>> it in release N and then proceed with the removal on release N+1. Not
>>> sure if this is applicable here, but let me know.
>>>
>>> Either way, I intend to disable support for babeltrace on Debian's GDB
>>> soon.
>>>
>>> WDYT?
>>>
>>> Signed-off-by: Sergio Durigan Junior <sergiodj@sergiodj.net>
>>>
>>> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=27142
>>
>> Thanks for doing this, it's been in the back of my mind for 5 years :).
>
> Yeah, I know the feeling!
>
>> I wonder if the blank line between your two trailers is valid, or if
>> they should be contiguous. Also, we don't use the Signed-off-by tag,
>> but I don't think it hurts to have it.
>
> Ah, got it. I can remove the Signed-off-by, no problem.
>
>> The patch doesn't contain the generated files (configure & al), please
>> submit a patch with the generated files.
>
> Hm, I was following the instructions from
> <https://sourceware.org/gdb/wiki/DeveloperTips#Editing_configure.ac>.
> Are they out-of-date? I'm happy to update the wiki if that's the case.
Weird, in all my time contributing to GDB we always sent the generated
files, unless the resulting patch was too big to send on the list.
>
>>> diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
>>> index 68e760699bc..40f381f812d 100644
>>> --- a/gdb/doc/gdb.texinfo
>>> +++ b/gdb/doc/gdb.texinfo
>>> @@ -16547,7 +16547,7 @@ of trace data, via the @code{target tfile} command.
>>>
>>> @kindex tsave
>>> @item tsave [ -r ] @var{filename}
>>> -@itemx tsave [-ctf] @var{dirname}
>>> +@itemx tsave @var{dirname}
>>
>> The dirname version can be removed, as that was CTF-specific.
>
> Ah, true. In fact, I believe the entire @itemx becomes unnecessary, so
> I've removed it altogether.
>
>>> Save the trace data to @var{filename}. By default, this command
>>> assumes that @var{filename} refers to the host filesystem, so if
>>> necessary @value{GDBN} will copy raw trace data up from the target and
>>> @@ -16556,44 +16556,6 @@ optional argument @code{-r} (``remote'') to direct the target to save
>>> the data directly into @var{filename} in its own filesystem, which may be
>>> more efficient if the trace buffer is very large. (Note, however, that
>>> @code{target tfile} can only read from files accessible to the host.)
>>> -By default, this command will save trace frame in tfile format.
>>> -You can supply the optional argument @code{-ctf} to save data in CTF
>>> -format. The @dfn{Common Trace Format} (CTF) is proposed as a trace format
>>> -that can be shared by multiple debugging and tracing tools. Please go to
>>> -@indicateurl{http://www.efficios.com/ctf} to get more information.
>>> -
>>> -@kindex target tfile
>>> -@kindex tfile
>>> -@kindex target ctf
>>> -@kindex ctf
>>> -@item target tfile @var{filename}
>>> -@itemx target ctf @var{dirname}
>>> -Use the file named @var{filename} or directory named @var{dirname} as
>>> -a source of trace data. Commands that examine data work as they do with
>>> -a live target, but it is not possible to run any new trace experiments.
>>> -@code{tstatus} will report the state of the trace run at the moment
>>> -the data was saved, as well as the current trace frame you are examining.
>>> -Both @var{filename} and @var{dirname} must be on a filesystem accessible to
>>> -the host.
>>
>> This removes the doc for "target tfile" entirely, that is too much.
>
> Oh, sorry, that was a mistake indeed. Let me reintroduce the applicable
> parts.
>
> Here's the updated patch, including the auto-generated files.
Thanks, LGTM.
Approved-By: Simon Marchi <simon.marchi@efficios.com>
(add this trailer to your patch and push)
Simon
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Remove support for the Common Trace Format (CTF)
2026-05-11 1:25 ` Simon Marchi
@ 2026-05-11 3:52 ` Sergio Durigan Junior
2026-05-11 3:56 ` Sergio Durigan Junior
1 sibling, 0 replies; 7+ messages in thread
From: Sergio Durigan Junior @ 2026-05-11 3:52 UTC (permalink / raw)
To: Simon Marchi; +Cc: GDB Patches, doko, Michael Jeanson
On Sunday, 10 May 2026, Simon Marchi wrote:
> Thanks, LGTM.
>
> Approved-By: Simon Marchi <simon.marchi@efficios.com>
>
> (add this trailer to your patch and push)
Thanks, pushed as 305ad81ae664965897d12e50205db1344b6f4bf8.
--
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
https://sergiodj.net/
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Remove support for the Common Trace Format (CTF)
2026-05-11 1:25 ` Simon Marchi
2026-05-11 3:52 ` Sergio Durigan Junior
@ 2026-05-11 3:56 ` Sergio Durigan Junior
1 sibling, 0 replies; 7+ messages in thread
From: Sergio Durigan Junior @ 2026-05-11 3:56 UTC (permalink / raw)
To: Simon Marchi; +Cc: GDB Patches
On Sunday, 10 May 2026, Simon Marchi wrote:
> On 2026-05-10 12:42, Sergio Durigan Junior wrote:
>>> The patch doesn't contain the generated files (configure & al), please
>>> submit a patch with the generated files.
>>
>> Hm, I was following the instructions from
>> <https://sourceware.org/gdb/wiki/DeveloperTips#Editing_configure.ac>.
>> Are they out-of-date? I'm happy to update the wiki if that's the case.
>
> Weird, in all my time contributing to GDB we always sent the generated
> files, unless the resulting patch was too big to send on the list.
Yeah, that's what I remember from the old times as well. I took the
liberty to edit the wiki page and invert that sentence.
Cheers,
--
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF 31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
https://sergiodj.net/
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2026-05-11 3:57 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-05-10 2:28 [PATCH] Remove support for the Common Trace Format (CTF) Sergio Durigan Junior
2026-05-10 4:47 ` Eli Zaretskii
2026-05-10 12:43 ` Simon Marchi
2026-05-10 16:42 ` Sergio Durigan Junior
2026-05-11 1:25 ` Simon Marchi
2026-05-11 3:52 ` Sergio Durigan Junior
2026-05-11 3:56 ` Sergio Durigan Junior
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox