Simon Marchi [Mon, 2 Dec 2019 16:35:11 +0000 (11:35 -0500)]
bt2: reverse order of printed causes in _Error.__str__
To match how the CLI prints them.
Change-Id: Ief913b119b169bf9f620531f8763db93e19bda27
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2556
CI-Build: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Mon, 2 Dec 2019 16:25:30 +0000 (11:25 -0500)]
bt2: remove ptr parameter of _Error.__init__
It isn't used. We never pass a bt_error pointer when constructing an
_Error, the constructor of _Error always takes the bt_error from the
current thread.
Change-Id: I3c5920afe217f3b2067f9fb397b8ef8069d71b11
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2555
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Wed, 20 Nov 2019 17:01:18 +0000 (12:01 -0500)]
tests: add test for list-plugins CLI command
The test provides a custom Python plugin, then checks for a
corresponding entry in the "list-plugins" output.
Change-Id: I65fff2d4d22f21a89fa1ad7e747c5e15677212b9
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2421
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Wed, 20 Nov 2019 23:51:28 +0000 (18:51 -0500)]
tests: test removing a destruction listener from a destruction listener
This patch adds a test to verify that removing a trace or trace class
destruction listener from an object from within a destruction listener
of that same object works correctly.
It tests 3 scenarions:
- A destruction listener removing itself.
- A destruction listener removing a destruction listener that was
already called.
- A destruction listener removing a destruction listener that is not yet
called.
This assumes that destruction listeners are called in the order in which
there were added.
In the third scenario (removing a destruction listener that is not yet
called), the result is that the removed listener won't get called.
Change-Id: I49de9b662b3c1f77ca1c9f84c2c3575a8616cc10
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2429
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Wed, 20 Nov 2019 23:11:35 +0000 (18:11 -0500)]
tests/lib/Makefile.am: Move libbabeltrace2-common and libbabeltrace2-logging to COMMON_TEST_LDADD
These libraries are necessary to all tests that use BT_ASSERT, which is
the case of pretty much every test.
Change-Id: Ifdc7e21f7540c694533f15f3fd55f46738683464
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2428
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Wed, 20 Nov 2019 20:25:06 +0000 (15:25 -0500)]
bt2: make _ListenerHandle not hold a strong reference on the target object
The bt2._ListenerHandle object currently holds a strong reference to the
Python object on which the listener was added. This allows validating
that a handle passed to the remove_destruction_listener method of an
object mathces that object.
However, keeping that strong reference also prevents the destruction of
that target object. So, adding a destruction listener and keeping the
handle around actually prevents the destruction from happening, making
that destruction listener useless.
Change it so the _ListenerHandle only keeps the address of the target
object. This is enough to do the check described above. We must
however invalidate the _ListenerHandle when the target object is
destroyed, because another object could be later created at the same
address. To achieve this, the handle object is bound to the destruction
callback, so that we can invalidate it in
_trace_destruction_listener_from_native /
_trace_class_destruction_listener_from_native.
The "del" statements in the tests were necessary before, otherwise the
handles would keep the trace class / trace alive, and the destruction
listeners would not get called. I removed them, so it now tests that
keeping a listener handle doesn't keep the target object alive.
Change-Id: I668cf29b5a6046a89d4eff73d322cb0cd83e5109
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2426
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Wed, 20 Nov 2019 22:55:49 +0000 (17:55 -0500)]
bt2: fix error message in trace_class.py
This error message was probably copied from trace.py. It should say
"trace class" and "trace".
Change-Id: Ib9fcae27102a90ffe5492e74906ca1a1d5205dfc
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2425
Simon Marchi [Wed, 20 Nov 2019 20:29:42 +0000 (15:29 -0500)]
bt2: make Graph add listener methods return None
The methods add_ports_connected_listener and add_port_added_listener of
bt2.Graph currently return a _ListenerHandle object. This is not useful
today, since it's not possible to remove those listeners (unlike trace
class and trace destruction listeners).
Make them not return a handle for now. It will be possible to make them
return a handle again if/when we add the possibility to remove those
listeners.
Change-Id: I5ea1c9d8793232c2f7077b5c2b82797438066d13
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2424
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Wed, 20 Nov 2019 21:22:49 +0000 (16:22 -0500)]
param-parse: allow duplicate map keys
It is a bit odd that this is accepted (the second value overwrites the
first):
-p a=3 -p a=4
but this isn't:
-p a=3,a=4
Remove the check that prevents duplicate keys from being defined in a
map.
Change-Id: Id39e86bb48ac52c6714db3128b7d767f5347de64
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2423
Simon Marchi [Tue, 19 Nov 2019 22:44:12 +0000 (17:44 -0500)]
bt2: validate parameters to _StreamClass.create_event_class before creating the native object
For the same reasons outlined in
d3bf1370a437 ("bt2: validate parameters
to _TraceClass.create_stream_class before creating the native object"),
validate the parameters when creating an event class before creating the
native object.
Change-Id: I435b21c145e663a373f3e989feac3e1d5de626c8
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2415
Simon Marchi [Tue, 19 Nov 2019 22:20:54 +0000 (17:20 -0500)]
bt2: add invalid parameter type test for _UserComponent._create_trace_class
Verify that passing a value of the wrong type to _UserComponent._create_trace_class
produces an error.
Change-Id: Id8c0c72ff0a44b292b56095e8dcc1305b73a73a7
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2414
Simon Marchi [Fri, 15 Nov 2019 22:20:49 +0000 (17:20 -0500)]
src.ctf.fs: sort inputs paths
Sort input paths to make the behavior of the component more
deterministic.
For example, when there are duplicated packets in the trace and we pick
one copy, this will ensure that we always process the data stream files in
the same order, and that we always pick the same copy of the packet.
In practice, this will reduce the chances of observing different
behaviors on different platforms where glib reports the files of a trace
in different orders.
A test is added to verify that the choice of which copy of a packet to
choose, in case a packet is present in multiple copies, is independent
from the order of the inputs paths passed to the component.
Change-Id: I034ba8c909e76a1e89589e1f0e0f37512c9d88bf
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2396
Simon Marchi [Fri, 15 Nov 2019 21:17:46 +0000 (16:17 -0500)]
cli: print error causes in all error paths
I noticed that providing a parameter with a wrong syntax to a query
resulted in no error stack shown by the CLI, even though a bunch of
BT_CLI_LOGE_APPEND_CAUSE are done along the way. We just get the logged
errors:
./src/cli/babeltrace2 query -p 'a=2,' src.ctf.fs yo
11-15 16:17:34.734 6423 6423 E CLI/CFG-CLI-ARGS bt_config_query_from_args@babeltrace2-cfg-cli-args.c:1530 Invalid format for --params option's argument:
Expecting unquoted map key:
a=2,
^
11-15 16:17:34.735 6423 6423 E CLI main@babeltrace2.c:2781 Command-line error: retcode=1
This is because the main function only prints the error stack when the
command execution fails, not when anything earlier fails, like the
creation of the command configuration in this case.
Move the call to print_error_causes at the end, so that the causes are
printed every time we exit with status code 1.
I then found that the amount of vertical blank space in the result was
too damn high:
myprompt$ ./src/cli/babeltrace2 query -p 'a=2,' ctf src.ctf.fs yo
11-15 16:38:15.850 13799 13799 E CLI/CFG-CLI-ARGS bt_config_query_from_args@babeltrace2-cfg-cli-args.c:1530 Invalid format for --params option's argument:
Expecting unquoted map key:
a=2,
^
11-15 16:38:15.851 13799 13799 E CLI main@babeltrace2.c:2781 Command-line error: retcode=1
ERROR: [Babeltrace CLI] (/home/smarchi/src/babeltrace/src/cli/babeltrace2.c:2781)
Command-line error: retcode=1
CAUSED BY [Babeltrace CLI] (/home/smarchi/src/babeltrace/src/cli/babeltrace2-cfg-cli-args.c:1530)
Invalid format for --params option's argument:
Expecting unquoted map key:
a=2,
^
myprompt$
So I removed the newlines added by ini_append_error_expecting. I think
it looks readable and more concise this way. Any caller who wants the
newlines can add them itself.
myprompt$ ./src/cli/babeltrace2 query -p 'a=2,' ctf src.ctf.fs yo
11-15 16:41:38.600 15717 15717 E CLI/CFG-CLI-ARGS bt_config_query_from_args@babeltrace2-cfg-cli-args.c:1530 Invalid format for --params option's argument:
Expecting unquoted map key:
a=2,
^
11-15 16:41:38.600 15717 15717 E CLI main@babeltrace2.c:2781 Command-line error: retcode=1
ERROR: [Babeltrace CLI] (/home/smarchi/src/babeltrace/src/cli/babeltrace2.c:2781)
Command-line error: retcode=1
CAUSED BY [Babeltrace CLI] (/home/smarchi/src/babeltrace/src/cli/babeltrace2-cfg-cli-args.c:1530)
Invalid format for --params option's argument:
Expecting unquoted map key:
a=2,
^
myprompt$
Change-Id: Id38159896d595b9c8fcac00b3364577e1ea36883
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2394
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Wed, 20 Nov 2019 17:04:24 +0000 (12:04 -0500)]
tests: add missing backslash in tests/Makefile.am
Change-Id: I676829a841ad09e6e2df9894272f6c85a9cff1ca
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2420
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Wed, 20 Nov 2019 16:24:47 +0000 (11:24 -0500)]
tests: test_auto_source_discovery_grouping: remove dir_sep variable
It isn't used. Fixes the following shellcheck diagnostics:
In test_auto_source_discovery_grouping line 42:
dir_sep='\'
^-- SC1003: Want to escape a single quote? echo 'This is how it'\''s done'.
In test_auto_source_discovery_grouping line 44:
dir_sep='/'
^-----^ SC2034: dir_sep appears unused. Verify use (or export if used externally).
Reported-by: shellcheck
Change-Id: I9db00870cd697d5ad3bd5aa362a030a4b75f4e4c
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2419
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Wed, 20 Nov 2019 16:20:29 +0000 (11:20 -0500)]
tests: silence "variable/expression in single quote" shellcheck warnings
shellcheck complains that we use a variable in single quotes:
In test_trace_copy line 63:
uniq_ts_cnt="$("${BT_TESTS_AWK_BIN}" '{ print $1 }' < "${text_output1}" | sort | uniq | wc -l)"
^------------^ SC2016: Expressions don't expand in single quotes, use double quotes for that.
In other cases, it's because of backticks (`) in a single quote string.
Silence these warnings locally by putting the appropriate comment:
# shellcheck disable=SC2016
Reported-by: shellcheck
Change-Id: Ib2cfa73f84ba8746d3793e49721ead171c24dd99
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2418
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Wed, 20 Nov 2019 16:15:30 +0000 (11:15 -0500)]
tests: quote ${BT_CTF_TRACES_PATH} in test_trace_read and test_trace_copy
Fixes these shellcheck errors:
In test_trace_copy line 33:
SUCCESS_TRACES=(${BT_CTF_TRACES_PATH}/succeed/*)
^-------------------^ SC2206: Quote to prevent word splitting/globbing, or split robustly with mapfile or read -a.
In test_trace_read line 29:
SUCCESS_TRACES=(${BT_CTF_TRACES_PATH}/succeed/*)
^-------------------^ SC2206: Quote to prevent word splitting/globbing, or split robustly with mapfile or read -a.
In test_trace_read line 30:
FAIL_TRACES=(${BT_CTF_TRACES_PATH}/fail/*)
^-------------------^ SC2206: Quote to prevent word splitting/globbing, or split robustly with mapfile or read -a.
Reported-by: shellcheck
Change-Id: Ia13810be69d2bc57f6d6541887de0f9d75e3ffe5
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2417
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Wed, 20 Nov 2019 16:12:45 +0000 (11:12 -0500)]
tests: declare and assign variables separately in test_exit_status
Fixes these shellcheck errors:
In test_exit_status line 34:
local actual_stdout=$(mktemp -t test_cli_exit_status_stdout_actual.XXXXXX)
^-----------^ SC2155: Declare and assign separately to avoid masking return values.
In test_exit_status line 35:
local actual_stderr=$(mktemp -t test_cli_exit_status_stderr_actual.XXXXXX)
^-----------^ SC2155: Declare and assign separately to avoid masking return values.
In test_exit_status line 53:
local actual_stdout=$(mktemp -t test_cli_exit_status_stdout_actual.XXXXXX)
^-----------^ SC2155: Declare and assign separately to avoid masking return values.
In test_exit_status line 54:
local actual_stderr=$(mktemp -t test_cli_exit_status_stderr_actual.XXXXXX)
^-----------^ SC2155: Declare and assign separately to avoid masking return values.
In test_exit_status line 72:
local actual_stdout=$(mktemp -t test_cli_exit_status_stdout_actual.XXXXXX)
^-----------^ SC2155: Declare and assign separately to avoid masking return values.
In test_exit_status line 73:
local actual_stderr=$(mktemp -t test_cli_exit_status_stderr_actual.XXXXXX)
^-----------^ SC2155: Declare and assign separately to avoid masking return values.
Reported-by: shellcheck
Change-Id: Iddb1c4e8b0a3bc1c37cc08a37b1103d97b8560e7
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2416
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Tue, 19 Nov 2019 18:51:10 +0000 (13:51 -0500)]
Make some bt_param_validation_map_value_entry_descr variables static
These variables are not used outside their respective files.
Change-Id: I281df2f935ebd4326a9a655cd8b84fbcb437cfc3
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2412
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Tue, 19 Nov 2019 18:48:03 +0000 (13:48 -0500)]
src.ctf.fs: make ctf_fs_ds_group_medops symbol hidden
Change-Id: I96c7f3aaf76c94337cd0efb1eb71b9cf76a1e5fa
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2411
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Tue, 19 Nov 2019 18:47:52 +0000 (13:47 -0500)]
ctf: make ctf scanner symbols hidden
Change-Id: I21d2e25fe96d308ae949d2e3ac090e05cabbefaf
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2410
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Tue, 19 Nov 2019 17:26:36 +0000 (12:26 -0500)]
param-validation: make symbols hidden
This convenience library is linked statically with the various plugins
that use it. The symbols are currently not marked as hidden, which
causes the plugins that use it (e.g. babeltrace-plugin-ctf.so) to expose
them publically. Sad.
Mark the symbols as hidden to avoid that.
Change-Id: If099b529f7c126f5defd5242486009c3fd4195eb
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2409
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Tue, 19 Nov 2019 17:24:04 +0000 (12:24 -0500)]
python-plugin-provider: make python_state static
This variable is not used outside the file, it should not be exposed.
Change-Id: Icb1ed68485d9205149a2adf95051f4694cbc8cc0
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2408
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Tue, 19 Nov 2019 17:07:22 +0000 (12:07 -0500)]
lib: add comments to exposed but internal symbols
These two functions, despite being exposed by the shared library, are
not part of the public ABI. They are only meant to be used by the
Python plugin provider, which is conceptually part of libbabeltrace2,
but implemented as a separate shared library. Add comments to explain
that.
Change-Id: I704240070403c9dd5d75f15e107c00b011d8a5ef
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2407
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Tue, 19 Nov 2019 17:05:24 +0000 (12:05 -0500)]
lib: add comment to bt_plugin_so_create_all_from_static
This symbol would normally not be exposed, but it is used from the
Python plugin provider, which is conceptually part of libbabeltrace2,
but implemented as a separate shared library. Add a comment to explain
that.
Change-Id: Ie6e14edc30489ab6f8c6aadba32a3ceb9726e3b0
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2406
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Tue, 19 Nov 2019 17:04:25 +0000 (12:04 -0500)]
lib: make bt_object_pool symbols hidden
bt_object_pool_initialize and bt_object_pool_finalize are not supposed
to be exposed by the shared library, so make them hidden.
Change-Id: I072b692f627f4b66b4e5907eeb228d6327d3d70e
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2405
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Tue, 19 Nov 2019 17:01:30 +0000 (12:01 -0500)]
lib: make symbols in prio-head hidden
These are not supposed to be exposed by the shared library, so make them
hidden.
Change-Id: If1f728f1b536d1be1e38dfff8ca2aba8d4bd1868
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2404
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Tue, 22 Oct 2019 21:55:25 +0000 (17:55 -0400)]
tests: add CLI query tests
Add a few simple tests for the query CLI command, using a custom Python
component class.
Change-Id: Ic2b2d3f9f5e0f460f596bd1e4403c250ec2daad5
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2245
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Tue, 19 Nov 2019 16:22:42 +0000 (11:22 -0500)]
param-parse: use g_string_append_c instead of g_string_append_printf
... to append a single character.
I did some tests to evaluate the performance impact of this patch, in
terms of number of instructions. I ran the following command line 20
times and computed the average and standard deviation of the number of
execution instructions.
$ libtool --mode=execute perf stat -e instructions:u ./src/cli/babeltrace2 query -p '
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa=2,' src.ctf.fs yo
average stdev
Without this patch:
1079692 51
With this patch:
1039197 51
This represents a reduction of 3.75% in the number of executed
instructions.
Change-Id: I8109d42d0fa357e47642132a2f3b9581d72bcefa
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2403
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Wed, 13 Nov 2019 22:00:08 +0000 (17:00 -0500)]
lib: remove bt_packet_context_field API
Change-Id: I357daa5915140882dab47acb70570178fb767db8
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2390
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Fri, 15 Nov 2019 19:39:59 +0000 (14:39 -0500)]
ctf: make msg-iter not use bt_packet_context_field
The bt_packet_context_field API exists so that the CTF message iterator
could store packet context fields in contexts where it doesn't create
trace-ir objects. For example, in add_ds_file_to_ds_file_group, we use
a message iterator just to sniff the properties of the first packet of a
data stream file.
However, the CTF message iterator doesn't really use it anymore, it just
stores the relevant properties in fields of the ctf_msg_iter structure
and transfers them to the caller in ctf_msg_iter_get_packet_properties.
So the bt_packet_context_field API no longer has a reason to be. This
patch makes msg-iter stop using it, so it can be removed.
Currently, the packet_context_field is created when needed, which is
just before reading the packet context, in
read_packet_context_begin_state. A bt_packet is later created in
create_msg_packet_beginning, and the packet_context_field is moved into
the bt_packet.
If we want to get rid of the packet_context_field, it means we need to
create the bt_packet earlier (if not in dry_run mode), so it is
available in read_packet_context_begin_state, so that the packet context
fields are read directly into the bt_packet. And to create the
bt_packet, the bt_stream needs to be available. The bt_stream is
currently created just before sending the stream beginning message, in
ctf_msg_iter_get_next_message.
So this patch moves the creation of the bt_stream and bt_packet as early
as possible, just after we have read the packet header, in
after_packet_header_state. In read_packet_context_begin_state, we can
then find the packet already created in msg_iter->packet.
This change made it necessary to set the dry run flag on the CTF message
iterator in add_ds_file_to_ds_file_group (which should have probably
already been there anyway). This iterator is used to read the packet
context, which, previously, didn't trigger the creation of the bt_stream
and bt_packet. But now that we create those earlier, it is necessary
to set the flag to avoid them being created.
It was also needed to change the check in after_packet_context_state to
know whether we are at the first packet, and therefore need to emit a
stream beginning message, or if we are at a subsequent packet, and
therefore need to skip that step. We would previously check whether the
msg_it->stream field was set, but this is now always true given that we
set the stream earlier. The only way that I found to fix that is to add
the boolean flag emit_stream_beginning_message in the message iterator.
Change-Id: Ib907480727d00d51aabd89986375d533ad385c96
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2393
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Mon, 18 Nov 2019 19:37:33 +0000 (14:37 -0500)]
ctf: remove ctf_msg_iter::set_stream
This field is set but not used.
Change-Id: Ibca38c8421b8d734462077a19da1726a817f3cb6
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2401
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Tue, 19 Nov 2019 21:11:44 +0000 (16:11 -0500)]
src.ctf.fs: fix typo in comment
Change-Id: I2a3ee8d019b7dfb966aba3a1e9a5d7fc375eb9e7
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2413
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Simon Marchi [Mon, 18 Nov 2019 21:45:46 +0000 (16:45 -0500)]
lib: mark bt_common_assert_failed as hidden
I noticed that the bt_common_assert_failed symbol was exported. This is
not desirable, as it's not part of the API, so mark it with BT_HIDDEN.
As a consequence, a bunch of small tests that use BT_ASSERT miss this
symbol, as they were getting it from libbabeltrace2. Make them depend
on libbabeltrace2-common (and libbabeltrace2-logging) directly to fix
that.
Change-Id: I25ab69e7df08f508389f5c9c3db5571ee7b06d7b
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2402
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Jérémie Galarneau [Fri, 15 Nov 2019 23:07:51 +0000 (18:07 -0500)]
Update version to v2.0.0-rc4
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Idfe7be3fc2eb22bf1e526d6fe6aeb0ce0f5aae88
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2397
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Philippe Proulx [Fri, 15 Nov 2019 22:09:05 +0000 (17:09 -0500)]
babeltrace2-source.ctf.fs(7): document the overlapping snapshot feature
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I482a366679f65a577cb7081ce46736ab484858c3
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2395
Simon Marchi [Fri, 15 Nov 2019 18:28:02 +0000 (13:28 -0500)]
Revert "Notes de relâche du troisième candidat de relâche"
This reverts commit
98403f26955dc80727dc34974ba1e98d0ead61d1.
Simon Marchi [Thu, 14 Nov 2019 22:27:14 +0000 (17:27 -0500)]
Notes de relâche du troisième candidat de relâche
Change-Id: I8d3811ed4fc3196434ee2aebc1af6c542df53824
Simon Marchi [Tue, 12 Nov 2019 20:26:42 +0000 (15:26 -0500)]
ctf: remove ctf_msg_iter_set_emit_stream_{beginning,end}_message functions
These functions are now unnecessary. Before the previous patch
"src.ctf.fs: add and use medops to iterate on a ds_file_group using the
index", the src.ctf.fs component used ctf_msg_iter in such a way that
the iterator would process complete data stream files one after the
other, and was reset between each file. When starting a data stream
file, the iterator needed to know whether it was the first data stream
file for a given stream, and therefore if it should emit the stream
beginning message. Conversely, it needed to know if the data stream
file was the last one for the stream, and therefore if it needed to emit
the stream end message.
With the new ctf_fs_ds_group_medops, the ctf_msg_iter reads entire
streams, even if they are spread over multiple data stream files. We
therefore don't need to say whether a particular iterator run is the
beginning or end of a stream, it always is.
With lttng-live, the iterator also always does a single run so always
needs to emit the stream messages.
This patch also removes the related fields in ctf_msg_iter, as well as
the related states in the state machine.
The only non-obvious thing is: what to do with the call to
set_current_stream in check_emit_msg_stream_beginning_state. This is
the moment where the message iterator asks the medium to provide the
bt_stream instance for the given stream class and stream instance id.
For now, I moved it to just before we need it the first time, which is
when sending the stream beginning message. This is probably temporary
anyway, as it is planned that we will be able to just pass the bt_stream
when creating the ctf_msg_iter.
Change-Id: I275d4631ff11612abb46c73312bf133753ae4971
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Thu, 14 Nov 2019 21:32:34 +0000 (16:32 -0500)]
src.ctf.fs: use ctf_fs_ds_index_destroy to free index
The function ctf_fs_ds_file_group_destroy frees the ctf_fs_ds_index
structure and its content by hand. Replace that with a call to
ctf_fs_ds_index_destroy, which is meant for that.
Change-Id: I186b1da9ec63cbdfa7ef7966d1e0e9802827e4f7
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Wed, 6 Nov 2019 21:01:24 +0000 (16:01 -0500)]
src.ctf.fs: add and use medops to iterate on a ds_file_group using the index
This patch solves the problem of reading multiple snapshots of the same
tracing session taken quickly. Taking the snapshots quickly enough can
cause them to overlap, in which case some complete / identical packets
will be found in different snapshots.
As an example, imagine we have three snapshots, and packets labeled from
A to G belonging the same stream instance in all snapshots. We could
have the following sequence of packets in each snapshot:
- snapshot 1: A B C D
- snapshot 2: C D E F
- snapshot 3: D E F G
Babeltrace 1 reads these three snapshots successfully. In fact, it just
considers them as three different traces, so it will order events
individually. As a result, events from packet D will be present three
times in the output. So while it works (as in Babeltrace exits with
status 0), it's probably not what a user would want.
Babeltrace 2 (before this patch) hits the following assert, which
validates that messages produced by iterators never go back in time:
11-11 15:13:23.874 8329 8329 F LIB/MSG-ITER call_iterator_next_method@iterator.c:872 Babeltrace 2 library postcondition not satisfied; error is:
11-11 15:13:23.874 8329 8329 F LIB/MSG-ITER call_iterator_next_method@iterator.c:872 Clock snapshots are not monotonic
11-11 15:13:23.874 8329 8329 F LIB/MSG-ITER call_iterator_next_method@iterator.c:872 Aborting...
This is because Babeltrace 2 groups all CTF traces sharing the same UUID
(which is the case for our three snapshots) and gives them to the same
src.ctf.fs component to read. The component groups data stream files
from the various snapshots by stream instance id, and sorts them
according to the timestamp of their first event. It then reads them
sequentially, from end to end, assuming that the start of the second
data stream file is after the end of the first data stream file. Using
our example above, the src.ctf.fs component would therefore try to read
packets in this order:
A B C D C D E F D E F G
^
`- ouch!
In this case, we want to read all packets exactly once, in the right
order.
The solution brought by this patch is to iterate on the packets by
following the index, instead of reading all data files from end to end.
Index entries were already de-duplicated by commit
ctf: de-duplicate index entries
So the index already refers to a single instance of each packet. We can
therefore use it as a playlist of the packets to read.
The change mainly revolves around adding a new kind of CTF message
iterator medium operations, called ctf_fs_ds_group_medops. Instead of
the medium being a single data stream file, like in
ctf_fs_ds_file_medops, this new medium is conceptually the sequence of
all packets described by the index of a ctf_fs_ds_group, possibly spread
out in different data stream files.
A new optional medium operation called `switch_packet` is added. When
the CTF message iterator is done reading a packet, it calls this method,
indicating to the medium that it is at the frontier of two packets. If
the medium is aware of the packets (like ctf_fs_ds_group_medops is) and
knows that the following packet is not contiguous with the previous
packet, it can reposition its "read head" at the right place (open the
new file, go to the right offset). Immediatly after calling
`switch_packet`, the message iterator calls the `request_bytes` method,
which allows the medium to return a buffer containing the bytes of the
next packet.
When the packet-aware medium has its `switch_packet` method called but
there are no more packets to read, it returns
CTF_MSG_ITER_MEDIUM_STATUS_EOF. That brings the message iterator in the
STATE_CHECK_EMIT_MSG_STREAM_END state, which will close the stream.
If the `switch_packet` method is not provided by the medium, the message
iterator just continues, assuming that the bytes of the next packet are
contiguous with those of the previous packet.
The ctf_fs_ds_file_medops medium operations are still necessary for
reading individual ctf_fs_ds_files, when initializing src.ctf.fs
components. This is needed when building the index from a stream or for
applying tracer fixups.
This simplifies a little bit the interaction between the src.ctf.fs
iterator and the ctf_msg_iter. Previously, we would read each data
stream file until the message iterator returned EOF. If it wasn't the
last data stream file, we would reset the iterator to read the next data
stream file. Functions
ctf_msg_iter_set_emit_stream_{beginning,end}_message were necessary to
indicate to the message iterator whether to send the stream beginning or
end messages, because it had otherwise no idea of whether the data
stream file it is reading is the first one or last one. The function
ctf_msg_iter_set_medops_data was necessary to swap the data of the
ctf_fs_ds_file_medops to point to the new data stream file.
With the ctf_fs_ds_group_medops, the CTF message iterator only returns
EOF when the stream is done. The data passed to the
ctf_fs_ds_group_medops has everything it needs to go through all the
packets, so it doesn't need to change.
Change-Id: I72f6d1e09b87414fb83f68cb57abb1f2dc61b439
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Mon, 11 Nov 2019 21:55:42 +0000 (16:55 -0500)]
tests: make test_trimmer use bt_cli
... instead of launching babeltrace2.exe by hand. This makes the
testsuite print the executed command lines, and is therefore easier to
debug.
Change-Id: I82f3984e749b8e6aff38b529ed462373eabd24dc
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Tue, 5 Nov 2019 22:05:50 +0000 (17:05 -0500)]
src.ctf.fs: factor out "ds_file_mmap" from "ds_file_mmap_next"
Currently, the logic to mmap a region of a ds_file is contained in
ds_file_mmap_next. ds_file_mmap_next is also responsible for mapping
the region immediately following the currently mapped region, if there
is a currently mapped region.
I find this double responsibility a bit confusing, especially where
ds_file_mmap_next is used in medop_seek.
This patch extracts a portion of ds_file_mmap_next to a new function
ds_file_mmap, whose job is to ensure a file offset is mapped, and to do
the needful if it isn't.
Change-Id: Ia19725d28cf9c24084a52d16c7a88f30b32ff694
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Tue, 5 Nov 2019 22:44:59 +0000 (17:44 -0500)]
src.ctf.fs: remove ctf_fs_ds_file::end_reached field
It is set, but not used for anything, so remove it.
Change-Id: I502fa683e6ab94a54959918978c4ffd683c5768e
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Tue, 5 Nov 2019 22:21:47 +0000 (17:21 -0500)]
ctf: assert that request_sz in medium ops request_bytes is greater than 0
There's a check in medop_request_bytes to return OK if the passed
request_sz is 0. I don't think that can ever happen, since that
request_sz comes from the max_request_sz parameter when the iterator is
created. It wouldn't make sense to pass 0.
Change-Id: Ia2c8fb6e56195bcab607c39e366c6b58b3411f8b
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Tue, 5 Nov 2019 21:00:57 +0000 (16:00 -0500)]
ctf: make ctf_msg_iter_seek assert that the seek callback is not NULL
There should be no reason to call ctf_msg_iter_seek if there is no seek
callback. It's the user of the ctf_msg_iter who passes medium
operations (at creation time), so it should be aware if there is a seek
callback or not.
This allows removing the UNSUPPORTED values in enum ctf_msg_iter_status
and enum ctf_msg_iter_medium_status.
Change-Id: Ic3591b1e909c7cf0e12d18f40b921a180cf344c8
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Tue, 5 Nov 2019 20:22:39 +0000 (15:22 -0500)]
ctf: assert that msg iter and medium seek offset is valid
I don't think there is ever a valid situation for `offset` to have an
invalid value in ctf_msg_iter_seek or medop_seek. If the user of the
iterator (e.g. fs.c) thinks it's cool enough to seek, it should know
about the underlying medium it used to create the msg iter and make sure
not to seek at an invalid position.
This allows removing the INVAL values in enum ctf_msg_iter_medium_status
and enum ctf_msg_iter_status.
Change-Id: I19d48fe751aebf21e60c5cbc16127919a5fa72f3
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Tue, 5 Nov 2019 20:18:01 +0000 (15:18 -0500)]
src.ctf.fs: remove ctf_msg_iter_seek_whence parameter to medium ops seek
It is useless, as there is a single value. If we ever really need to
specify if the given offset is absolute or relative, we can add back a
parameter, as this is an internal API. In the mean time, it's just an
annoyance.
Change-Id: I3eba79f51d9d5aee82d3bed6ce736459f8dbffa3
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Tue, 5 Nov 2019 20:13:20 +0000 (15:13 -0500)]
src.ctf.fs: little status code cleanup
Make ds_file_munmap return an enum ctf_msg_iter_medium_status, so it
integrates well with the rest. Adjust error handling around the call
sites to be more consistent.
Change-Id: Iea299c782dc215fc64cc3068e58e334f2acb85de
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Tue, 5 Nov 2019 20:06:52 +0000 (15:06 -0500)]
src.ctf.fs: don't call ds_file_munmap on failure in ds_file_mmap_next
It seems useless to call ds_file_munmap here. We can reach the error
label either because:
- the previous call to ds_file_munmap has failed, in which case there's
no point in retrying
- the mmap call returned MAP_FAILED, in which case there's no point un
unmapping
Change-Id: Ia11716a967047d32773ab67f51bcf7516489f183
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Tue, 5 Nov 2019 20:02:38 +0000 (15:02 -0500)]
src.ctf.fs: make ds_file_munmap assert that ds_file is not NULL
There is no reason for a NULL ds_file to ever be passed to this
function. Make it assert that the value is not NULL, to catch potential
mistakes.
Change-Id: I9261450f35b0a5c74ba182985ecabe2b31eee0a0
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Tue, 5 Nov 2019 19:59:11 +0000 (14:59 -0500)]
src.ctf.fs: rename some ctf_fs_ds_file fields
Rename these offset variables to make it a bit more obvious and explicit
what they are relative to. I find that it helps when reading to code, to
make sure that does the right thing.
Change-Id: Id676a482935f9b17553672160044456cc308883c
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Mon, 4 Nov 2019 21:31:52 +0000 (16:31 -0500)]
src.ctf.fs: remove ctf_fs_ds_file_next
The function ctf_fs_ds_file_next is not really relevant, as it
doesn't deal with anything ds_file-specific anymore. It only calls the
ctf_msg_iter_get_next_message and translates the result to a
bt_component_class_message_iterator_next_method_status.
I think this job can (and should) be done by fs.c directly, as it's the
primary user/owner of the ctf_msg_iter.
This patch removes ctf_fs_ds_file_next and updates
ctf_fs_iterator_next_one to call ctf_msg_iter_get_next_message directly.
Change-Id: I96a9e1aa9d3c689bdf19f342464e1632c35058ca
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Mon, 4 Nov 2019 21:48:15 +0000 (16:48 -0500)]
ctf: const-ify a few bt_message parameters
I didn't understand at first why we needed a temporary local variable in
ctf_fs_iterator_next_one, why we couldn't just pass out_msg directly to
ctf_fs_ds_file_next. If we constify the parameter of
ctf_fs_ds_file_next, we can get rid of the variable. Doing so has a few
ramifications, it requires to constify the parameter in a few other
functions. But in the end I think it's all for the greater good.
Change-Id: Ie68249d38dae7a26ab8ce9341b436257644b3b10
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Mon, 4 Nov 2019 20:17:10 +0000 (15:17 -0500)]
ctf: remove ctf_fs_ds_file::msg_iter field
I find it strange that ctf_fs_ds_file objects knows about the
ctf_msg_iter that iterates on it. The ctf_fs_ds_file object just
represents some data that is accessible (a data stream file and the
portion currently mmap-ed), but I don't think it should know anything
about the iterating operation.
This patch removes the msg_iter field of ctf_fs_ds_file and adjusts the
code accordingly.
I think this change makes the code a bit clearer when we create
ctf_msg_iter objects. Currently, we create the msg_iter first with a
NULL medium ops data, then create the ctf_fs_ds_file. In
ctf_fs_ds_file_create, it sets the ctf_msg_iter's medium ops data to the
ctf_fs_ds_file.
With this patch, we create the ctf_fs_ds_file first. Then, when we
create the ctf_msg_iter, we can pass the ctf_fs_ds_file as the medium
ops data directly when we create the ctf_msg_iter.
Change-Id: I247f039d225888c059f08ccdccc86abf0816a6c4
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Thu, 31 Oct 2019 22:28:54 +0000 (18:28 -0400)]
ctf: de-duplicate index entries
When trace snapshots were taken quickly enough, it's possible for them
to overlap. Some identical packets will be present in multiple
snapshots.
For example, the first snapshot could contain packets A, B and C while
the second snapshot could contain packets B, C, and D.
When reading those snapshots together with babeltrace, we will want to
present a coherent view of the logical trace that is spread across
multiple snapshots. That is, we will want to avoid reading the packet
twice.
Currently, we're not considering that case when building the building
the in-memory index. Processing the two streams above will lead to
those entries in the merged index:
- Packet A (snapshot 1)
- Packet B (snapshot 1)
- Packet B (snapshot 2)
- Packet C (snapshot 1)
- Packet C (snapshot 2)
- Packet D (snapshot 2)
This patch makes it so we only keep a single reference to each packet.
If a packet is duplicated, it doesn't matter to which snapshot the
reference points, since all copies of the packet are identical. So a
possible outcome of the situation above, with this patch applied, could
be:
- Packet A (snapshot 1)
- Packet B (snapshot 1)
- Packet C (snapshot 1)
- Packet D (snapshot 2)
So far the index is not used for much, so I don't think that this patch
will have any visible behavior change. However, an upcoming patch will
build on this to make it so we only read each packet once.
Change-Id: I00962d593b5078253043029902f853e5c3fa0dc5
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Fri, 1 Nov 2019 19:17:46 +0000 (15:17 -0400)]
ctf: read packet sequence number from index
Starting with version 1.1, the CTF index format includes a packet
sequence number. Read it, if the index minor version is >=1. The index
major version is already checked to always be 1 above in the code.
If the version is lower than that, store UINT64_MAX in the
packet_seq_num field of the ctf_fs_ds_index_entry structure.
This information will be used in a subsequent patch.
Change-Id: I7b94a94344b26638ae4b7cfc4659067bebc7e195
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Thu, 7 Nov 2019 22:27:27 +0000 (17:27 -0500)]
Save and restore error in ctf_fs_iterator_next, muxer_msg_iter_do_next
ctf_fs_iterator_next and muxer_msg_iter_do_next are written in such a
way that if they successfully accumulate some messages, then hit an
error, they will return OK to make sure that those messages propagate
downstream in the graph, before the error stops the execution. This
assumes that the subsequent call to _next will fail again.
This poses a problem: when it returns OK in this case, it also leaves
the current thread error set. This is a postcondition breach.
One solution would be to simply clear the error in that case. This
would still rely on some error (perhaps the same, perhaps not) to be hit
again on the next _next call. What I don't like with that solution is
that the behaviour of the iterator, if we call _next again after a
failure, is hard to predict. We could hit the same error if we are
lucky, we could hit another error, we could hit an assertion because we
are in an unexpected state, etc.
Instead, this patch implements the following solution: return OK, but
take the error from the current thread and save it in the iterator. The
next time _next is called, that error is moved back to the current
thread and the error status is returned. This ensures that the error
the user will see is the one that originally caused the problem.
A test is added with a trace containing two valid events followed by an
invalid one. We expect to see the two events printed by the details
sink, as well as the error about the invalid event class id.
Change-Id: I725f1de0e6fa0b430aa34bfc524811c5dcd80fa3
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2353
Simon Marchi [Wed, 13 Nov 2019 19:13:06 +0000 (14:13 -0500)]
muxer: append causes on some _next iterator method code paths
The goal of this patch (on top of the fact that having more error causes
is nice) is to ensure that if an error status is returned to
muxer_msg_iter_do_next, an error is set on the current thread. This
will help for the next patch, which will save and restore the error in
this function.
Change-Id: I7221af107f330ab5ded10b69f24121be6ad1678c
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2382
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Simon Marchi [Wed, 13 Nov 2019 20:36:42 +0000 (15:36 -0500)]
lib: save and restore current thread error when calling destruction listeners and finalize methods
Consider the following chain of events:
- User creates and runs a graph
- An error happens when running the graph, _ERROR is returned and the
current thread has an error
- The user does put_ref on the graph to clean up, deliberately leaving
the error on the current thread so it's processed above on the stack.
- When calling put_ref, a trace destruction listener is called.
- After calling the trace destruction listener, the lib asserts that no
error is set (BT_ASSERT_POST_NO_ERROR), which is not true, so the
assert fails.
In this case, the user of the graph would have to take the error, do the
put_ref and restore the error, if it wants to leave it for a function
higher in the stack. However, it is such a common scenario to hit an
error, do some put_ref to clean up and return the error, that it would
be very heavy (and error-prone) to have to do this all the time.
This patch makes it safe to call put_ref with an error set by wrapping
all the user code that can be called as a consequence of a put_ref
(destruction listeners and finalize methods) with an error take/move.
Before calling the user destruction listener or finalize method, the lib
saves the error on the stack. The user callback is therefore called
with no error set and the lib can still validate with
BT_ASSERT_POST_NO_ERROR that it leaves no error on the current thread
after returning. The error is then moved back.
We could say that put_ref now become "error-neutral", in that they can
be called with an error set on the current thread, and they won't modify
it.
Change-Id: I8c7a5429d53073483b9e03f0ec654c826466ee4e
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2385
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Francis Deslauriers [Thu, 14 Nov 2019 02:13:07 +0000 (21:13 -0500)]
Cleanup: src.ctf.lttng-live: move function declarations around
* Remove declarations of `lttng_live_remove_stream_iterator()` and
`lttng_live_add_stream_iterator()` functions as they are not used.
* Move `lttng_live_need_new_streams()` function to viewer-connection.c
as it's only used in this file.
* Move declaration of `lttng_live_create_viewer_session()` to
viewer-connection.h
* Namespace `lttng_live_session` related functions with the
`lttng_live_session_` prefix.
* Rename `lttng_live_borrow_trace()` function to
`lttng_live_session_borrow_or_create_trace_by_id()`
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: Ie18423e9a39b4ac1e04642f381a9f59831c34abe
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2386
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Francis Deslauriers [Fri, 8 Nov 2019 21:01:03 +0000 (16:01 -0500)]
src.ctf.lttng-live: replace usage of `calloc()` by `g_new0()`
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I5c5ee34632488ff875b33b58fea67c16eb05f345
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2362
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Francis Deslauriers [Fri, 8 Nov 2019 20:32:05 +0000 (15:32 -0500)]
Fix: src.ctf.lttng-live: `fwrite()` does not set `errno`
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I212b6672c3793449aed800a518386ad10a499923
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2361
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Francis Deslauriers [Fri, 8 Nov 2019 18:34:01 +0000 (13:34 -0500)]
src.ctf.lttng-live: don't try to detach after socket error
Background
==========
The message iterator `_finalize()` method typically needs to detach from
the live session (LTTNG_VIEWER_DETACH_SESSION) so that the relay daemon
can free up the associated resources.
Issue
=====
In the case we encounter a socket error during the `_next()` method,
we don't want a component to try to send a detach command to the relay
during the `_iter_finalize()` method as this will surely lead to another
error. The annoying thing is that this other error would pollute the
error cause stack that lead to the first error.
Solution
========
Close the socket when we encounter an error and check in the
`lttng_live_detach_session` function if the socket it valid before
sending a _DETACH_SESSION command.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: Ic56e72013e78e4c5ef3343034b0e6f216599be6a
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2357
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Francis Deslauriers [Thu, 7 Nov 2019 20:42:19 +0000 (15:42 -0500)]
Fix: src.ctf.lttng-live: decode metadata even on _STATUS_CLOSED
When receiving a _GET_ONE_METADATA_STATUS_CLOSED from the
`lttng_live_get_one_metadata_packet()` function it means that the
metadata stream was closed by the relay and we will no longer get any
new metadata. But, it also means that everything we received so far is
valid and can be decoded.
So rather than returning _LIVE_ITERATOR_STATUS_END the right thing to do
is to go on with the decoding of the metadata packets.
Also did the following cleanups:
* Merge the `lttng_live_metadata::trace` and
`lttng_live_trace::new_metadata_needed` into a new tri-state enum
`lttng_live_metadata_stream_state` in the `lttng_live_trace` struct.
Those two fields were tightly linked and it's simpler to have a single
field.
* Remove the "poking of the trace metadata" using the
`new_metadata_needed` as it's no longer necessary since all references
are now borrowed.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I3e18365d5cfeaa77935409bdfe8fdda52fa5b636
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2351
Francis Deslauriers [Thu, 7 Nov 2019 20:35:08 +0000 (15:35 -0500)]
Fix: src.ctf.lttng-live: removing trace when not all streams are done
The following commit wrongfully added the removal of a live trace
object:
commit
c28512ab93b16501a8b0da494f0a03e5f0f22662
Author: Francis Deslauriers <francis.deslauriers@efficios.com>
Date: Mon Oct 28 14:49:08 2019 -0400
src.ctf.lttng-live: make `lttng_live_get_one_metadata_packet()` return status
The live trace objects should only be removed once all its stream
iterator have ended. We do that in next_stream_iterator_for_session()
function.
So, roll back this change but keep the switch statement so it's clearer
what are the possible outcomes of the preceding function call.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I7ade43a256b731563eec2b1930724edbaeefd122
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2350
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Francis Deslauriers [Thu, 7 Nov 2019 17:36:20 +0000 (12:36 -0500)]
src.ctf.lttng-live: Add logging statements across the component class
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: Ib24204d48e43b91a5f0ad0111fe4e9d0abef5613
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2349
Francis Deslauriers [Wed, 6 Nov 2019 19:50:20 +0000 (14:50 -0500)]
Cleanup: src.ctf.lttng-live: rename live_iterator_status printing function
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I1512906e984e96893b737ed5388424e709223578
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2348
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Francis Deslauriers [Tue, 5 Nov 2019 22:01:14 +0000 (17:01 -0500)]
Cleanup: src.ctf.lttng-live: add `lttng_live_msg_iter_create()`
One small step to increase readability of this component class.
Change-Id: I4e690d96b85575847314e30ea9223806f4a049dc
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2343
Francis Deslauriers [Mon, 4 Nov 2019 17:07:22 +0000 (12:07 -0500)]
src.ctf.lttng-live: make component class handle interruptions
Currently, if a `src.ctf.lttng-live` component is interrupted by a
signal during a I/O syscall, it will return an _ERROR status downstream.
This is wrong for two reasons:
1. Some signals are not problematic (e.g. SIGUSR1) so we want to
continue as normal, and
2. we want to return an _AGAIN status when we receive a SIGINT
signal.
With this commit, when getting interrupted during a `recv()` or `send()`
call, we check if the graph is now in the interrupted state and return
the _AGAIN status if this case.
This commit changes the semantic of the lttng_live_{recv, send}
functions to make them return a status (_OK, _INTERRUPTED, or _ERROR).
The _OK status is only returned if the entire message was received or
sent. This allows us to remove many checks of the length of received or
sent data.
With this commit, once a live iterator is interrupted by SIGINT and
returns _AGAIN it's not in a state that can be recovered if the graph was
to be run again. Further work is needed to make this component class
restartable.
So to prevent user of the graph to call the _NEXT method after an
interruption, we mark the live iterator as interrupted (with the
`was_interrupted` boolean field) and return an error if it's the case.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I36cba1c3456250099ddfa9a2b15646c3e4f61e94
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2324
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Francis Deslauriers [Tue, 5 Nov 2019 19:25:15 +0000 (14:25 -0500)]
Fix: src.ctf.lttng-live: checking `errno` value on all errors
Issue
=====
We check the errno value even in cases where the errno is not set by the
function that witnessed the error.
For example, we have a `goto error;` after the
`lttng_live_get_one_metadata_packet() call.
Solution
========
Move the errno check right after the functions that set it on error.
Note
====
This erroneous change was introduced by this commit:
commit
c28512ab93b16501a8b0da494f0a03e5f0f22662
Author: Francis Deslauriers <francis.deslauriers@efficios.com>
Date: Mon Oct 28 14:49:08 2019 -0400
src.ctf.lttng-live: make `lttng_live_get_one_metadata_packet()` return status
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I7acb86984249658460888079fd7968d35f6d43fa
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2342
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Francis Deslauriers [Fri, 8 Nov 2019 16:08:10 +0000 (11:08 -0500)]
Cleanup: comp-logging.h: template `BT_COMP_OR_COMP_CLASS_LOG*` macros
This commit is motivated by the need to have the
`BT_COMP_OR_COMP_CLASS_LOGW_ERRNO()` logging macro in a future commit.
It adds the following template macros to simplify add logging macros for
other logging levels:
BT_COMP_OR_COMP_CLASS_LOG
BT_COMP_OR_COMP_CLASS_LOG_ERRNO
I didn't add the `BT_COMP_OR_COMP_CLASS_LOG_APPEND_CAUSE` template as
it's less likely that we will need it for logging levels other than
`BT_LOG_ERROR`.
Also, to be uniform across the file, I moved all the `_lvl` parameter to
the first position for all macros in this file.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: Ifbce021eecc08f8fc994a8ac0f4174ae3e1df853
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2354
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Philippe Proulx [Mon, 11 Nov 2019 19:36:58 +0000 (14:36 -0500)]
lib: make bt_value_map_foreach_entry_{const_}func() return a status code
This patch makes the bt_value_map_foreach_entry_func() and
bt_value_map_foreach_entry_const_func() types return status codes
instead of `bt_bool`.
The available status codes are `OK` (continue the loop, like returning
`BT_TRUE` before this patch), `ERROR`, `MEMORY_ERROR`, and `INTERRUPT`
(break the loop, like returning `BT_FALSE` before this patch).
When the user function returns
`BT_VALUE_MAP_FOREACH_ENTRY_FUNC_STATUS_ERROR`,
bt_value_map_foreach_entry() returns
`BT_VALUE_MAP_FOREACH_ENTRY_STATUS_USER_ERROR` (set to the new global
status code `__BT_FUNC_STATUS_USER_ERROR`). This makes it possible to
distinguish between an internal library error and a user function error.
The purpose of this patch is to make it possible for a user function to
append an error cause to the current thread's error the same way other
user functions do: append the cause and return an error status.
For example, consider this scenario:
1. User calls bt_value_map_foreach_entry() with a user function and user
data which contains a status member.
2. User function calls a library function which fails. The library
function appends a cause to the current thread's error.
3. User function appends a cause to the current thread's error.
4. User function sets the user data's status member to the failing
library function's status and returns `BT_FALSE` to interrupt the
loop.
5. bt_value_map_foreach_entry() returns
`BT_VALUE_MAP_FOREACH_ENTRY_STATUS_INTERRUPTED` (not an error
status).
6. The caller of bt_value_map_foreach_entry() interprets
`BT_VALUE_MAP_FOREACH_ENTRY_STATUS_INTERRUPTED` as an error because
the user data's status member has an error value.
With this patch, it becomes:
1. User calls bt_value_map_foreach_entry() with a user function.
2. User function calls a library function which fails. The library
function appends a cause to the current thread's error.
3. User function appends a cause to the current thread's error.
4. User function returns `BT_VALUE_MAP_FOREACH_ENTRY_FUNC_STATUS_ERROR`
or `BT_VALUE_MAP_FOREACH_ENTRY_FUNC_STATUS_MEMORY_ERROR`, depending
on the failing library function's status, which breaks the loop.
5. bt_value_map_foreach_entry() appends a cause to the current thread's
error and returns `BT_VALUE_MAP_FOREACH_ENTRY_STATUS_USER_ERROR` or
`BT_VALUE_MAP_FOREACH_ENTRY_STATUS_MEMORY_ERROR`.
The latter seems more natural to me.
In Python, nothing wraps bt_value_map_foreach_entry() directly, so I
just converted bt_value_map_get_keys_cb() to return the appropriate
status instead of `BT_TRUE` or `BT_FALSE`. In other words,
bt2.utils._handle_func_status() does not need any change because it will
never receive `native_bt.__BT_FUNC_STATUS_USER_ERROR`.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I235d7957003b51630f4a2f72c1ccdef89d6173e8
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2365
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Mon, 4 Nov 2019 18:49:04 +0000 (13:49 -0500)]
Emit dedicated bright terminal color codes if supported
Some terminals support having a bold normal foreground color which is
_not_ bright. kitty is one of them, as well as GNOME Terminal with the
fairly recent "Show bold text in bright colors" option turned off (or
when calling the underlying vte_terminal_set_bold_is_bright() function
with the appropriate value).
An easy test is to execute:
$ echo -e "\033[31mTHIS\n\033[1mTHAT\033[0m"
and compare the colors of both lines: if they are the same, then the
terminal supports non-bright bold foreground colors.
For those terminals, the way to have a non-bold bright color is to emit
the dedicated SGR codes 90 to 97:
$ echo -e "\033[91mHELLO\033[0m"
Some terminals can print non-bold bright colors, but cannot print
non-bright bold colors.
This patch makes the Babeltrace project emit different color codes
depending on the connected terminal and the new
`BABELTRACE_TERM_COLOR_BRIGHT_MEANS_BOLD` environment variable's value:
kitty or `BABELTRACE_TERM_COLOR_BRIGHT_MEANS_BOLD` is `0`:
Output bright colors using dedicated SGR codes 90 to 97.
Otherwise:
Output bright colors with bold + SGR codes 30 to 37.
This patch effectively makes the Babeltrace modules emit correct bright
color codes for kitty.
To change as little as possible, I updated all the sites which emit a
bold code followed by a foreground color code to emit instead a bold
color code followed by a bright foreground color code. The only drawback
with the current approach is that, for non-kitty terminals, two bold
color codes are emitted for those cases (the real bold and the
brightening bold).
This means all bold colored text is also bright currently. Eventually we
can start decoupling the bold attribute from bright colors if need be,
although this means users must have a supporting terminal.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I3e0124942294fbe833d33aa59506c67e6ca85700
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2328
CI-Build: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Simon Marchi [Fri, 8 Nov 2019 22:19:13 +0000 (17:19 -0500)]
lib: add pre condition asserts to check current thread has no error
The user must not call an API function while the current thread has an
error set, especially a function that can itself fail and set an error.
Otherwise, causes from two unrelated errors will end up in the same
stack, which will produce some misleading information.
Add a precondition assertion to all API functions that are likely to
themselves set an error to the current thread, to verify that there is
not error on the current thread when they are called.
Change-Id: I9aadbc4e00d06f3e893970c7c8891dbe7c68606b
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Thu, 7 Nov 2019 23:18:06 +0000 (18:18 -0500)]
lib: add post condition assertions for current thread error after user functions
It is a logic error and a post condition breach for a user function to
return a non-error status code (>= 0) but leave an error set on the
current thread. Add some assertions after each point where we call a
user function to catch this kind of mistake.
The macro BT_ASSERT_POST_DEV_NO_ERROR_IF_NO_ERROR_STATUS is meant to be
used in the very fast path (consume/next callbacks). The macro
BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS is used elsewhere.
The macros are written in such a way that if they cause an abort, the
error will still be present in thread_error, so accessible to a
debugger.
Change-Id: I4c6127c0b0258dac5be1e3bae63c2d9e6baa2d1f
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Fri, 8 Nov 2019 20:04:01 +0000 (15:04 -0500)]
lib: clear error in clock_snapshots_are_monotonic_one
When bt_clock_snapshot_get_ns_from_origin is called in
clock_snapshots_are_monotonic_one, it can return OVERFLOW_ERROR, in
which case it also sets the current thread error.
clock_snapshots_are_monotonic_one doesn't report an error status to its
caller (it's not its goal), so it should not leave the error there.
This is exercised when running Python test
ClockSnapshotTestCase.test_clock_class.
Change-Id: I0f15c2607c299fabc3a89e6a292d97d8d5815fc4
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2360
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Fri, 8 Nov 2019 19:05:37 +0000 (14:05 -0500)]
tests: clear error in test_simple_sink
When test_simple_expect_run_once_status is used to test an error case,
it leaves the current thread error set. The next test then starts with
an error already set, which is not right.
Clear the error at the end of test_simple_expect_run_once_status. And
while at it, validate that we have an error set exactly when an error
status is returned.
Change-Id: Iafb27908ed15b9e8a2a48bad9b58f3246a5ba3ca
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2359
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Fri, 8 Nov 2019 19:03:56 +0000 (14:03 -0500)]
lib: append error in simple_sink_consume only if error status
If the consume_func returns _AGAIN, we will append an error cause. That
is wrong because _AGAIN is not an error cause. Check for negative
status values instead of just != OK.
Change-Id: Ibc03a1e9eb25de5ec39af5148c8e235498c57b64
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2358
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Wed, 6 Nov 2019 21:02:35 +0000 (16:02 -0500)]
src.ctf.fs: rename pc_msg_iter parameter to self_msg_iter
This is a leftover of:
f30762e5afa0 ("Rename pc_msg_iter fields to self_msg_iter")
Change-Id: I770e3d9a5d903e49a03051ee7c0bef0cdad38cd5
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2347
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Francis Deslauriers [Mon, 4 Nov 2019 19:55:11 +0000 (14:55 -0500)]
Cleanup: cli: move LOGE statements closer to the source
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I752ff78e043e4948489360c5b4e4206a5350c9fd
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2329
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Francis Deslauriers [Tue, 29 Oct 2019 21:45:09 +0000 (17:45 -0400)]
cli: exit with status 2 when interrupted by SIGINT
With this commit, users of the CLI issuing a ctrl+c to interrupt a
running graph will not get an error cause stack printed to stderr.
Instead, they will now simply get a non-zero exit status to signify that
the execution of the command did not complete as expected.
We preferred this approach, because we consider it unexpected that a
user who willingly pressed ctrl+c to stop the command ends up getting an
error cause stack printed to the CLI.
As the execution did not complete normally, we also did not want the
command to exit with status 0 in such cases. Exiting with status code 1
was also not appropriate as it is typically used to signify an error.
In sum, the middle ground we found, is to exit with status code 2 and
not print an error message.
This commit adds tests to confirm that the right exit status is produced
by the CLI when a graph is interrupted, is erroring, or is returning
successfully. To do this, this commit adds a custom Python source
component class that takes as parameter the name of the scenario to
produce during its iterator's first `_next()` call. The iterator then
does the needful to put the graph in the right condition. We then test
if the CLI exits with the expected status.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I82a451b24240be6fb2256ce681685ba02b73600f
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2308
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Francis Deslauriers [Tue, 5 Nov 2019 02:47:20 +0000 (21:47 -0500)]
Update version to v2.0.0-rc2
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: Ifd82afac0bb19c9776d955e52b197ad3b7375bab
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2334
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Wed, 30 Oct 2019 19:20:20 +0000 (15:20 -0400)]
Ignore -Wcast-function-type warning
We get this when building on CentOS 8:
bt2/native_bt.c:1819:23: error: cast between incompatible function types from ‘PyObject * (*)(PyObject *)’ {aka ‘struct _object * (*)(struct _object *)’} to ‘PyObject * (*)(PyObject *, PyObject *)’ {aka ‘struct _object * (*)(struct _object *, struct _object *)’} [-Werror=cast-function-type]
{(char *)"disown", (PyCFunction)SwigPyObject_disown, METH_NOARGS, (char *)"releases ownership of the pointer"},
^
bt2/native_bt.c:1820:23: error: cast between incompatible function types from ‘PyObject * (*)(PyObject *)’ {aka ‘struct _object * (*)(struct _object *)’} to ‘PyObject * (*)(PyObject *, PyObject *)’ {aka ‘struct _object * (*)(struct _object *, struct _object *)’} [-Werror=cast-function-type]
{(char *)"acquire", (PyCFunction)SwigPyObject_acquire, METH_NOARGS, (char *)"acquires ownership of the pointer"},
^
bt2/native_bt.c:1823:23: error: cast between incompatible function types from ‘PyObject * (*)(PyObject *)’ {aka ‘struct _object * (*)(struct _object *)’} to ‘PyObject * (*)(PyObject *, PyObject *)’ {aka ‘struct _object * (*)(struct _object *, struct _object *)’} [-Werror=cast-function-type]
{(char *)"next", (PyCFunction)SwigPyObject_next, METH_NOARGS, (char *)"returns the next 'this' object"},
^
bt2/native_bt.c:1824:23: error: cast between incompatible function types from ‘PyObject * (*)(SwigPyObject *)’ {aka ‘struct _object * (*)(struct <anonymous> *)’} to ‘PyObject * (*)(PyObject *, PyObject *)’ {aka ‘struct _object * (*)(struct _object *, struct _object *)’} [-Werror=cast-function-type]
{(char *)"__repr__",(PyCFunction)SwigPyObject_repr, METH_NOARGS, (char *)"returns object representation"},
^
See comment in configure.ac for detailed explanation. It would have
been nice to just disable it when building native_bt.c, but I am not
sure how to do that in a way that's compatible with all compilers and
that is not overly complicated. So let's just disable it globally for
now.
Change-Id: Iae5c5b6d96978f00e8b19098a438c60817226393
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2309
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Francis Deslauriers [Fri, 1 Nov 2019 15:29:36 +0000 (11:29 -0400)]
Cleanup: src.ctf.lttng-live: remove redundant _APPEND_CAUSE()
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I7336fd9e9fe81ddc6194b00c84a4875e0b5609a8
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2319
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Francis Deslauriers [Mon, 4 Nov 2019 20:28:38 +0000 (15:28 -0500)]
cli: set `bt_config::command_name` field for all commands
This field is used in babeltrace2.c to print the pretty print the
command name in different logging messages.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I953ea162a33212157236be5295183e39fb866ff4
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2331
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Fri, 1 Nov 2019 19:31:02 +0000 (15:31 -0400)]
src.ctf.fs: make log macros of data-stream-file.c more generic
The logging macros in data-stream-file.c currently assume that all the
contexts where a logging statement is used will have a self component at
ds_file->self_comp and a logging level at ds_file->log_level. In a
future patch, I'd like to use a logging statement where there is no
reason to pass a ds_file variable.
Make the macros more generic by having them refer to just self_comp and
logging_level.
Change-Id: I0057dd27310e6ca6bf18441e214eb2fe8a25b19e
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2326
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Mon, 4 Nov 2019 17:08:53 +0000 (12:08 -0500)]
ctf: check version of LTTng trace index
If LTTng was to start producing trace index files with major version 2,
it would presumably be because the format has become
backwards-incompatible. Babeltrace would currently try to parse it like
it parses version 1.x index files, and that would likely not give good
results.
This patch makes Babeltrace check the major version of LTTng trace index
files before parsing them, and ignore them if the major version is not 1.
Change-Id: Ieb4a795a3fce1f5196a2b4ab44575da1b4fc1364
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2325
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Simon Marchi [Sun, 3 Nov 2019 02:09:50 +0000 (22:09 -0400)]
ctf: save self_msg_iter in ctf_msg_iter when creating it
I find it strange that we assign ctf_msg_iter::self_msg_iter in
ctf_msg_iter_get_next_message. The self_msg_iter associated to the
ctf_msg_iter is the same throughout its lifetime, and known at creation
time, so we can assign it once at creation time.
This patch adds a self_msg_iter to ctf_msg_iter_create to do that. It
also removes the self_msg_iter parameter from
ctf_msg_iter_get_next_message, since it is not needed anymore.
Some ctf_msg_iter instances are created not in the context of a
bt_self_message_iterator (e.g. when we create a src.ctf.fs component
and we need to build an index). For those cases, we pass NULL.
Change-Id: I0890dd2504097cf038fd40ec6a1ce1dc099008b2
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2323
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Mon, 4 Nov 2019 16:33:33 +0000 (11:33 -0500)]
ctf: rename bt_msg_iter to ctf_msg_iter
The bt_msg_iter structure is specific to iterating on CTF messages, so
it would be more appropriate for it to be called ctf_msg_iter. Rename
it, as well as related types and functions.
Change-Id: I0ce498e492295a3f7390d73d921ef2eca1cc6d00
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2322
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Simon Marchi [Sat, 2 Nov 2019 13:09:29 +0000 (09:09 -0400)]
ctf: rename bt_msg_iter::msg_iter to self_msg_iter
This follows the naming convention that I have used so far. It helps
knowing which kind of msg iter we are talking about, given that there
are multiple kinds.
Change-Id: Ifece52b06312b0c5f878313171ca4973643e305d
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2320
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Simon Marchi [Sun, 3 Nov 2019 03:23:03 +0000 (23:23 -0400)]
Rename pc_msg_iter fields to self_msg_iter
The pc prefix means "private connection", which is not a concept
present in the API anymore. Rename to "self_msg_iter", which is a more
contemporary term.
Change-Id: I76ab362cab05d1dd480549fc285060854375e1e7
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2321
CI-Build: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 2 Nov 2019 02:49:59 +0000 (22:49 -0400)]
bt_common_abort(): optionally execute a custom command before aborting
This patch makes bt_common_abort() execute the value of the
`BABELTRACE_EXEC_ON_ABORT` environment variable, if it's set, as a shell
command line if the setuid/setgid flags are NOT set (for security).
The function uses g_spawn_command_line_sync() which claims to parse the
command line string like a UNIX 98 shell would, so that's what I wrote
in the environment variable's description in the manual page.
You can use this to execute any command when any part of the Babeltrace
project would abort, for example report it to some system.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I78801460b316f04d805162af320ee30028dc90de
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2318
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Philippe Proulx [Sat, 2 Nov 2019 02:20:33 +0000 (22:20 -0400)]
Add bt_common_abort() and use it instead of abort() directly
This patch adds bt_common_abort() which, for the moment, only calls
abort().
This patch also replaces all the calls to abort() with calls to
bt_common_abort().
The purpose is to control how all the parts of Babeltrace abort,
eventually adding other actions before calling abort() for example.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I2c8cd7ad760758041ef2dcaaa6b3ef84f89d80e6
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2317
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Sat, 2 Nov 2019 02:22:20 +0000 (22:22 -0400)]
.gitignore: add missing `/tests/param-validation/test_param_validation`
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Iba60cf173cdbcbf9986758a548ed732cc3008454
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2316
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Sun, 3 Nov 2019 03:11:51 +0000 (23:11 -0400)]
ctf: fix typo
Change-Id: I225bd8b32ee2491c157c85d20cf7ed508e8851c1
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Francis Deslauriers [Thu, 31 Oct 2019 16:32:33 +0000 (12:32 -0400)]
Cleanup: src.ctf.lttng-live: add missing `#include <stdint.h>`
Use stdint.h whenever only uint*_t are need and inttypes.h when
printf-like identifier are need (e.g. %PRIu64).
And reorder some #include statements.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: Ic69636e4ac316a86f88ba0bdd8ad435b38db0e6a
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2313
Francis Deslauriers [Thu, 31 Oct 2019 15:40:27 +0000 (11:40 -0400)]
Cleanup: src.ctf.lttng-live: remove usage of `bt_object`
The live_viewer_connection objects are never shared and we can know that
by seeing that there is no to _get_ref() in this entire component class.
This commit also removes the need for the BT_OBJECT_DONT_LOG macro added
by:
commit
9358ceb38baa2d50a69d7ee580463a2ddba25465
Author: Philippe Proulx <eeppeliteloop@gmail.com>
lib/object.h: log conditionally to `BT_OBJECT_DONT_LOG` undefined
so remove that to.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I2b4ba20613e77048044507a93241bf7db3f58fa2
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2312
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Francis Deslauriers [Thu, 31 Oct 2019 17:40:07 +0000 (13:40 -0400)]
lib: lib-logging.c: `Babeltrace library` -> `libbabeltrace2`
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: Ibb0de3faa3bdc30fcead46467a69d8ece5d5792f
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2314
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Francis Deslauriers [Tue, 22 Oct 2019 19:39:44 +0000 (15:39 -0400)]
ctf: msg-iter.c: rename `notit` to `msg_it`
Messages used to be called notifications. The CTF message iterator used
to be called notification iterator. This explains why the msg-iter.c
file has tons of variables and parameters named `notit`.
I believe it's time to rename them to a proper name: `msg_it`.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: If546b53a9bca2495fb1cfaf0232d528478e659cf
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2244
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
This page took 0.052014 seconds and 4 git commands to generate.