Philippe Proulx [Wed, 9 Dec 2020 16:41:14 +0000 (11:41 -0500)]
Fix: clear_string_field(): set first character to 0
The API documentation of bt_field_string_clear() says:
> Clears the string field `field`, making its value an empty string.
clear_string_field(), called by bt_field_string_clear(), sets the string
field's buffer's length to 0 without setting its first character to 0 to
make the string field empty from bt_field_string_get_value()'s point of
view.
This patch makes clear_string_field() also set the string field's
buffer's first character to 0.
Reported by Brice Videau (@Kerilk) in
<https://github.com/efficios/babeltrace/pull/116>.
Reported-by: Brice Videau <bvideau@anl.gov>
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I964599ecfbea33a7cb583dcf7cf25e6cffbc30b6
Reviewed-on: https://review.lttng.org/c/babeltrace/+/4528
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
(cherry picked from commit
0022a87819b0908869f99e08925d2d71c150b285)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/10010
CI-Build: Simon Marchi <simon.marchi@efficios.com>
Francis Deslauriers [Wed, 4 Aug 2021 15:19:14 +0000 (11:19 -0400)]
Fix: src.ctf.fs: Not resolving event common ctx
Issue
=====
An assertion fails when creating the trace class with a sequence in the
event common context with the following callstack:
#0 0x00007ffff7bf118b in raise () from /lib/x86_64-linux-gnu/libc.so.6
#1 0x00007ffff7bd0859 in abort () from /lib/x86_64-linux-gnu/libc.so.6
#2 0x00007ffff73e2d86 in bt_common_abort () at common.c:2111
#3 0x00007ffff73ddec4 in bt_common_assert_failed (file=0x7ffff73ec268 "ctf-meta-update-value-storing-indexes.c", line=57, func=0x7ffff73ec300 <__func__.16976> "update_field_class_stored_value_index", assertion=0x7ffff73ec260 "tgt_fc") at assert.c:40
#4 0x00007ffff738a396 in update_field_class_stored_value_index (fc=0x5555555d9c00, tc=0x555555598000, sc=0x555555598690, ec=0x0) at ctf-meta-update-value-storing-indexes.c:57
#5 0x00007ffff738a4a0 in update_field_class_stored_value_index (fc=0x5555555d8ee0, tc=0x555555598000, sc=0x555555598690, ec=0x0) at ctf-meta-update-value-storing-indexes.c:81
#6 0x00007ffff738a63b in ctf_trace_class_update_value_storing_indexes (ctf_tc=0x555555598000) at ctf-meta-update-value-storing-indexes.c:148
#7 0x00007ffff73a0e95 in ctf_visitor_generate_ir_visit_node (visitor=0x55555559ce60, node=0x5555555ad100) at visitor-generate-ir.c:4900
#8 0x00007ffff738e583 in ctf_metadata_decoder_append_content (mdec=0x55555559f380, fp=0x5555555aba00) at decoder.c:316
#9 0x00007ffff73c9fda in ctf_fs_metadata_set_trace_class (self_comp=0x5555555a21b0, ctf_fs_trace=0x5555555981d0, config=0x55555559ee08) at metadata.c:107
#10 0x00007ffff73c5e2f in ctf_fs_trace_create (self_comp=0x5555555a21b0, self_comp_class=0x0, path=0x555555597d40 "/home/frdeso/lttng-traces/auto-
20210804-093702/kernel", name=0x0, metadata_config=0x55555559ee08, log_level=BT_LOGGING_LEVEL_WARNING) at fs.c:1072
#11 0x00007ffff73c65cc in ctf_fs_component_create_ctf_fs_trace_one_path (ctf_fs=0x55555559edf0, path_param=0x5555555a1e50 "/home/frdeso/lttng-traces/auto-
20210804-093702/kernel", trace_name=0x0, traces=0x555555597a80, self_comp=0x5555555a21b0, self_comp_class=0x0) at fs.c:1183
#12 0x00007ffff73c8a4d in ctf_fs_component_create_ctf_fs_trace (ctf_fs=0x55555559edf0, paths_value=0x5555555ac4d0, trace_name_value=0x0, self_comp=0x5555555a21b0, self_comp_class=0x0) at fs.c:2097
#13 0x00007ffff73c9a97 in ctf_fs_create (params=0x5555555abf70, self_comp_src=0x5555555a21b0) at fs.c:2397
#14 0x00007ffff73c9b52 in ctf_fs_init (self_comp_src=0x5555555a21b0, config=0x0, params=0x5555555abf70, init_method_data=0x0) at fs.c:2431
#15 0x00007ffff7f20b60 in add_component_with_init_method_data (graph=0x5555555a20a0, comp_cls=0x5555555a9580, init_method=0x7ffff73c9b1c <ctf_fs_init>, name=0x5555555abf40 "auto-disc-source-ctf-fs", params=0x5555555abf70, init_method_data=0x0, log_level=BT_LOGGING_LEVEL_WARNING, user_component=0x7fffffffe308, api_func=0x7ffff7f63880 <__func__.17336> "bt_graph_add_source_component", init_method_name=0x7ffff7f633a8 "bt_component_class_source_initialize_method") at graph.c:1048
#16 0x00007ffff7f20e3d in add_source_component_with_initialize_method_data (graph=0x5555555a20a0, comp_cls=0x5555555a9580, name=0x5555555abf40 "auto-disc-source-ctf-fs", params=0x5555555abf70, init_method_data=0x0, log_level=BT_LOGGING_LEVEL_WARNING, component=0x7fffffffe308, api_func=0x7ffff7f63880 <__func__.17336> "bt_graph_add_source_component") at graph.c:1127
#17 0x00007ffff7f20eec in bt_graph_add_source_component (graph=0x5555555a20a0, comp_cls=0x5555555a9580, name=0x5555555abf40 "auto-disc-source-ctf-fs", params=0x5555555abf70, log_level=BT_LOGGING_LEVEL_WARNING, component=0x7fffffffe308) at graph.c:1152
#18 0x000055555556251a in cmd_run_ctx_create_components_from_config_components (ctx=0x7fffffffe390, cfg_components=0x5555555ab0c0) at babeltrace2.c:2252
#19 0x00005555555628ec in cmd_run_ctx_create_components (ctx=0x7fffffffe390) at babeltrace2.c:2347
#20 0x0000555555562cb5 in cmd_run (cfg=0x5555555a1b80) at babeltrace2.c:2461
#21 0x00005555555635ef in main (argc=2, argv=0x7fffffffe508) at babeltrace2.c:2673
This is due to the fact that the event context field class containing a
sequence is never resolved by calling `resolve_root_class()`. This leads
to the `ctf_field_class_sequence::length_fc` field never being
initialized.
Looking at the `resolve_stream_class_field_classes()` function, it looks
like there is a typo where the `CTF_SCOPE_EVENT_SPECIFIC_CONTEXT` enum
label was used where the intention was to use
`CTF_SCOPE_EVENT_COMMON_CONTEXT` according to the surrounding code.
Fix
===
Replace `CTF_SCOPE_EVENT_SPECIFIC_CONTEXT` by `CTF_SCOPE_EVENT_COMMON_CONTEXT`.
Test
====
This commit adds a minimal testcase with a sequence in the event and
packet contexts.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I370a620855f2dcdf51d02db80b9df22b0f043f3a
Reviewed-on: https://review.lttng.org/c/babeltrace/+/6257
CI-Build: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
(cherry picked from commit
524e73a1580c5c4dac9359177ba6da2577424642)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/10011
CI-Build: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Sat, 6 May 2023 02:59:47 +0000 (22:59 -0400)]
debug-info: fix -Wenum-int-mismatch problem in copy_field_class_content_internal
GCC 13 points out that the return value differs between the declaration
and definition of copy_field_class_content_internal, fix that.
CC trace-ir-metadata-field-class-copy.lo
cc1: warning: command-line option '-Wsuggest-override' is valid for C++/ObjC++ but not for C
/home/smarchi/src/babeltrace/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c:885:41: error: conflicting types for 'copy_field_class_content_internal' due to enum/integer mismatch; have 'enum debug_info_trace_ir_mapping_status(struct trace_ir_metadata_maps *, const bt_field_class *, bt_field_class *)' [-Werror=enum-int-mismatch]
885 | enum debug_info_trace_ir_mapping_status copy_field_class_content_internal(
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from /home/smarchi/src/babeltrace/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c:22:
/home/smarchi/src/babeltrace/src/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.h:17:5: note: previous declaration of 'copy_field_class_content_internal' with type 'int(struct trace_ir_metadata_maps *, const bt_field_class *, bt_field_class *)'
17 | int copy_field_class_content_internal(struct trace_ir_metadata_maps *trace_ir_metadata_maps,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Change-Id: I9c0dd3ffc3ba1a2e9fbbca948a391357ae28a483
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9986
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
(cherry picked from commit
f4e2bc6a8ab9f8c1557904d36151c691f726477c)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/10009
Michael Jeanson [Wed, 22 Mar 2023 21:57:09 +0000 (17:57 -0400)]
fix: pass exec-prefix to python bindings install
Some systems will split the arch independent files from the arch
specific using a different value for 'prefix' and 'exec-prefix'. Pass
this information from the Makefile to the python build system.
Change-Id: I2f26ba1d8c8252e5a1c49fb54733e02ae336f157
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9695
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9882
CI-Build: Simon Marchi <simon.marchi@efficios.com>
Michael Jeanson [Wed, 5 Apr 2023 14:40:31 +0000 (10:40 -0400)]
fix: document proper Bison version requirement
The minimum version of Bison was bumped to 2.5 a while ago, update the
documentation and help messages that still refer to 2.4.
Change-Id: I3daef3eb51f24ff0194c43e3e13575eaa6de4f56
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9734
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9884
CI-Build: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Mon, 3 Apr 2023 01:09:56 +0000 (21:09 -0400)]
cli: use return value of g_string_free
When building against glib 2.76, I see:
CC babeltrace2-cfg-cli-args.o
In file included from /usr/include/glib-2.0/glib/giochannel.h:36,
from /usr/include/glib-2.0/glib.h:56,
from /home/simark/src/babeltrace/src/common/assert.h:12,
from /home/simark/src/babeltrace/src/logging/log.h:27,
from /home/simark/src/babeltrace/src/cli/logging.h:11,
from /home/simark/src/babeltrace/src/cli/babeltrace2-cfg-cli-args.c:10:
/home/simark/src/babeltrace/src/cli/babeltrace2-cfg-cli-args.c: In function ‘plugin_comp_cls_names’:
/usr/include/glib-2.0/glib/gstring.h:72:5: error: ignoring return value of ‘g_string_free_and_steal’ declared with attribute ‘warn_unused_result’ [-Werror=unused-result]
68 | (__builtin_constant_p (free_segment) ? \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
69 | ((free_segment) ? \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
70 | (g_string_free) ((str), (free_segment)) : \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
71 | g_string_free_and_steal (str)) \
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
72 | : \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
73 | (g_string_free) ((str), (free_segment)))
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/simark/src/babeltrace/src/cli/babeltrace2-cfg-cli-args.c:136:25: note: in expansion of macro ‘g_string_free’
136 | g_string_free(gs_name, FALSE);
| ^~~~~~~~~~~~~
glib made g_string_free warn about unused results in this commit:
https://gitlab.gnome.org/GNOME/glib/-/commit/
c3d07a625a407b56432f4b8c60295fd32ee1ee2b
Fix that by changing our code to get the released value from the return
value of g_string_free, rather than doing it in two steps.. No
functional changes intended.
Change-Id: I62f4002d0487165b7c9d33f471937185f3bc0f82
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9728
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
(cherry picked from commit
2e4a3da35892bf53e49936532a3a04e4c6819cb3)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9889
CI-Build: Simon Marchi <simon.marchi@efficios.com>
Jérémie Galarneau [Tue, 25 Apr 2023 19:14:59 +0000 (15:14 -0400)]
babeltrace2-query(1): erroneous parameter used in example
The src.ctf.fs component class expects the `inputs` parameter (an array
of strings) rather than `path` (a string).
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Id716d68cbb289fe7b52f10c22ed6bc5c9914e2e4
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9867
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
(cherry picked from commit
a2aea8a8a071beb7316ade918b824ebd51ac8cf7)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9886
Simon Marchi [Wed, 15 Mar 2023 19:44:02 +0000 (15:44 -0400)]
Fix: tests: print real values in a fixed format
The cli_params_to_string.to_string function converts float values
(bt2._RealValueConst) to string using the str function. The format of
that seems to differ across platform. On a 32-bit powerpcspe platform,
we see this failure in the cli/params/test_params test:
-{a=
10500000.0, b=
10500000.0, c=1.05e-05, d=1.05e-05}
+{a=
10500000.0, b=
10500000.0, c=1.
0499999999999999e-05, d=1.
0499999999999999e-05}
Fix that by doing an explicit string conversion for _RealValueConst objects,
with a constant 7 decimal places after the decimal point. The 7 is chosen so
that the numbers in tests in cli/params/test_params are not truncated.
Change-Id: Ie4fcb8eb422c3d44eeec1201169dc8a995536d4a
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9651
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
(cherry picked from commit
5b616db96266d25cb0749e472cfc78c4944675e2)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9660
Simon Marchi [Thu, 30 Jun 2022 14:46:53 +0000 (10:46 -0400)]
Fix: bt2: autodisc: remove thread error while inserting status in map
If something fails in `bt_bt2_auto_discover_source_components`, we
append an error cause and we go to the error label. This function
returns a bt_value map containing the return status code and the auto-discovery results, if it was successful.
So we then run into:
if (result) {
insert_entry_status = bt_value_map_insert_signed_integer_entry(result, "status", status);
if (insert_entry_status != BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK) {
BT_VALUE_PUT_REF_AND_RESET(result);
PyErr_NoMemory();
}
}
However, since there is an error on the current thread, we fail this
precondition:
06-30 11:27:11.697
3948806 3948806 F LIB/ASSERT-COND bt_lib_assert_cond_failed@assert-cond.c:64 Babeltrace 2 library precondition not satisfied.
06-30 11:27:11.697
3948806 3948806 F LIB/ASSERT-COND bt_lib_assert_cond_failed@assert-cond.c:66 ------------------------------------------------------------------------
06-30 11:27:11.697
3948806 3948806 F LIB/ASSERT-COND bt_lib_assert_cond_failed@assert-cond.c:67 Condition ID: `pre:value-map-insert-signed-integer-entry:no-error`.
06-30 11:27:11.697
3948806 3948806 F LIB/ASSERT-COND bt_lib_assert_cond_failed@assert-cond.c:69 Function: bt_value_map_insert_signed_integer_entry().
06-30 11:27:11.697
3948806 3948806 F LIB/ASSERT-COND bt_lib_assert_cond_failed@assert-cond.c:70 ------------------------------------------------------------------------
06-30 11:27:11.697
3948806 3948806 F LIB/ASSERT-COND bt_lib_assert_cond_failed@assert-cond.c:71 Error is:
06-30 11:27:11.697
3948806 3948806 F LIB/ASSERT-COND bt_lib_assert_cond_failed@assert-cond.c:73 API function called while current thread has an error: function=bt_value_map_insert_signed_integer_entry
06-30 11:27:11.697
3948806 3948806 F LIB/ASSERT-COND bt_lib_assert_cond_failed@assert-cond.c:76 Aborting...
Change the function to temporarily remove the current thread error,
while inserting the status in the map. In the unlikely event where the
insertion fail because of a memory error, then we just release the error
and it gets lost.
Cherry-pick note
----------------
Just like the previous commit, the error string expected by the test had
to be updated.
Change-Id: I1b54fb7c8cb0f719fee867e7385dd6a3949cbde4
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8512
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
(cherry picked from commit
827e42e017fc5f525aa39a3851bf2e7e50e887aa)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9512
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Thu, 30 Jun 2022 14:33:50 +0000 (10:33 -0400)]
tests: src.ctf.fs: add test for metadata with invalid syntax
It looks like we don't have any test for a metadata file with a syntax
error in it. Add one.
It could be argued that we should not error out in that case, as there
may be unrelated files called `metadata`, and if they don't parse as CTF
1 metadata files, we should just skip over them. But erroring out is
the current behavior of Babeltrace 2, so it should be tested to ensure
it doesn't change by mistake.
Cherry-pick note
----------------
The test needed to be adjusted to look for:
Component class's "query" method failed:
instead of
At line 3 in metadata stream: syntax error, unexpected CTF_RSBRAC: token=\"]\""
because the stable-2.0 branch does not include the patch that makes the
CTF metadata reader append error causes (
50f6fce8d00b ("ctf: append
error causes when returning errors")). The test is still relevant, as
it catches an assertion failure that would crash babeltrace.
Change-Id: I82cae8ebc5df984592205c28041276cc861f30df
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8511
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
(cherry picked from commit
dfa664f9be160bace24f960b444818d06e75aeb5)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9532
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Mon, 15 Aug 2022 21:50:51 +0000 (17:50 -0400)]
tests: shorten names of session-rotation trace
Filenames of this trace on the CI are too long for Windows, causing test
failures. Shorten some directory names to avoid that
Change-Id: I8d936af3efca894d55a94a57e3a3d4d5b0441305
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/8694
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
(cherry picked from commit
8dea686a2397bdadb81f44a3e74fd39fd7397ee2)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9549
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Thu, 23 Feb 2023 19:29:42 +0000 (14:29 -0500)]
bt2: ignore -Wredundant-decls warning
The ppc builder on the CI, which uses Python 3.11 + gcc 12.2.0, shows
this warning:
In file included from /usr/include/python3.11/Python.h:91,
from bt2/native_bt.c:168:
/usr/include/python3.11/modsupport.h:37:24: error: redundant redeclaration of ‘_Py_BuildValue_SizeT’ [-Werror=redundant-decls]
37 | PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...);
| ^~~~~~~~~~~~~~~~~~~~
/usr/include/python3.11/modsupport.h:20:41: note: previous declaration of ‘_Py_BuildValue_SizeT’ with type ‘PyObject *(const char *, ...)’ {aka ‘struct _object *(const char *, ...)’}
20 | #define Py_BuildValue _Py_BuildValue_SizeT
| ^~~~~~~~~~~~~~~~~~~~
/usr/include/python3.11/modsupport.h:36:24: note: in expansion of macro ‘Py_BuildValue’
36 | PyAPI_FUNC(PyObject *) Py_BuildValue(const char *, ...);
| ^~~~~~~~~~~~~
I tried fixing it by placing some push/ignored/pop diagnostic pragmas in
the SWIG sections %begin and %runtime, which would be around the
Python.h including in the generated native_bt.c file, but it doesn't
silence the warning for some reason.
Ignore the warning for the whole native_bt.c compilation instead.
Change-Id: Idae04fb30af8108ad14647d9b8f85b2d01a568be
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
(cherry picked from commit
92e41f9132ac72f234deb2f39f2eae0b1858cfc0)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9567
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Thu, 23 Feb 2023 19:19:10 +0000 (14:19 -0500)]
ctf: fix -Wformat-overflow error in ctf-meta-resolve.cpp
Fix this, seen when building with -O2 with gcc 12.2.1:
CXX ctf-meta-resolve.lo
In file included from ../../../../../src/logging/comp-logging.h:16,
from ctf-meta-resolve.cpp:12:
In function 'int pathstr_to_field_path(const char*, ctf_field_path*, resolve_context*)',
inlined from 'int resolve_sequence_or_variant_field_class(ctf_field_class*, resolve_context*)' at ctf-meta-resolve.cpp:948:32,
inlined from 'int resolve_field_class(ctf_field_class*, resolve_context*)' at ctf-meta-resolve.cpp:1026:54:
../../../../../src/logging/comp-logging.h:18:41: error: '%s' directive argument is null [-Werror=format-overflow=]
18 | #define _BT_COMP_LOG_COMP_PREFIX "[%s] "
../../../../../src/logging/log.h:815:67: note: in definition of macro 'BT_LOG_WRITE'
815 | lvl, tag, __VA_ARGS__); \
| ^~~~~~~~~~~
../../../../../src/logging/comp-logging.h:23:42: note: in expansion of macro '_BT_COMP_LOG_COMP_PREFIX'
23 | BT_LOG_WRITE((_lvl), BT_LOG_TAG, _BT_COMP_LOG_COMP_PREFIX _fmt, \
| ^~~~~~~~~~~~~~~~~~~~~~~~
../../../../../src/logging/comp-logging.h:83:9: note: in expansion of macro 'BT_COMP_LOG'
83 | BT_COMP_LOG(BT_LOG_DEBUG, (BT_COMP_LOG_SELF_COMP), _fmt, ##__VA_ARGS__)
| ^~~~~~~~~~~
ctf-meta-resolve.cpp:650:9: note: in expansion of macro 'BT_COMP_LOGD'
650 | BT_COMP_LOGD("Found field path: path=\"%s\", field-path=\"%s\"", pathstr,
| ^~~~~~~~~~~~
Change-Id: Ib311185359a531f3e14bfbbbe6726aa633ceb3e4
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
(cherry picked from commit
ceda1ae6ecf09cd6ad521b34b553f78dbe9bec21)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9548
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Thu, 23 Feb 2023 19:11:38 +0000 (14:11 -0500)]
ctf-writer: fix -Wformat-overflow errors in resolve.c
Fix these, seen when building with -O2 with gcc 12.2.1:
CC resolve.lo
In file included from logging.h:11,
from resolve.c:11:
In function 'pathstr_to_field_path',
inlined from 'resolve_sequence_or_variant_type' at resolve.c:1004:22,
inlined from 'resolve_type' at resolve.c:1105:9:
resolve.c:667:25: error: '%s' directive argument is null [-Werror=format-overflow=]
667 | BT_LOGT("Found field path: path=\"%s\", field-path=\"%s\"",
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../src/logging/log.h:815:67: note: in definition of macro 'BT_LOG_WRITE'
815 | lvl, tag, __VA_ARGS__); \
| ^~~~~~~~~~~
resolve.c:667:17: note: in expansion of macro 'BT_LOGT'
667 | BT_LOGT("Found field path: path=\"%s\", field-path=\"%s\"",
| ^~~~~~~
resolve.c: In function 'resolve_type':
resolve.c:667:70: note: format string is defined here
667 | BT_LOGT("Found field path: path=\"%s\", field-path=\"%s\"",
| ^~
In function 'get_field_paths_lca_index',
inlined from 'validate_target_field_path' at resolve.c:901:15,
inlined from 'resolve_sequence_or_variant_type' at resolve.c:1026:8,
inlined from 'resolve_type' at resolve.c:1105:9:
resolve.c:792:25: error: '%s' directive argument is null [-Werror=format-overflow=]
792 | BT_LOGT("Finding lowest common ancestor (LCA) between two field paths: "
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../src/logging/log.h:815:67: note: in definition of macro 'BT_LOG_WRITE'
815 | lvl, tag, __VA_ARGS__); \
| ^~~~~~~~~~~
resolve.c:792:17: note: in expansion of macro 'BT_LOGT'
792 | BT_LOGT("Finding lowest common ancestor (LCA) between two field paths: "
| ^~~~~~~
resolve.c:792:25: error: '%s' directive argument is null [-Werror=format-overflow=]
792 | BT_LOGT("Finding lowest common ancestor (LCA) between two field paths: "
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../src/logging/log.h:815:67: note: in definition of macro 'BT_LOG_WRITE'
815 | lvl, tag, __VA_ARGS__); \
| ^~~~~~~~~~~
resolve.c:792:17: note: in expansion of macro 'BT_LOGT'
792 | BT_LOGT("Finding lowest common ancestor (LCA) between two field paths: "
| ^~~~~~~
Change-Id: I91608a4e782a4059225986dd974130ccbaf54207
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
(cherry picked from commit
39630c3ba7000fc6c9337b2420bbeba2d9d7c723)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/9547
Tested-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Sat, 5 Mar 2022 01:20:34 +0000 (20:20 -0500)]
Fix: src.text.details: use write_uint_prop_value to handle unsigned values in write_int_range
I tried creating an option field class with unsigned integer selector,
with a [1, UINT64_MAX] range. The details field class shows it as:
opt_with_uint_sel: Option (unsigned integer selector) (Selector field location [Event payload: uint_selector]):
Selector ranges: [1, -1]
The -1 is wrong. Fix two spots to call write_uint_prop_value instead of
write_int_prop_value.
After:
opt_with_uint_sel: Option (unsigned integer selector) (Selector field location [Event payload: uint_selector]):
Selector ranges: [1, 18,446,744,073,709,551,615]
Change-Id: I83344b2a241f597da86c21da030b40eed2a4955f
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/7228
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Thu, 10 Sep 2020 14:51:07 +0000 (10:51 -0400)]
Add `dev-requirements.txt` for pip
`dev-requirements.txt` contains which specific version of Black and
Flake8 to use for development and by a CI so that both parties agree.
Use specific versions as such:
$ virtualenv -p python3 yo
$ . yo/bin/activate
$ pip install -r dev-requirements.txt
Change-Id: Id29e7f61c4038b55bed613e00f76f7c180699fa9
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Francis Deslauriers [Mon, 13 Jul 2020 21:45:35 +0000 (17:45 -0400)]
Fix: src.ctf.lttng-live: consider empty metadata packet as retry
When clearing a live session, it's possible for the Relay to know that
metadata is available even though it has not yet received it from the
consumer.
In such cases, the relay will send a `LTTNG_VIEWER_METADATA_OK` reply
with a zero length metadata packet. The viewer needs to interpret that
as "please try again later". In fact, the viewer needs to keep
requesting metadata from the relay until it receives either a
`LTTNG_VIEWER_NO_NEW_METADATA` status or an error status.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ief33f1a43ec827e211a2f4f2ace623e9d3254246
Reviewed-on: https://review.lttng.org/c/babeltrace/+/7392
Francis Deslauriers [Wed, 22 Jul 2020 16:24:09 +0000 (12:24 -0400)]
Fix: ctf: wrongfully requiring CTF metadata signature for every section
Issue
=====
When testing the special live tracing session case of sending the
metadata in multiple batches, we witnessed the CTF metadata decoder
returning an error if the "/* CTF 1.8" signature is omitted from the
metadata sections following the first one.
Here is the output of Babeltrace when this error occurs:
07-22 12:18:38.518 539222 539222 W PLUGIN/CTF/META/DECODER ctf_metadata_decoder_append_content@decoder.c:242 [lttng-live] Missing "/* CTF major.minor" signature in plain text metadata file stream: mdec-addr=0x2398ec0
07-22 12:18:38.518 539222 539222 E PLUGIN/CTF/META/DECODER ctf_metadata_decoder_append_content@decoder.c:251 [lttng-live] Invalid metadata version found in plain text signature: version=
571641920.0, mdec-addr=0x2398ec0
We expect the decoder to only require this signature when decoding the
first section of plain-text metadata.
Solution
========
Only check for the signature when processing the first metadata section.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I3153abf58ade5f5b02362dbedde382f398f5ee4e
Reviewed-on: https://review.lttng.org/c/babeltrace/+/7391
Francis Deslauriers [Tue, 23 Nov 2021 15:06:51 +0000 (10:06 -0500)]
Fix: src.ctf.lttng-live: session closed before any metadata is received
Issue
=====
When stress-testing the LTTng-UST clear feature over an entire night I
witnessed 6 instances of Babeltrace infinite loop.
Using the GNU Debugger, Babeltrace was found to be endlessly issuing the
`LTTNG_VIEWER_GET_NEW_STREAMS` command to the Relay daemon to which the
Relay Daemon endlessly replied `LTTNG_VIEWER_NEW_STREAMS_HUP`.
This is caused by the fact that the session was closed before we
received any metadata and the lttng-live component class keeps trying to
ask for new streams before requesting the metadata.
Fix
===
If the session is marked as closed return a `_STATUS_END` to stop
considering this session.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I9c18d03cef1b61d1c02b7d608720bf5750a348c4
Reviewed-on: https://review.lttng.org/c/babeltrace/+/7390
Michael Jeanson [Mon, 4 Oct 2021 19:20:39 +0000 (15:20 -0400)]
fix: obsolete warnings with autoconf >= 2.71
Disable 'obsolete' warnings when running autoreconf, on systems with
autoconf >= 2.71 the glib2 macros which we have no control over will
trigger warnings, which then confuses jenkins's compiler warnings
detection code and fails the jobs.
Change-Id: I000e1ac4badcaaed8035f2765ad2e128e7433b63
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Michael Jeanson [Mon, 4 Oct 2021 18:56:43 +0000 (14:56 -0400)]
fix: explicitly disable '-Wsuggest-attribute=format'
Some older GCC version seems to enable '-Wsuggest-attribute=format' with
'-Wall' which results in unwanted warnings. Fixing this would require
modifications to the public headers which were done in the master
branch. As a fix for this stable branch, explicitly disable this warning
if the compiler supports it.
Change-Id: Ic71a9d0986c6f3d1eae561b15c8ffad54773e825
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Michael Jeanson [Mon, 4 Oct 2021 19:01:17 +0000 (15:01 -0400)]
fix: set stable branch in gitreview config
Change-Id: Ice96cf75dbdc8c0b3ef58d8eee1e8a5d7ff28518
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Bernhard Rosenkränzer [Wed, 26 May 2021 03:06:55 +0000 (05:06 +0200)]
Fix: ctf-writer: list of reserved keywords
The missing comma between "void" and "_Bool" causes the compiler to
treat it as one string ("void_Bool"), missing both "void" and "_Bool"
as real reserved keywords.
Signed-off-by: Bernhard Rosenkränzer <bero@lindev.ch>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I3da1b1f579d5fa1248501a8c2d9804ddbf467bc1
Reviewed-on: https://review.lttng.org/c/babeltrace/+/5964
Tested-by: jenkins <jenkins@lttng.org>
Mathieu Desnoyers [Thu, 25 Mar 2021 18:32:40 +0000 (14:32 -0400)]
compiler warning cleanup: is_signed_type: compare -1 to 1
Comparing -1 to 0 triggers compiler warnings (gcc -Wtype-limits and
-Wbool-compare) and Coverity warning "Macro compares unsigned to 0".
Comparing -1 to 1 instead takes care of silencing those warnings while
keeping the same behavior.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I7d3a2d5a813838cef0e7b42d8c80ccf46f27ac62
Reviewed-on: https://review.lttng.org/c/babeltrace/+/5188
CI-Build: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Jérémie Galarneau [Tue, 23 Feb 2021 16:22:16 +0000 (11:22 -0500)]
Update working version to Babeltrace 2.0.5
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I02fac1de6f03f87916b72c29fdcd80989b1ad73b
Jérémie Galarneau [Tue, 23 Feb 2021 16:20:35 +0000 (11:20 -0500)]
Release: Babeltrace 2.0.4 "Amqui"
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I571c7e7db416d964f3b66ea072fc6b06b6216368
Simon Marchi [Tue, 26 Jan 2021 21:28:12 +0000 (16:28 -0500)]
Fix: macro name for "get supported mip versions method" attribute descriptor
I tried to use BT_PLUGIN_SINK_COMPONENT_CLASS_GET_SUPPORTED_MIP_VERSIONS_METHOD, I got:
In file included from /home/simark/src/babeltrace/include/babeltrace2/babeltrace.h:67,
from /home/simark/src/babeltrace/src/cpp-common/bt2/plugin-dev.hpp:10,
from /home/simark/src/babeltrace/tests/cpp-common/plugin-dev/plugin.cpp:7:
/home/simark/src/babeltrace/include/babeltrace2/plugin/plugin-dev.h:2214:91: error: ‘BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_GET_SUPPORTED_MIP_VERSIONS’ was not declared in this scope; did you mean ‘BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_GET_SUPPORTED_MIP_VERSIONS_METHOD’?
2214 | __BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE(sink_get_supported_mip_versions_method, BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_GET_SUPPORTED_MIP_VERSIONS, _plugin_id, _component_class_id, sink, _method)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/simark/src/babeltrace/include/babeltrace2/plugin/plugin-dev.h:2641:11: note: in definition of macro ‘__BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE’
2641 | .type = _attr_type, \
| ^~~~~~~~~~
/home/simark/src/babeltrace/include/babeltrace2/plugin/plugin-dev.h:2224:2: note: in expansion of macro ‘BT_PLUGIN_SINK_COMPONENT_CLASS_GET_SUPPORTED_MIP_VERSIONS_METHOD_WITH_ID’
2224 | BT_PLUGIN_SINK_COMPONENT_CLASS_GET_SUPPORTED_MIP_VERSIONS_METHOD_WITH_ID(auto, _name, _method)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/simark/src/babeltrace/src/cpp-common/bt2/plugin-dev.hpp:110:5: note: in expansion of macro ‘BT_PLUGIN_SINK_COMPONENT_CLASS_GET_SUPPORTED_MIP_VERSIONS_METHOD’
110 | BT_PLUGIN_SINK_COMPONENT_CLASS_GET_SUPPORTED_MIP_VERSIONS_METHOD( \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/simark/src/babeltrace/tests/cpp-common/plugin-dev/plugin.cpp:19:1: note: in expansion of macro ‘BT_CPP_PLUGIN_SINK_COMPONENT_CLASS_GET_SUPPORTED_MIP_VERSIONS_METHOD’
19 | BT_CPP_PLUGIN_SINK_COMPONENT_CLASS_GET_SUPPORTED_MIP_VERSIONS_METHOD(the_sink, TheSink);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
I think it should be
BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_GET_SUPPORTED_MIP_VERSIONS_METHOD
instead of
BT_PLUGIN_COMPONENT_CLASS_DESCRIPTOR_ATTRIBUTE_TYPE_GET_SUPPORTED_MIP_VERSIONS
Change-Id: I397da2945e3eedcedefe713fbb9a469633c57f7a
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/4750
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Tue, 26 Jan 2021 16:42:30 +0000 (11:42 -0500)]
Fix: configure: support Autoconf 2.70
This patch is stolen and adapted from lttng-tools' patch:
https://git.lttng.org/?p=lttng-tools.git;a=commit;h=
faa88ea855741f5c356d223011ff4b347576c7d2
The newly-released autoconf 2.70 introduces a number of breaking
changes [1] and is being rolled-out by some distros.
Amongst those changes, the AC_PROG_CC_STDC macro is marked as obsolete
and was merged into AC_PROG_CC, which we already use. On 2.70, this
results in a warning which we handle as an error.
A version check is added to invoke the AC_PROG_CC_STDC macro only when
running a pre-2.70 version of autoconf, fixing the issue.
The AC_PROG_LEX now takes an argument, and the argument-less version is
marked as obsolete. The macro is invoked with the `noyywrap` option, as
recommended in the documentation.
Also, the AX_PTHREAD macro makes use of the $as_echo built-in shell
variable which no longer exists in 2.70. A patch was submitted to the
GNU Autoconf archive in March, but there have been no signs of life
given since then [2].
As such, our local copy is updated to the latest version and the patch
(which looks fairly straight-forward / safe) is applied. This should
minimize changes once we go back to an "official" version of the macro.
Some issues with glib2 remain:
configure.ac:264: warning: The macro `AC_TRY_RUN' is obsolete.
configure.ac:264: You should run autoupdate.
./lib/autoconf/general.m4:2996: AC_TRY_RUN is expanded from...
/usr/share/aclocal/glib-2.0.m4:11: AM_PATH_GLIB_2_0 is expanded from...
configure.ac:264: the top level
configure.ac:264: warning: The macro `AC_TRY_LINK' is obsolete.
configure.ac:264: You should run autoupdate.
./lib/autoconf/general.m4:2919: AC_TRY_LINK is expanded from...
/usr/share/aclocal/glib-2.0.m4:11: AM_PATH_GLIB_2_0 is expanded from...
configure.ac:264: the top level
Those have been fixed upstream:
https://gitlab.gnome.org/GNOME/glib/-/commit/
6f26637e83727b05f865389937bb07c761c13c12
so it's always possible to get the modifications from there for local
development.
[1] https://lwn.net/Articles/839395/
[2] https://savannah.gnu.org/patch/?9906
Change-Id: I484b2caed1c7e89e100be76b7853099239397012
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Michael Jeanson [Mon, 19 Oct 2020 16:26:36 +0000 (12:26 -0400)]
port: add 'notext' keyword linker support
Check if the linker support the 'notext' keyword to allow relocations
against read-only segments. GNU ld defaults to notext but LLVM's ld does
not, both linkers support the keyword.
This is required for the plugins section symbols.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I952586447a837ce48711a218a2d03050ef3deb1a
Michael Jeanson [Mon, 19 Oct 2020 17:04:17 +0000 (13:04 -0400)]
port: fix compat/endian.h on FreeBSD
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I2f346213786392fc62ed1a815ccd367f162710ed
Michael Jeanson [Mon, 19 Oct 2020 16:44:32 +0000 (12:44 -0400)]
port: tests: Add sys/wait.h include for FreeBSD
Required for WIFEXITED and WEXITSTATUS.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I2a74762da3ffba58a27fecc3c0d85cc9007bd7c4
Michael Jeanson [Mon, 19 Oct 2020 16:37:53 +0000 (12:37 -0400)]
port: namespace align.h with BT_ prefix
ALIGN is defined in FreeBSD system includes with an incompatible
signature, namespace our internal version.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I2d7e24ebb1756b0e115118fa3f2e6ebc8595fea5
Michael Jeanson [Mon, 19 Oct 2020 16:29:53 +0000 (12:29 -0400)]
port: Add sys/param.h include to compat/limits.h for FreeBSD
Required for MAXHOSTNAMELEN.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I3adf11a260752cd6805802966be4db38f221d3ea
Michael Jeanson [Mon, 19 Oct 2020 16:18:07 +0000 (12:18 -0400)]
port: disable debug-info by default on FreeBSD
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: Iea229bdcb00ae51a83fc7c5570415a5a7d264752
Michael Jeanson [Tue, 26 Jan 2021 20:14:09 +0000 (15:14 -0500)]
Fix: disable deprecation warnings for SWIG generated code
There is nothing we can do about deprecations in SWIG generated code so
silence this warning.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ia3188e6e8fcb52a635d6793f4a40808479860252
Michael Jeanson [Mon, 19 Oct 2020 22:13:35 +0000 (18:13 -0400)]
port: 'ls --ignore=' is a GNU extension
Use grep -v instead to filter README.adoc.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I9b58120ee94dc4caa7b1e69bb4a4807f2af6f98c
Fabrice Fontaine [Sat, 26 Sep 2020 20:03:10 +0000 (22:03 +0200)]
tests/lib/test_trace_ir_ref.c: rename user structure
Rename user structure to bt_user to avoid the following build failure
with uclibc:
test_trace_ir_ref.c:41:8: error: redefinition of 'struct user'
struct user {
^
In file included from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/procfs.h:33,
from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:25,
from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/signal.h:329,
from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib/gbacktrace.h:36,
from /home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0/glib.h:34,
from ../../src/common/assert.h:28,
from ../../src/lib/object.h:28,
from test_trace_ir_ref.c:25:
/home/naourr/work/instance-0/output-1/per-package/babeltrace2/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/user.h:48:8: note: originally defined here
struct user
^~~~
Fixes:
- http://autobuild.buildroot.org/results/
e4229e2b9c892b419a9d2eaa6929b80ea62dd130
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Change-Id: I1a9d912545f781d61d6e3c62b31998285d2a237c
Reviewed-on: https://review.lttng.org/c/babeltrace/+/4522
CI-Build: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
(cherry picked from commit
8009058387e16d70c065f8afb24953ed389c18a6)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/4540
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Wed, 2 Dec 2020 22:36:05 +0000 (17:36 -0500)]
Fix: sink.ctf.fs: fix logic of make_unique_stream_file_name
The logic in make_unique_stream_file_name is wrong. It tries names as
long as the candidate exists _and_ is named "metadata". The intent here
is that we keep trying names as long as the candidate name names an
already existing file _or_ is named "metadata". So the && should be a
||.
The impact of this bug is that if two streams have the same name,
they'll write to the same file, with troubling consequences (see bug
1279 [1]).
Add a test where `sink.ctf.fs` writes a trace with two streams with the
same name, and one stream named "metadata".
[1] https://bugs.lttng.org/issues/1279
Change-Id: Ifaa30459574229aa5e607095f65033d2caae188f
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/4483
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/4492
Simon Marchi [Wed, 2 Dec 2020 21:04:19 +0000 (16:04 -0500)]
Fix: sink.ctf.fs: remove spurious directory level when using assume-single-trace
The behavior of `sink.ctf.fs` with the `assume-single-trace=true`
parameter does not match the documentation nor the comments in the code.
The man page says:
If the assume-single-trace parameter is true, then the output trace
path to use for the single input trace is the directory specified by
the path parameter.
What I understand from this is that if you pass `path=/tmp/yo`, that
should produce the `/tmp/yo/metadata` file and the data files alongside
it.
The documentation on the `fs_sink_comp::assume_single_trace` says:
/*
* True if the component assumes that it will only write a
* single CTF trace (which can contain one or more data
* streams). This makes the component write the stream files
* directly in the output directory (`output_dir_path` above).
*/
bool assume_single_trace;
The `output_dir_path` would contain `/tmp/yo`, in the previous example,
so that confirms the previous assumption.
The actual behavior is that the sink puts the trace in an extra `trace`
directory, in `/tmp/yo/trace`.
We end up with the `trace` relative trace path (relative to the base
output directory) because `make_trace_path_rel` returns an empty string
when `assume_single_trace` is true and `sanitize_trace_path` replaces it
with `trace`.
When using `assume-single-trace=true`, we should not deal with a
relative trace path, as the trace is output directly in the base output
directory. We also don't want to run the path in
`make_unique_trace_path`, as the trace should be output in the base
directory specified by the user, not another directory. Anyway, if the
user specifies an existing directory, `sink.ctf.fs` will initially
error out with:
Single trace mode, but output path exists: output-path="/tmp/yo"
Although that's a TOCTOU bug, two babeltrace instances could both check
at the same time that the same output directory does not exist, and both
write in the same directory. That would not be good.
Change-Id: Ib2415420eabbc096a920d113863993161105e90a
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/4480
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/4491
Philippe Proulx [Thu, 10 Sep 2020 20:47:52 +0000 (16:47 -0400)]
Fix: bt2: _trim_docstring(): docstring can have 0 or 1 line
It is possible that a user component class's docstring has no lines or a
single one, for example:
# no line
class MySink(bt2._UserSinkComponent):
""""""
def _user_consume(self):
pass
# single line
class MySink(bt2._UserSinkComponent):
"""The single line"""
def _user_consume(self):
pass
The previous version of _trim_docstring() expects this format:
class MySink(bt2._UserSinkComponent):
"""
My sink's description
Dolore officia ex et aliquip eiusmod enim pariatur reprehenderit
ad adipisicing non occaecat ullamco aliquip laborum duis
proident ex duis.
Irure commodo proident esse non pariatur in aute cillum id aute.
"""
def _user_consume(self):
pass
In _trim_docstring(), accept no lines or a single one.
Adding new tests to `test_component_class.py` to validate this
behaviour. The
# fmt: off
"""
"""
# fmt: on
docstring has off/on formatting markers as Black 20.8b1 transforms this
into the non-equivalent
""""""
(which is another test now).
In addition, reformat Python files with Black v20.8b1, so that the
pylint CI job passes.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ia12b0e9bfd4d1e1aaa86f0c8c207c3c1535f5c3e
Reviewed-on: https://review.lttng.org/c/babeltrace/+/4072
Reviewed-on: https://review.lttng.org/c/babeltrace/+/4525
CI-Build: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Tue, 21 Jul 2020 17:57:10 +0000 (13:57 -0400)]
Fix: `ctf` plugin: use element FC's alignment as array/seq. FC alignment
Observed issue
==============
When reading some CTF trace with an empty array/sequence field,
Babeltrace 2 can fail.
More specifically, for the trace `tests/data/ctf-traces/succeed/array-align-elem`
(added by this patch):
The CLI's output is:
07-21 14:00:24.636 73959 73959 E PLUGIN/CTF/MSG-ITER request_medium_bytes@msg-iter.c:535 [auto-disc-source-ctf-fs] User function returned EOF, but message iterator is in an unexpected state: state=DSCOPE_EVENT_PAYLOAD_CONTINUE, cur-packet-size=-1, cur=24, packet-cur=24, last-eh-at=16
07-21 14:00:24.636 73959 73959 E PLUGIN/CTF/MSG-ITER read_dscope_continue_state@msg-iter.c:632 [auto-disc-source-ctf-fs] Cannot ensure that buffer has at least one byte: msg-addr=0x55d3b4e051f0, status=ERROR
07-21 14:00:24.636 73959 73959 E PLUGIN/CTF/MSG-ITER ctf_msg_iter_get_next_message@msg-iter.c:2881 [auto-disc-source-ctf-fs] Cannot handle state: msg-it-addr=0x55d3b4e051f0, state=DSCOPE_EVENT_PAYLOAD_CONTINUE
07-21 14:00:24.636 73959 73959 E PLUGIN/SRC.CTF.FS ctf_fs_iterator_next_one@fs.c:90 [auto-disc-source-ctf-fs] Failed to get next message from CTF message iterator.
07-21 14:00:24.636 73959 73959 W LIB/MSG-ITER bt_message_iterator_next@iterator.c:865 Component input port message iterator's "next" method failed: iter-addr=0x55d3b4e05000, iter-upstream-comp-name="auto-disc-source-ctf-fs", iter-upstream-comp-log-level=WARNING, iter-upstream-comp-class-type=SOURCE, iter-upstream-comp-class-name="fs", iter-upstream-comp-class-partial-descr="Read CTF traces from the file sy", iter-upstream-port-type=OUTPUT, iter-upstream-port-name="array-align-elem | 0 | array-align-elem/stream", status=ERROR
07-21 14:00:24.636 73959 73959 E PLUGIN/FLT.UTILS.MUXER muxer_upstream_msg_iter_next@muxer.c:446 [muxer] Upstream iterator's next method returned an error: status=ERROR
07-21 14:00:24.636 73959 73959 E PLUGIN/FLT.UTILS.MUXER validate_muxer_upstream_msg_iters@muxer.c:989 [muxer] Cannot validate muxer's upstream message iterator wrapper: muxer-msg-iter-addr=0x55d3b4dcb830, muxer-upstream-msg-iter-wrap-addr=0x55d3b4e055c0
ev: { a = 1, b = [ ], c = 2 }
07-21 14:00:24.636 73959 73959 E PLUGIN/FLT.UTILS.MUXER muxer_msg_iter_next@muxer.c:1417 [muxer] Cannot get next message: comp-addr=0x55d3b4dcae70, muxer-comp-addr=0x55d3b4dcaef0, muxer-msg-iter-addr=0x55d3b4dcb830, msg-iter-addr=0x55d3b4dcb750, status=ERROR
07-21 14:00:24.636 73959 73959 W LIB/MSG-ITER bt_message_iterator_next@iterator.c:865 Component input port message iterator's "next" method failed: iter-addr=0x55d3b4dcb750, iter-upstream-comp-name="muxer", iter-upstream-comp-log-level=WARNING, iter-upstream-comp-class-type=FILTER, iter-upstream-comp-class-name="muxer", iter-upstream-comp-class-partial-descr="Sort messages from multiple inpu", iter-upstream-port-type=OUTPUT, iter-upstream-port-name="out", status=ERROR
07-21 14:00:24.636 73959 73959 W LIB/GRAPH consume_graph_sink@graph.c:462 Component's "consume" method failed: status=ERROR, comp-addr=0x55d3b4dcb070, comp-name="pretty", comp-log-level=WARNING, comp-class-type=SINK, comp-class-name="pretty", comp-class-partial-descr="Pretty-print messages (`text` fo", comp-class-is-frozen=1, comp-class-so-handle-addr=0x55d3b4dc7c50, comp-class-so-handle-path="/home/eepp/dev/babeltrace/install/lib/babeltrace2/plugins/babeltrace-plugin-text.la", comp-input-port-count=1, comp-output-port-count=0
07-21 14:00:24.636 73959 73959 E CLI cmd_run@babeltrace2.c:2529 Graph failed to complete successfully
ERROR: [Babeltrace CLI] (babeltrace2.c:2529)
Graph failed to complete successfully
CAUSED BY [libbabeltrace2] (graph.c:462)
Component's "consume" method failed: status=ERROR, comp-addr=0x55d3b4dcb070, comp-name="pretty", comp-log-level=WARNING, comp-class-type=SINK,
comp-class-name="pretty", comp-class-partial-descr="Pretty-print messages (`text` fo", comp-class-is-frozen=1, comp-class-so-handle-addr=0x55d3b4dc7c50,
comp-class-so-handle-path="/home/eepp/dev/babeltrace/install/lib/babeltrace2/plugins/babeltrace-plugin-text.la", comp-input-port-count=1,
comp-output-port-count=0
CAUSED BY [libbabeltrace2] (iterator.c:865)
Component input port message iterator's "next" method failed: iter-addr=0x55d3b4dcb750, iter-upstream-comp-name="muxer",
iter-upstream-comp-log-level=WARNING, iter-upstream-comp-class-type=FILTER, iter-upstream-comp-class-name="muxer",
iter-upstream-comp-class-partial-descr="Sort messages from multiple inpu", iter-upstream-port-type=OUTPUT, iter-upstream-port-name="out", status=ERROR
CAUSED BY [muxer: 'filter.utils.muxer'] (muxer.c:1417)
Cannot get next message: comp-addr=0x55d3b4dcae70, muxer-comp-addr=0x55d3b4dcaef0, muxer-msg-iter-addr=0x55d3b4dcb830, msg-iter-addr=0x55d3b4dcb750,
status=ERROR
CAUSED BY [muxer: 'filter.utils.muxer'] (muxer.c:989)
Cannot validate muxer's upstream message iterator wrapper: muxer-msg-iter-addr=0x55d3b4dcb830, muxer-upstream-msg-iter-wrap-addr=0x55d3b4e055c0
CAUSED BY [muxer: 'filter.utils.muxer'] (muxer.c:446)
Upstream iterator's next method returned an error: status=ERROR
CAUSED BY [libbabeltrace2] (iterator.c:865)
Component input port message iterator's "next" method failed: iter-addr=0x55d3b4e05000, iter-upstream-c
Cause
=====
The internal CTF IR array and sequence field classes do not have an
alignment which is equal to their element FC's alignment, although
CTF 1.8.3 requires it [1]:
> Arrays are always aligned on their element alignment requirement.
Solution
========
In `bfcr.c`, align_class_state() is already called for array/sequence
fields.
Add a CTF IR trace class visitor to set any array/sequence FC's
alignment to its element FC's alignment, recursively (postorder).
Also update, postorder, structure FC alignments since some of the
alignments of the field types of their members can change.
Note
====
This patch adds two minimalist CTF traces to test the fix as well as two
new corresponding tests in
`tests/plugins/src.ctf.fs/succeed/test_succeed`:
`array-align-elem`:
Metadata:
struct {
integer { size = 8; } a;
integer { size = 8; align = 16; } b[0];
integer { size = 8; } c;
};
Taking the aligment of `b` into account, there's one byte of padding
between `a` and `c`:
a # c
^---- alignment of `b`
`struct-array-align-elem`:
Metadata:
struct {
integer { size = 8; } x;
struct {
integer { size = 8; } a;
integer { size = 8; align = 32; } b[0];
} y;
integer { size = 8; } z;
};
Taking the alignment of `y.b` into account, the `y` structure itself
is 32-bit-aligned, making the outer structure also 32-bit-aligned.
Therefore, there are three bytes of padding between `x` and `a`, and
three other bytes of padding between `a` and `z`:
x # # # a # # # z
^ ^-------- alignment of `b`
'---------------- alignment of `y`
References
==========
[1]: https://diamon.org/ctf/v1.8.3/#spec4.2.3
Fixes: https://bugs.lttng.org/issues/1276
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I06b4fbeda9ffd5b87b4964dd567027d0bfd5e9c7
Reviewed-on: https://review.lttng.org/c/babeltrace/+/4056
Jérémie Galarneau [Thu, 16 Jul 2020 20:09:53 +0000 (16:09 -0400)]
Fix: source.ctf.lttng-live: muxing failure on clear (unit conversion)
This commit is a follow-up fix for
8ec4d5ff (see original message).
The original fix included a bogus comparison of:
`stream_iter->last_inactivity_ts > curr_msg_ts_ns`
While the idea behind the fix is valid, this statement compares
nanoseconds since Unix Epoch (former) to clock cycles (latter).
A conversion of the `last_inactivity_ts` to nanoseconds since Unix epoch
is performed using the stream's default clock class allowing a
comparison in a common time base to take place.
The diff looks more intimidating than it really is as it shifts the
indentation of a lot of code at once. This is because we only want to
perform the timestamp conversion when necessary (very rarely) on this
fairly hot path.
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ibdc365fec4685da88ae141383d5e5ef0af169a87
Jérémie Galarneau [Wed, 27 May 2020 16:15:54 +0000 (12:15 -0400)]
Fix: src.ctf.lttng-live: incomplete metadata packet is an error
Observed issue
==============
While investigating the issue described in [1], I noticed that
babeltrace2 falls into a retry loop when the src.ctf.lttng-live
component encounters unparseable metadata.
The src.ctf.lttng-live reports parsing errors on every subsequent
reception of a metadata packet. The relay daemon eventually sends
binary data which fails to be decoded, ending the graph's execution
with a binary decoding error, which is not the "real" issue.
Cause
=====
Due to a (now fixed) bug in LTTng [1], unparseable (incomplete)
metadata can be made visible to live clients. This bug fix doesn't
involve the clients; it resulted in an illegal state in the lttng-live
protocol.
When the relay daemon notifies the live client that new metadata is
available, lttng_live_metadata_update() receives all the metadata made
available by the relay daemon in a memory stream and then uses the
ctf_metadata_decoder to append the new content to the existing trace
class.
However, if the decoder returns
`CTF_METADATA_DECODER_STATUS_INCOMPLETE`,
`LTTNG_LIVE_ITERATOR_STATUS_AGAIN` is returned to the caller,
resulting in the graph retrying to invoke the live iterator's `next`
method until another error eventually prevents the successful
completion of the graph.
I am assuming that the use of the `AGAIN` status code may have been a
failed attempt at fixing [1] in the live component rather than
adressing the underlying problem.
Solution
========
To my knowledge there are no provisions made for incomplete metadata
in the lttng-live protocol as of the current version. This may have
been done in anticipation of a future change (?), but it currently
obscures the error reported when a corrupted/incomplete/unparseable
metadata packet is received by the src.ctf.lttng-live component.
The current approach doesn't work anyhow as
lttng_live_metadata_update() creates a "fresh" memory stream on each
invocation. If the intention was to accumulate partial metadata until
it can be successfully parsed, the accumulated metadata would have to
be preserved from one invocation to the next.
The conversion of the status code from `INCOMPLETE` to `AGAIN` is
removed to fail immediately during the current invocation of the
iterator's `next` method.
Drawbacks
=========
None.
References
==========
[1] https://github.com/lttng/lttng-tools/commit/
f5ba75b4f0c0b44092c76bc931b25b24a2e62718
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I8a379ea5d838786a6731199dd5f03bbf70ec13f5
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3586
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Jérémie Galarneau [Thu, 4 Jun 2020 22:32:32 +0000 (18:32 -0400)]
Fix: source.ctf.lttng-live: muxing failure on clear
Observed issue
==============
The lttng-tools port builds regularly fail on the CI with the following
error:
```
05-28 16:13:52.864 11219 11219 E PLUGIN/SRC.CTF.LTTNG-LIVE next_stream_iterator_for_trace@lttng-live.c:1067 [lttng-live] Message's timestamp is less than lttng-live's message iterator's last returned timestamp: lttng-live-msg-iter-addr=0xd810220dd30, ts=
1590696831733594090, last-msg-ts=
1590696832514058899
05-28 16:13:52.864 11219 11219 E PLUGIN/SRC.CTF.LTTNG-LIVE lttng_live_msg_iter_next@lttng-live.c:1502 [lttng-live] Error preparing the next batch of messages: live-iter-status=LTTNG_LIVE_ITERATOR_STATUS_ERROR
05-28 16:13:52.864 11219 11219 W LIB/MSG-ITER bt_message_iterator_next@iterator.c:868 Component input port message iterator's "next" method failed: iter-addr=0xd810221c7c0, iter-upstream-comp-name="lttng-live", iter-upstream-comp-log-level=WARNING, iter-upstream-comp-class-type=SOURCE, iter-upstream-comp-class-name="lttng-live", iter-upstream-comp-class-partial-descr="Connect to an LTTng relay daemon", iter-upstream-port-type=OUTPUT, iter-upstream-port-name="out", status=ERROR
05-28 16:13:52.864 11219 11219 W LIB/GRAPH consume_graph_sink@graph.c:466 Component's "consume" method failed: status=ERROR, comp-addr=0xd81022373a0, comp-name="sink.text.details", comp-log-level=WARNING, comp-class-type=SINK, comp-class-name="details", comp-class-partial-descr="Print messages with details.", comp-class-is-frozen=0, comp-class-so-handle-addr=0xd8102233ca0, comp-class-so-handle-path="/tmp/debug_jgalar/build/usr/lib/babeltrace2/plugins/babeltrace-plugin-text.so", comp-input-port-count=1, comp-output-port-count=0
05-28 16:13:52.865 11219 11219 E CLI cmd_run@babeltrace2.c:2530 Graph failed to complete successfully
ERROR: [Babeltrace CLI] (babeltrace2.c:2530)
Graph failed to complete successfully
CAUSED BY [libbabeltrace2] (graph.c:466)
Component's "consume" method failed: status=ERROR, comp-addr=0xd81022373a0,
comp-name="sink.text.details", comp-log-level=WARNING, comp-class-type=SINK,
comp-class-name="details", comp-class-partial-descr="Print messages with
details.", comp-class-is-frozen=0, comp-class-so-handle-addr=0xd8102233ca0,
comp-class-so-handle-path="/tmp/debug_jgalar/build/usr/lib/babeltrace2/plugins/babeltrace-plugin-text.so",
comp-input-port-count=1, comp-output-port-count=0
CAUSED BY [libbabeltrace2] (iterator.c:868)
Component input port message iterator's "next" method failed:
iter-addr=0xd810221c7c0, iter-upstream-comp-name="lttng-live",
iter-upstream-comp-log-level=WARNING, iter-upstream-comp-class-type=SOURCE,
iter-upstream-comp-class-name="lttng-live",
iter-upstream-comp-class-partial-descr="Connect to an LTTng relay daemon",
iter-upstream-port-type=OUTPUT, iter-upstream-port-name="out", status=ERROR
CAUSED BY [lttng-live: 'source.ctf.lttng-live'] (lttng-live.c:1502)
Error preparing the next batch of messages:
live-iter-status=LTTNG_LIVE_ITERATOR_STATUS_ERROR
CAUSED BY [lttng-live: 'source.ctf.lttng-live'] (lttng-live.c:1067)
Message's timestamp is less than lttng-live's message iterator's last returned
timestamp: lttng-live-msg-iter-addr=0xd810220dd30, ts=
1590696831733594090,
last-msg-ts=
1590696832514058899
```
The test that ends up with this error performs a session `clear`
while tracing an application as part of a "live" session.
Cause
=====
Given the following trace,
| pkt seq:0 |<-------discarded packets------>| pkt seq:8 |
0 20 121 140
a CTF source is expected to introduce a "Discarded Packets" message
between packets 0 and 8. The begin and end timestamps of such a message
are synthesized from the timestamps of the last known packet (seq:0)
and the newly decoded packet (seq:8).
For instance, here the Discarded Packets message would have the bounds
[pkt0.end_ts, pkt8.begin_ts].
In the context of a live source, the tracer could report an inactivity
period during the interval of the "Discarded packets" message.
Those live protocol messages eventually translate into an "Iterator
Inactivity" message with a timestamp set at the end of the inactivity
period.
If the tracer reports an inactivity period that ends at a point
between pkt0 and pkt8 (resulting in an "Iterator Inactivity" message),
the live source will send a "Discarded Packets" message that starts
before the preceding "Iterator Inactivity" message, breaking the
monotonicity constraint of the graph.
This happens regularly when `clear` is used on an LTTng live session as
it effectively discards packets, something that would otherwise not
happen (before LTTng 2.12) as most users set their tracing channels in
"discard" mode (the default for that session type).
However, the same problem as described above applies to "Discarded
Events" messages and could occur with older LTTng versions.
Solution
========
"Discarded Events" and Discarded Packets" messages are intercepted
in the lttng-live source's "muxer" and are _adjusted_ so that
they honor the monotonicity guarantee of the graph.
In effect, whenever such a message is seen to have a begin timestamp
that is _before_ the last inactivity timestamp, its begin timestamp
is adjusted to the last inactivity timestamp's value.
From a correctness standpoint, this is okay. If the tracer notified the
relay daemon of an inactivity period on a stream, we can rely on the
fact that no data was produced during that time to affirm that no
packets where lost during that time either.
A test reproducing the "Discarded Packets" scenatio described in
this message is added in a follow-up patch.
Known drawbacks
===============
None.
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ia8f32ba6717b33203637bf8d5aa34ff2a78c3e7f
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3616
Tested-by: jenkins <jenkins@lttng.org>
Jérémie Galarneau [Mon, 1 Jun 2020 22:53:45 +0000 (18:53 -0400)]
Fix: source.ctf.fs: 0-length packet index length causes SIGFPE
A corrupted index can present a 0-length packet index length
which will result in a division by 0 when computing the index
entry count.
Program terminated with signal SIGFPE, Arithmetic exception.
#0 0x00007f6ecbd44978 in build_index_from_idx_file (ds_file=0x561ade51ca00, file_info=0x561ade51d000,
msg_iter=0x561ade51cd00) at data-stream-file.c:640
640 file_entry_count = (filesize - sizeof(*header)) / file_index_entry_size;
The index packet length is checked against the smallest valid size:
the size of an index entry as of the 1.0 CTF index version.
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I83c705575d55f3b56ae413d1ce5ae0fc60121f2c
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3606
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Jérémie Galarneau [Thu, 23 Apr 2020 15:17:05 +0000 (11:17 -0400)]
Update working version to Babeltrace 2.0.4
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Idfcf7e0dfbe4841c4032b60b11748a8cfb744d0c
Jérémie Galarneau [Thu, 23 Apr 2020 15:16:07 +0000 (11:16 -0400)]
Release: Babeltrace 2.0.3 "Amqui"
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ib443f69b40fbfd04a779b31ecda70e25827d4e97
Simon Marchi [Wed, 22 Apr 2020 21:13:08 +0000 (17:13 -0400)]
Fix: lib: use appropriate format specifier to print message iterator class
Running
babeltrace2 --debug /some/trace
... results in the following crash:
==31705==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000000 (pc 0x7f5b9c25ae22 bp 0x7ffc64114490 sp 0x7ffc64113ba8 T0)
==31705==The signal is caused by a READ memory access.
==31705==Hint: address points to the zero page.
#0 0x7f5b9c25ae21 (/usr/lib/x86_64-linux-gnu/libasan.so.4+0xfce21)
#1 0x7f5b9c1d231f (/usr/lib/x86_64-linux-gnu/libasan.so.4+0x7431f)
#2 0x7f5b9c1fef4d in __interceptor_vsnprintf (/usr/lib/x86_64-linux-gnu/libasan.so.4+0xa0f4d)
#3 0x7f5b9c1ff286 in snprintf (/usr/lib/x86_64-linux-gnu/libasan.so.4+0xa1286)
#4 0x7f5b9bdf61c3 in format_component_class /home/smarchi/src/babeltrace/src/lib/lib-logging.c:1061
#5 0x7f5b9bdfad46 in handle_conversion_specifier_bt /home/smarchi/src/babeltrace/src/lib/lib-logging.c:1451
#6 0x7f5b9bead260 in bt_common_custom_vsnprintf /home/smarchi/src/babeltrace/src/common/common.c:1727
#7 0x7f5b9bdfb10b in bt_lib_log /home/smarchi/src/babeltrace/src/lib/lib-logging.c:1496
#8 0x7f5b9be32965 in bt_message_iterator_class_set_seek_beginning_methods /home/smarchi/src/babeltrace/src/lib/graph/message-iterator-class.c:138
...
This is due to an object being printed with the wrong format specifier.
`C` is for component class objects, use `I` instead, since we are
printing a message iterator object.
Change-Id: Ie3985d8b7c4e02ac7d09aee84bfe46ea4bab87e9
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3367
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Tue, 14 Apr 2020 15:22:17 +0000 (11:22 -0400)]
Fix: sink.text.pretty: check that port is connected before creating message iterator
sink.text.pretty does not check if its input port is connected before
trying to create a message iterator on it. This can lead to a
precondition assertion failure. It can be reproduced with this Python
snippet.
import bt2
g = bt2.Graph()
g.add_component(bt2.find_plugin('text').sink_component_classes['pretty'], 'snk')
g.run()
The assertion failure we get is:
04-14 11:35:27.339
1231815 1231815 F LIB/MSG-ITER create_self_component_input_port_message_iterator@iterator.c:295 Babeltrace 2 library precondition not satisfied; error is:
04-14 11:35:27.339
1231815 1231815 F LIB/MSG-ITER create_self_component_input_port_message_iterator@iterator.c:295 Input port is not connected: port-addr=0x607000001d70, port-type=INPUT, port-name="in"
04-14 11:35:27.339
1231815 1231815 F LIB/MSG-ITER create_self_component_input_port_message_iterator@iterator.c:295 Aborting...
./tests/utils/../utils/utils.sh: line 283:
1231815 Aborted (core dumped) env "${env_args[@]}" "$@"
Add a check and return an error if that happens instead. A
corresponding test is also added.
Change-Id: Ibeed94cd6ece543817fe8a765a69cb52bbaaba76
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3403
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3411
Simon Marchi [Thu, 26 Mar 2020 20:33:13 +0000 (16:33 -0400)]
Add initial Python bindings documentation
This initial documentation contains a home page, an installation page,
and a few examples to understand how the `bt2` package works.
Still missing: how exactly the bindings wrap libbabeltrace2 (wraping
rules, exceptions, etc.).
Changes:
`README.adoc`:
Specify that you need Sphinx to build the Python bindings
documentation.
`configure.ac` and `m4/check_sphinx.m4`:
Add `--enable-python-bindings-doc` which requires
`--enable-python-bindings`.
This is because the Sphinx configuration file actually imports the
`bt2` package to get the version (and, eventually, for Sphinx's
autodoc to find docstrings within the `bt2` modules).
`doc/bindings/python/source`:
The actual documentation's contents and configuration.
`doc/bindings/python/ext/bt2sphinxurl.py`:
A Sphinx extension to add Babeltrace 2 manual page and other links
of which the URL includes the project's version.
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3278
Backported from
ba64dfcccb1f1bd7a259dc5d563ba422b8375582
Modifications:
configure.ac:
PPRINT_PROP_BOOL_CUSTOM -> PPRINT_PROP_BOOL
examples.rst:
Removed example usage for `in`:
if 'next_comm' in event:
This utility was introduced by
f03b6364aec2d77bbb5ef0625cbaea8de4179f63, not backported,
and only provides a shortcut to iterate over all `root` fields.
User can implement their own as needed.
Updated referenced version of lttng from 2.11 to "latest" for
lttng-live url.
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Change-Id: Id0f4636a5f66e98d383548bdcb894f53d31812b4
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3408
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Sat, 11 Apr 2020 16:17:36 +0000 (12:17 -0400)]
Fix: bt2: read properties on _DiscardedEventsMessage
Reading the count and clock snapshot properties on a _DiscardedEventsMessage
does not work. For example, this:
msg = self._create_discarded_events_message(stream, count=10)
print(msg.count)
Results in:
File "test.py", line 10, in __init__
print(msg.count)
File "/home/simark/build/babeltrace/src/bindings/python/bt2/build/build_lib/bt2/message.py", line 208, in count
avail, count = self._get_count(self._ptr)
AttributeError: '_DiscardedEventsMessage' object has no attribute '_get_count'
The problem is simply that _DiscardedEventsMessage is missing inheriting
from _DiscardedEventsMessageConst.
Change-Id: Id40ea54bb26b4e4aec264d84bda52ed815090341
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3392
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3365
Simon Marchi [Fri, 10 Apr 2020 20:05:25 +0000 (16:05 -0400)]
tests: add tests for discarded events/packets creation
Creation of these messages is a bit tested in AllMessagesTestCase, but
not everything, especially not the error cases.
To avoid code duplication as much as possible, I've added a
`run_in_message_iterator_next` helper, similar to the existing
`run_in_component_init`. This helper takes a callback to run in the
context of a source component's message iterator's __next__method.
Individual tests also need to customize the stream class creation, to
decide if the stream class supports discarded event/packet messages,
clock snapshots on those messages, etc. So it also receives a callback
executed in the source component's __init__ method, which must return a
stream class. This callback takes a trace class as a parameter, which
it will need to create the stream class, and a clock class. It is free
to use the clock class as the stream class' default_clock_class or not.
Doing this, I noticed that reading the count and clock snapshot
properties on a _DiscardedEventsMessage didn't work. This will be fixed
in a subsequent patch, in the mean time the corresponding assertions are
commented out.
Change-Id: I5025d06e6cb5b9d1bbd4372818b391cbc7b5bfa2
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3391
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3402
Simon Marchi [Fri, 10 Apr 2020 20:31:32 +0000 (16:31 -0400)]
Fix: bt2: add precond. check, for stream class supporting discarded msgs with clock snapshot without clock class
We hit the following precondition failure from the Python bindings when
creating a stream class that supports discarded event messages with
clock snapshots, but does not have a default clock class. Same with
discarded packet messages.
04-10 16:40:32.280 59345 59345 F LIB/STREAM-CLASS bt_stream_class_set_supports_discarded_events@stream-class.c:480 Babeltrace 2 library precondition not satisfied; error is:
04-10 16:40:32.280 59345 59345 F LIB/STREAM-CLASS bt_stream_class_set_supports_discarded_events@stream-class.c:480 Stream class has no default clock class: addr=0x60f0000023e0, id=0, is-frozen=0, event-class-count=0, packet-context-fc-addr=(nil), event-common-context-fc-addr=(nil), assigns-auto-ec-id=1, assigns-auto-stream-id=1, supports-packets=0, packets-have-begin-default-cs=0, packets-have-end-default-cs=0, supports-discarded-events=0, discarded-events-have-default-cs=0, supports-discarded-packets=0, discarded-packets-have-default-cs=0, trace-class-addr=0x608000002b20, pcf-pool-size=0, pcf-pool-cap=0
04-10 16:40:32.280 59345 59345 F LIB/STREAM-CLASS bt_stream_class_set_supports_discarded_events@stream-class.c:480 Aborting...
Add some checks for that in _StreamClass._validate_create_params, and
some corresponding tests.
Change-Id: I5d79b8ecfc05acbb79b7b15d28ba2c5c34f00729
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3390
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
(cherry picked from commit
aa7407227594c8e5ebff8e1944a902760f2c9a17)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3364
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Sat, 11 Apr 2020 16:52:45 +0000 (12:52 -0400)]
Fix: flt-utils.muxer: reference leak in muxer_msg_iter_add_upstream_msg_iter error path
Let's say we fail to allocate `muxer_upstream_msg_iter->msgs`, we will have
already gotten a reference on `self_msg_iter`, which we need to put. Calling
destroy_muxer_upstream_msg_iter ensures we do that.
Change-Id: I9b113d2e335d529599cb9197c39c8675915508e5
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3393
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
(cherry picked from commit
6adf99d540b2d239fc49bb64934becf410812c39)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3363
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Thu, 9 Apr 2020 17:55:05 +0000 (13:55 -0400)]
Fix: sink.text.details: goto error when failing to add input port
If bt_self_component_sink_add_input_port fails, the current code does
not goto error. This patch fixes it. It also changes the switch, used
to convert from `add_port_status` to `status`, to a cast, as is the
practice throughout the project.
Change-Id: I82b2719316ad00ffd9d9c14b86b8890b98130669
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3383
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
(cherry picked from commit
c7f21c12d5cec35f3e48630cf603207748409847)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3362
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Thu, 9 Apr 2020 18:27:39 +0000 (14:27 -0400)]
Fix: src.text.dmesg: add missing assignment of `status` on error path
The error path under `if (!*msg)`, originally at line 789, is missing
assigning an error status to the `status` variable, fix it.
Change-Id: I2b47c6ce7c6099a6db68c4da108d7c0886c7177e
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3384
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
(cherry picked from commit
c16fb81a23dcfa6ab8331efe1c98a86e4444040d)
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3361
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Wed, 8 Apr 2020 17:05:55 +0000 (13:05 -0400)]
Revert "bt2: _EventConst.__getitem__(): use a single temporary variable"
I did not want to merge this and pressed the wrong button on Gerrit.
Sorry.
Change-Id: I11cc739c126131560ba31d2a1f3f01b7e961a837
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3354
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Mingli Yu [Thu, 12 Mar 2020 03:42:07 +0000 (11:42 +0800)]
Fix: src.ctf.fs: initialize the other_entry variable
Initialize the pointer other_entry to silence this warning:
| ../../../../../git/src/plugins/ctf/fs-src/fs.c: In function 'ds_index_insert_ds_index_entry_sorted':
| ../../../../../git/src/plugins/ctf/fs-src/fs.c:702:5: error: 'other_entry' may be used uninitialized in this function [-Werror=maybe-uninitialized]
| 702 | !ds_index_entries_equal(entry, other_entry)) {
This was encountered with gcc 9.2.0 at the -Og optimization level.
After inspection, it appears that this is a false positive, the
`other_entry` pointer can only be used after being initialized first.
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Change-Id: Icf63e605cf543c3eb29e5aadec18b22b137ee9da
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3360
CI-Build: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Philippe Proulx [Tue, 7 Apr 2020 13:47:50 +0000 (09:47 -0400)]
bt2: _EventConst.__getitem__(): use a single temporary variable
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I241565ca7414952cd667d2912235231ef15ad314
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3351
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Tue, 7 Apr 2020 13:41:55 +0000 (09:41 -0400)]
Fix: _EventConst.__getitem__(): check if event has a packet
I'm also adding a test to check this. Without this patch and an invalid
key, __getitem__() throws `AttributeError` instead of the expected
`KeyError`.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ie6258a2354ece8aee6c8530587c900ea08e45fe8
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3350
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Thu, 12 Mar 2020 17:33:09 +0000 (13:33 -0400)]
doc: bt_field_class...get_mapping_labels...(): clarify RV's validity
The label array which
bt_field_class_enumeration_unsigned_get_mapping_labels_for_value() and
bt_field_class_enumeration_signed_get_mapping_labels_for_value() return
remains valid as long as:
* The enumeration field class is not modified.
* You don't call the same function again with the same enumeration
field class.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I7b197ab5e176c77f4418d23b12e194c6477e5cf8
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3226
Philippe Proulx [Thu, 12 Mar 2020 17:24:00 +0000 (13:24 -0400)]
doc/api/libbabeltrace2/style.css: make font weight of `.intertd` normal
For some reason, `.intertd` paragraphs, which Doxygen creates when a
given table cell (used for parameter descriptions, amongst other things)
contains more than one paragraphs, are bold.
Here's an example to generate such paragraphs:
@param some_param
@parblock
Normal paragraph.
Bold paragraph.
Also bold.
@endparblock
I don't know the bold font weight's rationale here, but it does not look
pretty, so force the weight to be normal in `style.css`.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ida6970a75f6cc1b4ac4f1fc873e86a3b453d09ac
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3225
Jérémie Galarneau [Tue, 10 Mar 2020 20:34:58 +0000 (16:34 -0400)]
Update working version to Babeltrace 2.0.3
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I0b996d8b2bda69efad869ba3d5f0c5cf7ab6ac24
Jérémie Galarneau [Tue, 10 Mar 2020 20:33:22 +0000 (16:33 -0400)]
Release: Babeltrace 2.0.2 "Amqui"
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Ib5db5b0ff56e7a919a2d5c5f3133d1fa38836807
Simon Marchi [Fri, 6 Mar 2020 20:05:57 +0000 (15:05 -0500)]
common: cast arguments to character classification functions to unsigned char
We get failures of this type on the cygwin CI machine:
15:28:20 common.c: In function `bt_common_string_is_printable`:
15:28:20 common.c:786:16: error: array subscript has type `char` [-Werror=char-subscripts]
15:28:20 786 | if (!isprint(*ch) && *ch != '\n' && *ch != '\r' &&
15:28:20 | ^~~
This error only pops up on some platforms that have isprint implemented
using a lookup table. This table is indexed using `*ch`, which is a
char. And because char is signed on some platforms, gcc warns that this
is dangerous: we could access the array with a negative index, which
would yield unexpected results.
This is on purpose in newlib (the libc used by cygwin, apparently), see
this comment:
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;a=blob;f=newlib/libc/include/ctype.h;h=
a0009af17485acc3d70586a0051269a7a9c350d5;hb=HEAD#l78
The Linux man page for isprint also mentions it:
The standards require that the argument c for these functions is
either EOF or a value that is representable in the type unsigned
char. If the argument c is of type char, it must be cast to unsigned
char, as in the following example:
char c;
...
res = toupper((unsigned char) c);
This is necessary because char may be the equivalent of signed char,
in which case a byte where the top bit is set would be sign extended
when converting to int, yielding a value that is outside the range of
unsigned char.
Add casts to unsigned char to fix the various instances of this error.
Change-Id: Ice2305490997f595c6f5140a8be2abaa7fd1d8f6
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3194
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
CI-Build: Michael Jeanson <mjeanson@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
(cherry picked from commit
994cd345db7a82957ce647c2dac28cae11382dcc)
Simon Marchi [Tue, 10 Mar 2020 16:09:20 +0000 (12:09 -0400)]
flt.utils.muxer: initialize variable to silence -Wmaybe-uninitialized warning
gcc 4.8 shows this warning:
CC muxer.lo
In file included from /home/smarchi/src/babeltrace/src/plugins/utils/muxer/muxer.c:26:0:
/home/smarchi/src/babeltrace/src/plugins/utils/muxer/muxer.c: In function ‘muxer_msg_iter_next’:
/home/smarchi/src/babeltrace/src/logging/comp-logging.h:145:3: error: ‘next_return_ts’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
(void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_COMPONENT( \
^
/home/smarchi/src/babeltrace/src/plugins/utils/muxer/muxer.c:1042:10: note: ‘next_return_ts’ was declared here
int64_t next_return_ts;
^
I looked at the interaction between muxer_msg_iter_do_next_one and
muxer_msg_iter_youngest_upstream_msg_iter (which is the one that sets
next_return_ts), and I think the code is fine:
* muxer_msg_iter_youngest_upstream_msg_iter returns either OK, END, or
an error status code (< 0). It does not return AGAIN, because it
does not call the upstream iterators, it works with the data already
available to the muxer component.
* muxer_msg_iter_do_next_one, only uses next_return_ts when
muxer_msg_iter_youngest_upstream_msg_iter returns OK.
* When muxer_msg_iter_youngest_upstream_msg_iter returns OK, it always sets
*ts_ns.
I think that initializing the variable to suppress this warning doesn't
hurt, and I don't see any other modifications needed to the code.
Change-Id: If4e8f1fd381a6ec2da044cf4cb8ffc8de2b373d9
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3210
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
(cherry picked from commit
18961057774c796ea8522db964bc6f03e07a2027)
Francis Deslauriers [Thu, 27 Feb 2020 22:08:28 +0000 (17:08 -0500)]
Fix: configure.ac: silently accepting invalid Python configuration
Currently, if the user builds and installs the project with:
./configure --enable-python-plugins
make
make install
They won't be able to do the `import bt2` necessary to start defining
their BT2 plugin. To write a Python plugin , the user needs to use the
Python bindings as well.
The user gets this:
>>> import bt2
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
ModuleNotFoundError: No module named 'bt2'
As suggested by Simon Marchi, I implemented the following truth table
for the Python-related configure options (--enable-python-bindings and
--enable-python-plugins):
plugins | bindings
--------+---------
missing | missing -> both disabled
missing | enable -> plugins disabled, bindings enabled
missing | disable -> both disabled
enable | missing -> both enabled
enable | enable -> both enabled
enable | disable -> error
disable | missing -> both disabled
disable | enable -> plugins disabled, bindings enabled
disable | disable -> both disabled
This makes sure the user doesn't get into an invalid configuration _and_
offers the sane default of enabling the bindings (if they were omitted)
when plugins are enabled explicitly.
Fixes #1240
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I3b94d8911568290239add616f8e794ad73e278db
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3152
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
Francis Deslauriers [Thu, 27 Feb 2020 21:51:38 +0000 (16:51 -0500)]
Cleanup: configure.ac: remove redundant `AC_ARG_ENABLE` parameters
According to the documentation [1], the last parameter of the
`AC_ARG_ENABLE()` macro (`action-if-not-given`) is executed only if
neither `--enable-foo` nor `--disable-foo` is provided.
So in cases where the feature is disabled by default, there is no need
to turn if off explicitly in the `action-if-not-given` parameter as
the macro will simply not set the `enable_foo` to `yes`.
Also, I fixed up the comment for the `enable_man_pages` variable.
[1] https://www.gnu.org/software/autoconf/manual/autoconf-2.66/html_node/Package-Options.html
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I7416bed88ed1e719ef896f0ca0117b382d99f68f
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3151
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
Mathieu Desnoyers [Mon, 17 Feb 2020 23:33:12 +0000 (18:33 -0500)]
Fix: plugin-dev.h: Disable address sanitizer on pointer array section variables
The plugin header declares pointer global variables in plugins meant to
be placed contiguously within their own sections, and then used as an
array of pointers when loading the plugin.
Clang Address Sanitizer adds redzones around each variable, thus leading
to detection of a global buffer overflow.
Those redzones should not be placed within this section, because it
defeats its purpose. Therefore, teach asan not to add redzones
around those variables with an attribute.
Note that there does not appear to be any issue with gcc (tested with
gcc-8 with address sanitization enabled), and gcc ignores the
no_sanitize_address attribute when applied to a global variable.
Fixes: #1231
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I5488d61a7d714e6525a3a623d303c5fd30b76bc2
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3102
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Simon Marchi [Tue, 25 Feb 2020 21:02:57 +0000 (16:02 -0500)]
Fix: cli: use BT_CLI_LOGE_APPEND_CAUSE instead of printf to print errors
While fixing up the test cli/convert/test_convert_args, I noticed that
some error messages were printed on stdout, and not using error causes.
Indeed, they are printed directly using printf.
Change them to use BT_CLI_LOGE_APPEND_CAUSE.
This is tested by a following patch which updates
cli/convert/test_convert_args.
Change-Id: I18a901d50b643293dd806c1fbe7d2372dc8bd46f
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3146
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Mon, 17 Feb 2020 22:30:59 +0000 (17:30 -0500)]
tests: improve flt.utils.trimmer/test_trimming to test streams without packets
Augment the test to make it test streams without packet support. A new
parameter 'with-packet-msgs' must be passed to the test source component to
control whether it will emit packet messages.
There are now two configuration axis in this test (with and without
stream message clock snapshots, with and without packet messages), which
gives 4 configurations. I think it's still manageable to have them all
written explicitly. However, if we are to add a third configuration
axis, I think we'll need to refactor the test to avoid having all the
expected outputs written explicitly, as it will become too big to be
manageable.
Change-Id: I0b488aa3f1506e9d43f320c1643a65db5317d63c
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3106
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Tue, 18 Feb 2020 17:04:51 +0000 (12:04 -0500)]
Fix: flt-utils.trimmer: accept streams without packet support
When the trimmer notices a new stream, it checks various properties to
make sure it is able to handle it. If the stream's packet messages
don't have default clock snapshots, it returns an error, because that it
not supported right now.
However, this also has the unwanted effect of rejecting streams which
don't support packets. Indeed, the
bt_stream_class_packets_have_beginning_default_clock_snapshot and
bt_stream_class_packets_have_end_default_clock_snapshot functions return
false in this case.
Streams without packet support are supported by the trimmer, there is
not reason to reject them. Fix that by checking if the stream supports
packets before checking if the packet messages have default clock
snapshots.
This is covered by a test that is added by an following patch in this
series.
Change-Id: If4732e89680d8dc8f02cb9be56d3a0d39fed6afe
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3105
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Mon, 17 Feb 2020 21:58:00 +0000 (16:58 -0500)]
Fix: lib: don't assume that streams have packets in auto seek
We get a segmentation fault when trying to instantiate a trimmer
downstream of a component that creates streams without packets. The
reason is that the line changed by this patch assumes that events are
always within packets. However, it is possible (since
26fc5aedf "lib: make packets and packet messages optional, disabled by
default") for stream to not use packets. In that situation, the
`packet` field of `event_msg->event` will be NULL.
Fix it by using `event_msg->event->stream`, which is expected to be the
same thing as `event_msg->event->packet->stream`, in the case where the
stream uses packets.
A test exercising this is added by a following patch in this series.
The stack at the point of the crash is the following:
#0 0x7f2235db23ab in auto_seek_handle_message /home/smarchi/src/babeltrace/src/lib/graph/iterator.c:1419
#1 0x7f2235db330a in find_message_ge_ns_from_origin /home/smarchi/src/babeltrace/src/lib/graph/iterator.c:1567
#2 0x7f2235db4b1a in bt_message_iterator_seek_ns_from_origin /home/smarchi/src/babeltrace/src/lib/graph/iterator.c:1790
#3 0x7f2230abf6a4 in state_seek_initially /home/smarchi/src/babeltrace/src/plugins/utils/trimmer/trimmer.c:1095
#4 0x7f2230ac2f3b in trimmer_msg_iter_next /home/smarchi/src/babeltrace/src/plugins/utils/trimmer/trimmer.c:1920
#5 0x7f2235dae530 in call_iterator_next_method /home/smarchi/src/babeltrace/src/lib/graph/iterator.c:808
#6 0x7f2235daefc6 in bt_message_iterator_next /home/smarchi/src/babeltrace/src/lib/graph/iterator.c:855
#7 0x7f2230d1b458 in details_consume /home/smarchi/src/babeltrace/src/plugins/text/details/details.c:476
#8 0x7f2235da3d61 in consume_graph_sink /home/smarchi/src/babeltrace/src/lib/graph/graph.c:456
#9 0x7f2235da40e0 in consume_sink_node /home/smarchi/src/babeltrace/src/lib/graph/graph.c:498
#10 0x7f2235da4875 in consume_no_check /home/smarchi/src/babeltrace/src/lib/graph/graph.c:572
#11 0x7f2235da510b in bt_graph_run /home/smarchi/src/babeltrace/src/lib/graph/graph.c:636
#12 0x563a71c8127a in cmd_run /home/smarchi/src/babeltrace/src/cli/babeltrace2.c:2503
#13 0x563a71c8218a in main /home/smarchi/src/babeltrace/src/cli/babeltrace2.c:2691
#14 0x7f22351f2b96 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b96)
#15 0x563a71c73709 in _start (/home/smarchi/build/babeltrace/src/cli/.libs/babeltrace2+0x1f709)
Change-Id: Ic7ed3927d5ad1ca04833248a97723f0d8c4e4907
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/3104
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Antoine Busque [Sat, 26 Oct 2019 01:56:25 +0000 (21:56 -0400)]
Fix: correct typo in README
Signed-off-by: Antoine Busque <antoinebusque@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Jérémie Galarneau [Tue, 4 Feb 2020 19:28:54 +0000 (14:28 -0500)]
Update working version to Babeltrace 2.0.2
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I9cc5540a7bc2077d619c00881af680f7e23e21f7
Jérémie Galarneau [Tue, 4 Feb 2020 19:28:13 +0000 (14:28 -0500)]
Release: Babeltrace 2.0.1 "Amqui"
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I6e44bf5f274dd25b49ad8dc5a9f40f1cd1a0dbd2
Michael Jeanson [Mon, 3 Feb 2020 17:05:55 +0000 (12:05 -0500)]
fix: Remove empty python bindings documentation
The python bindings documentation doesn't exist yet but the build system
contains remnants of the bt1 doc. Moreover, it contains a Sphinx theme
without any copyright or licensing information which makes our distro
friends a bit nervous.
Remove everything for now, it can be re-introduced when the doc is
actually written.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I11b23822c8bf98c54a88c7e856d606d01102797f
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2941
Reviewed-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Jérémie Galarneau [Fri, 24 Jan 2020 19:12:36 +0000 (14:12 -0500)]
README: Babeltrace 2 was released in 2020
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I98b628edf257982fe42143f109a9d785424f7252
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2867
Michael Jeanson [Thu, 23 Jan 2020 19:35:00 +0000 (14:35 -0500)]
fix: set autoconf package name to babeltrace2
This will help to make sure we are co-installable with babeltrace 1 by
moving the documentation directory to '/usr/share/doc/babeltrace2'.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: Ia55d2049967016fc5a00594c928e0f2c4f0e477d
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2858
Reviewed-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Michael Jeanson [Thu, 23 Jan 2020 21:37:37 +0000 (16:37 -0500)]
Typo: occured -> occurred
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I57d85deda90603e5c2824b8e0d4d07c71ca291db
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2859
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Michael Jeanson [Thu, 30 Jan 2020 18:35:08 +0000 (13:35 -0500)]
.gitignore: Add missing bt2/native_bt.d
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: Ia0619ac791fb06f3fbbb414a75fcd145eb9f9d70
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2901
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Michael Jeanson [Thu, 30 Jan 2020 16:11:52 +0000 (11:11 -0500)]
fix: build failure on ppc64el with '-Werror=format-overflow='
Enabling optimizations makes gcc inline bt_plugin_so_shared_lib_handle_create
into bt_plugin_so_create_all_from_static. That call site passes path == NULL,
so gcc notices that the argument to %s will always be NULL. This is
undefined behavior even if glibc will print "(null)".
Passing NULL to this function just means that we are loading the static
plugins, built-in Babeltrace. So there's no path to a shared object file,
in this case explicitly print "(null)".
In file included from ../../../src/lib/logging.h:35,
from plugin-so.c:27:
In function ‘bt_plugin_so_shared_lib_handle_create’,
inlined from ‘bt_plugin_so_create_all_from_static’ at plugin-so.c:1393:11:
../../../src/logging/log.h:811:6: error: ‘%s’ directive argument is null [-Werror=format-overflow=]
811 | _bt_log_write_d(_BT_LOG_SRCLOC_FUNCTION, __FILE__, __LINE__, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
812 | lvl, tag, __VA_ARGS__); \
| ~~~~~~~~~~~~~~~~~~~~~~
../../../src/logging/log.h:897:4: note: in expansion of macro ‘BT_LOG_WRITE’
897 | BT_LOG_WRITE(BT_LOG_INFO, _BT_LOG_TAG, __VA_ARGS__)
| ^~~~~~~~~~~~
plugin-so.c:174:2: note: in expansion of macro ‘BT_LOGI’
174 | BT_LOGI("Creating shared library handle: path=\"%s\"", path);
| ^~~~~~~
plugin-so.c: In function ‘bt_plugin_so_create_all_from_static’:
plugin-so.c:174:50: note: format string is defined here
174 | BT_LOGI("Creating shared library handle: path=\"%s\"", path);
| ^~
In file included from ../../../src/lib/logging.h:35,
from plugin-so.c:27:
In function ‘bt_plugin_so_shared_lib_handle_create’,
inlined from ‘bt_plugin_so_create_all_from_static’ at plugin-so.c:1393:11:
../../../src/logging/log.h:811:6: error: ‘%s’ directive argument is null [-Werror=format-overflow=]
811 | _bt_log_write_d(_BT_LOG_SRCLOC_FUNCTION, __FILE__, __LINE__, \
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
812 | lvl, tag, __VA_ARGS__); \
| ~~~~~~~~~~~~~~~~~~~~~~
../../../src/logging/log.h:897:4: note: in expansion of macro ‘BT_LOG_WRITE’
897 | BT_LOG_WRITE(BT_LOG_INFO, _BT_LOG_TAG, __VA_ARGS__)
| ^~~~~~~~~~~~
plugin-so.c:217:3: note: in expansion of macro ‘BT_LOGI’
217 | BT_LOGI("Created shared library handle: path=\"%s\", addr=%p",
| ^~~~~~~
plugin-so.c: In function ‘bt_plugin_so_create_all_from_static’:
plugin-so.c:217:50: note: format string is defined here
217 | BT_LOGI("Created shared library handle: path=\"%s\", addr=%p",
| ^~
cc1: all warnings being treated as errors
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: Ia727b37b04cb10f29e705f21c6889035a304a822
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2894
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Thu, 30 Jan 2020 16:52:10 +0000 (11:52 -0500)]
Silence -Wnull-dereference warning in generated CTF parser code
Building Babeltrace on amd64 with -O3 on Ubuntnu 18.04 (gcc
7.4.0-1ubuntu1~18.04.1), I see:
make[1]: Entering directory '/home/smarchi/build/babeltrace-opt/src/plugins/ctf/common/metadata'
CC libctf_parser_la-lexer.lo
/home/smarchi/src/babeltrace/src/plugins/ctf/common/metadata/lexer.c: In function ‘yyrestart’:
/home/smarchi/src/babeltrace/src/plugins/ctf/common/metadata/lexer.c:1997:20: error: potential null pointer dereference [-Werror=null-dereference]
b->yy_fill_buffer = 1;
~~~~~~~~~~~~~~~~~~^~~
This is code generated by flex, there's not much we can do, so silence
the warning for the helper library that contains the lexer/parser.
Change-Id: I6698a73f50e88cb75b94ca80deec0f3a9556c4bf
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2895
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Philippe Proulx [Mon, 3 Feb 2020 17:07:28 +0000 (12:07 -0500)]
plugin-so.c: add comment about why we're not using a GLib linked list
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I2e05156289d0d66a0a6ed9610d9d88a827a0b357
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2940
Philippe Proulx [Mon, 27 Jan 2020 17:50:59 +0000 (12:50 -0500)]
doc: graph.h: do not link to `man7.org` for `babeltrace(1)`
This website uses the project's upstream repository to find its manual
pages:
> This page was obtained from the project's upstream Git repository
> ⟨git://git.efficios.com/babeltrace.git⟩ on 2019-05-09.
At that date, the Babeltrace 2 CLI's name was still `babeltrace`, so
<http://man7.org/linux/man-pages/man1/babeltrace.1.html> is actually an
old Babeltrace 2 CLI manual page.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I2a449dd3afee25dfb87993ee0d653f717b109c99
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2871
Michael Jeanson [Thu, 23 Jan 2020 16:38:25 +0000 (11:38 -0500)]
fix: common/list.h is LGPL-2.1
Add 'lgpl-2.1.txt' to the distribution tarball and correct the path to
list.h in LICENSE.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I7b3612b47da52170fc5fc2da3d38115152adcdbd
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2853
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Michael Jeanson [Thu, 23 Jan 2020 16:00:08 +0000 (11:00 -0500)]
fix: build Python bindings with GCC10
Disable -Wnull-dereference for native_bt.c
bt2/native_bt.c: In function ‘SWIG_Python_NewPointerObj.constprop’:
bt2/native_bt.c:2207:13: error: potential null pointer dereference [-Werror=null-dereference]
2207 | PyObject *newraw = data->newraw;
| ^~~~~~
Change-Id: I05db1c48304b1fbc715d273425e16d7605405b27
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2852
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Michael Jeanson [Thu, 23 Jan 2020 15:47:34 +0000 (10:47 -0500)]
fix: use correct function to print 'enum bt_ctf_scope'
Building with GCC10 results in the following error:
implicit conversion from 'enum bt_ctf_scope' to 'enum bt_field_path_scope' [-Werror=enum-conversion]
Change-Id: Id1144231f8439444696e4683dff2b0abf0d26d60
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2851
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Jérémie Galarneau [Fri, 24 Jan 2020 18:31:24 +0000 (13:31 -0500)]
Update working version to Babeltrace 2.0.1
This is not the _release_ commit of Babeltrace 2.0.1; it merely
updates the current working version to 2.0.1.
Since this commit is not tagged, the `git describe`
output (e.g.
v2.0.0-1-g7adcb97be) will be included as part of the
library's "development stage" version field.
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Iad8006929c97d72ebfed7cd683bcaa85c59f9c56
Jérémie Galarneau [Tue, 21 Jan 2020 22:02:59 +0000 (17:02 -0500)]
Release: Babeltrace 2.0.0 "Amqui"
Released at long last!
Adds the name and description of the release.
The ChangeLog is reset as we are starting a new release series afresh.
The ChangeLog of this release describes the changes that were
introduced between the fourth release candidate (rc4) and this
final version of Babeltrace v2.0.0.
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: Id57d79cd0efba4aa0f8c699abe1def190dd841d7
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2844
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
Philippe Proulx [Tue, 21 Jan 2020 16:38:06 +0000 (11:38 -0500)]
cli: colorize version printing
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I76388372a3b2f11ebb2ee76020f3d224f376f604
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2840
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Tue, 21 Jan 2020 15:52:12 +0000 (10:52 -0500)]
cli: print full version name
Include the release's name and name description, the Git revision
description, and extra information.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I478da57eb24b6a8d0f9c7a0b7b1fb8a41d8e4867
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2839
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Tue, 21 Jan 2020 15:28:07 +0000 (10:28 -0500)]
lib: add bt_version_get_extra_{name,description,patch_names}
Those new functions return extra information about the library's version
for custom builds (see `version/README.adoc`).
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I52abca8235826d1e336584285e925147895b13f4
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2838
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Tue, 21 Jan 2020 15:11:49 +0000 (10:11 -0500)]
lib: add bt_version_get_vcs_revision_description()
For a non-release build, this function returns the Git revision's
description.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Iec5e5fb1bb220c3477bfecab3c3f35b103c0592e
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2837
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Tue, 21 Jan 2020 14:55:43 +0000 (09:55 -0500)]
common: support custom, extra information for build's version
This patch adds a system of extra version information also found in
LTTng-tools.
`src/common/Makefile` generates `src/common/version.i` at every build.
This file contains:
* The current Git revision description.
* Extra name of the version (found in `version/extra_version_name`).
* Extra description of the version (found in
`version/extra_version_description`).
* A list of patch file names found in `version/extra_patches`.
All definitions can be empty strings.
See `version/README.adoc` to learn more.
As of this patch, libbabeltrace2 does not offer getters for this data
and the CLI does not print it with the `--version` option. This is
reserved for subsequent patches.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ife50e5bcaa6b3bdeda6ee4e7c1fdeb2fb1f63887
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2836
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Tue, 21 Jan 2020 14:20:40 +0000 (09:20 -0500)]
configure.ac, lib: rename "extra" (version) to "development stage"
"Extra" is a term which we'll use for something else brought by a
subsequent patch.
I took the "development stage" term from
<https://en.wikipedia.org/wiki/Software_release_life_cycle#Stages_of_development>,
where "Release candidate" is one of the stages.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I285fbf9851cde41a520079b4c31cdc5d8bf32412
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2835
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Mon, 20 Jan 2020 22:00:35 +0000 (17:00 -0500)]
lib: add bt_version_get_name() and bt_version_get_name_description()
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: If080c93994ac5869e29061b21d7b5c35387985d3
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2834
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Mon, 20 Jan 2020 21:59:05 +0000 (16:59 -0500)]
lib: bt_version_get_extra(): return `NULL` if none instead of empty str.
This follows the pattern we have for other optional strings returned by
the library.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I775f4f3be917bde405ad3b5e63183dae9609cf03
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2833
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Mon, 20 Jan 2020 21:54:03 +0000 (16:54 -0500)]
configure.ac: add version name/description definitions and report them
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: If287cce862facaaec71c63030ae578e24bcf4591
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2832
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Sat, 21 Sep 2019 16:02:25 +0000 (12:02 -0400)]
Document libbabeltrace2's C API
This patch adds initial documentation for the Babeltrace 2 library's
C API using Doxygen.
The Doxygen project is located in `doc/api/libbabeltrace2`, as we can
eventually add `doc/api/libbabeltrace2-ctf-writer`.
To be able to use Doxygen's member grouping [1], I had to join some
header files (`const` and non `const` headers, for example), because
otherwise I could not get some functions in separate files to be in the
same member group in the order I want. In the end, the library user
includes `<babeltrace2/babeltrace.h>`, so how we organize the headers
exactly is not so crucial.
[1]: http://www.doxygen.nl/manual/grouping.html#memgroup
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I6d1dc2e7c5ee63fcd4220d0fd9f0931d361d2f31
Reviewed-on: https://review.lttng.org/c/babeltrace/+/2807
Tested-by: jenkins <jenkins@lttng.org>
This page took 0.058149 seconds and 4 git commands to generate.