Philippe Proulx [Thu, 27 Jun 2019 02:46:08 +0000 (22:46 -0400)]
lib: rename `BABELTRACE_NO_DLCLOSE` -> `LIBBABELTRACE2_NO_DLCLOSE`
I feel like this environment variable is more about the library than
about the project as a whole, like `LIBBABELTRACE2_INIT_LOG_LEVEL`.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I19e5229fc64d54f2a4ff23ef36647ba78917b619
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1554
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Thu, 27 Jun 2019 02:01:55 +0000 (22:01 -0400)]
bt2: fix formatting of C code in native_bt_component_class.i
Change-Id: Ia1bdd2916178a2f5512e00c9ef493e642d9d25cc
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1553
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Thu, 27 Jun 2019 00:04:49 +0000 (20:04 -0400)]
cli: add missing line in --plugin-path help
When doing "babeltrace2 convert --help", a line is missing from the
--plugin-path option help. This patch adds it, copied from the help of
the other commands.
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Change-Id: I823385cae29afa2bfa0650d4c5dd0142dd4f9cea
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1549
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Wed, 26 Jun 2019 13:49:57 +0000 (09:49 -0400)]
lib: reverse order of bt_self_component_port_input_message_iterator::auto_seek_msgs queue
The messages in this queue are in reverse chronological order, meaning
we push the incoming messages to the head and later consume them from
the tail.
It would be more expected (although functionally equivalent) to do the
opposite, so that the messages are in chronological order when iterating
the list in forward.
So this patch just swaps the push/pop calls around.
Change-Id: Id4892e12e064376e919647c0d8bb838156ef0fc5
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1543
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Tue, 25 Jun 2019 17:51:29 +0000 (13:51 -0400)]
bt2: rename native_bt_notifier.i to native_bt_message_iterator.i
We don't use the term notifier anymore, message iterator is more
contemporary.
Change-Id: Iadda98ac83a2dfddcb207d3beb99ddaa65181ad3
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1536
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Tue, 25 Jun 2019 17:22:00 +0000 (13:22 -0400)]
bt2: remove unused double* typemap
This typemap seems to be unused, remove it.
Change-Id: I06f1692f6cff224ecb164058edf87025b0d7cd35
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1535
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Fri, 21 Jun 2019 22:37:24 +0000 (18:37 -0400)]
bt2: replace copy of headers for SWIG with includes
The current approach of writing SWIG interface files is to copy paste
declarations. This can be tedious and error prone, when the API is
modified.
This patch changes the interface files to include the Babeltrace header
files containing those declarations instead.
The main difficulty with this is that we can't rely on parameter names
for typemap matching anymore. In most cases, using just the type is
fine (e.g. the only reason a function takes a
bt_self_component_port_input ** is as an output parameter).
In the case of "user data" it's a bit more tricky, since the type is
"void *". In these cases (in native_bt_component.i and
native_bt_port.i), I made it so we clear the typemap at the end of the
file, so hopefully it doesn't apply to an unexpected function in another
file.
In native_bt_field_class.i, the typemap for
(bt_field_class_enumeration_mapping_label_array *label_array, uint64_t *count)
doesn't work if I leave out the parameter names, for some reason, so I
have put the parameter names used in the headers.
Change-Id: I2e98c60c2dcb7c8ea243b4cf36e0fcfaf53e9cde
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1531
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Wed, 26 Jun 2019 19:02:28 +0000 (15:02 -0400)]
Rename `BT_LOG_LEVEL` -> `BT_MINIMAL_LOG_LEVEL`
This makes it very clear.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: If3baf92799e2d0384d9f217c66414424155bac88
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1547
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Wed, 26 Jun 2019 18:39:42 +0000 (14:39 -0400)]
Do not require logging support for BT_[CTF_]ASSERT_PRE()
This patch makes the BT_ASSERT_PRE(), BT_ASSERT_PRE_MSG(),
BT_CTF_ASSERT_PRE(), and BT_CTF_ASSERT_PRE_MSG() not use BT_LIB_LOGF()
and BT_LOGF() directly to not rely on the active log level to print the
messages.
This makes it possible to configure the build with
`BABELTRACE_DEV_MODE=1` and `BABELTRACE_MINIMAL_LOG_LEVEL=NONE` and
still get the precondition failure messages. This removes some code
in `configure.ac` and `src/lib/logging.c` which ensured that the log
level could not be NONE when developer mode is enabled.
The macros now use _bt_log_write_d() (which does not check the active
log level) and bt_lib_log() (which uses _bt_log_write_d() without
checking the active log level) instead of BT_LOGF() and BT_LIB_LOGF().
The `assert-pre.h` header still require that you include
`"lib/logging.h"` or `"logging/log.h"` before because this is where the
logging tag and logging functions are found.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: If98a1c074d211cf257742d55960b379bbe9c6cf0
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1546
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Tue, 25 Jun 2019 16:50:17 +0000 (12:50 -0400)]
lib: bt_plugin_find*(): return status code; add "fail on load error" param
The bt_plugin_find*() functions, before this patch, return a plugin
object or a plugin set object. When such a function returns `NULL`, you
have no way to tell if it's because there was an error or if no plugins
were found.
Also, when a plugin cannot be loaded for various reasons, sometimes it's
considered an error and sometimes not, so there's no way to be strict.
This patch makes:
* The bt_plugin_find*() functions return a status code, and return the
plugin or plugin set object by output parameter.
The available, new status codes are:
`BT_PLUGIN_STATUS_OK`:
Everything is fine.
`BT_PLUGIN_STATUS_NOT_FOUND`:
No plugins were found.
`BT_PLUGIN_STATUS_ERROR`:
There was a general error while trying to find plugins.
`BT_PLUGIN_STATUS_LOADING_ERROR`:
A plugin could not be loaded successfully while trying to find
plugins.
`BT_PLUGIN_STATUS_NOMEM`:
There was an allocation error while trying to find plugins.
The bt_plugin_find_all_from_file() and bt_plugin_find_all_from_dir()
never return an empty plugin set: they return
`BT_PLUGIN_STATUS_NOT_FOUND` instead.
* The bt_plugin_find*() functions accept a new `fail_on_load_error`
parameter which controls whether a plugin loading error is ignored
(can eventually lead to `BT_PLUGIN_STATUS_NOT_FOUND` being returned)
or triggers a loading error condition
(`BT_PLUGIN_STATUS_LOADING_ERROR`).
When `fail_on_load_error` is true, the functions log errors with
the WARN level. When it's false, they log errors with the INFO level
before ignoring them.
A file is known to be a Babeltrace plugin if:
* Its extension is `.so` (or `.dll` on Windows), g_module_open()
succeeds for that file, and the required
`__bt_get_begin_section_plugin_descriptors` symbol can be found.
* Its name starts with `bt_` and ends with `.py`.
Any file that does not meet the criteria above does not trigger a
loading error: the file is simply skipped.
A plugin loading error (`BT_PLUGIN_STATUS_LOADING_ERROR`) is caused by:
For a shared object (`.so` or `.dll`) plugin, one of:
* Missing `__bt_get_end_section_plugin_descriptors` symbol.
* Missing `__bt_get_begin_section_plugin_descriptor_attributes` and
`__bt_get_end_section_plugin_descriptor_attributes` symbols.
* Missing `__bt_get_begin_section_component_class_descriptors` and
`__bt_get_end_section_component_class_descriptors` symbols.
* Missing
`__bt_get_begin_section_component_class_descriptor_attributes` and
`__bt_get_end_section_component_class_descriptor_attributes`
symbols.
* Unknown plugin descriptor attribute.
* Unknown component class descriptor attribute.
* Unknown component class type in component class descriptors.
* Incompatible or missing ABI version.
* Failing plugin's user initialization function.
For a built-in plugin:
* Failing plugin's user initialization function.
For a Python plugin, one of:
* Failure to load the Python plugin module.
* Unexpected/malformed plugin info object (missing attributes, wrong
types, etc.).
With this patch, you must pass a valid file or directory path to
bt_plugin_find_all_from_file() and bt_plugin_find_all_from_dir(). When
you don't, the functions fail with `BT_PLUGIN_STATUS_ERROR`. This is not
considered a loading error (not `BT_PLUGIN_STATUS_LOADING_ERROR`), as
the user can control whether or not this error occurs by making sure
the path exists, and it does not occur while loading a plugin.
As of this patch, the CLI ignores loading errors (like before), that is,
passes `BT_FALSE` as the `fail_on_load_error` parameter. A strict mode
could be added, controlled by a command-line option.
In `native_bt_plugin.i`, wrappers are created to set the output
parameter to `NULL` if the status is not `BT_PLUGIN_STATUS_OK`. This is
similar to what was already done to wrap bt_plugin_get_version().
If you pass `fail_on_load_error=True` to bt2.find_plugins() or
bt2.find_plugin(), then this function can raise `bt2.Error` if there's
a loading error.
Tests are adapted to check the returned status code.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I88049c07163055503e9551940973390ebedcfae4
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1537
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Tue, 25 Jun 2019 17:19:02 +0000 (13:19 -0400)]
lib: rename parameter of bt_self_component_filter_add_{in,out}put_port
This makes is consistent with corresponding functions for sources and
sinks. It will help for a future patch that will re-work the SWIG
bindings to have the same name everywhere (to apply the same typemap to
all of these).
Change-Id: Icdeb32711e56d4b6a619a493a8b64817f3084bd5
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1534
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Wed, 19 Jun 2019 20:22:54 +0000 (16:22 -0400)]
lib: remove "accept port" concept
This patch removes the concept of a component needing to accept a port
connection before a connection is made. Since the component connections
are supposed to be transparent (a component behavior shouldn't change
based on which component is on the other side), there is no point in
letting a component refuse a connection. Refusing a port connection
based on the component class, for example, could lead to tightly coupled
components, which we want to avoid.
Change-Id: Ia2d0e09caaee069e9be22b8089ef5ccbae392bb2
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1522
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Philippe Proulx [Thu, 20 Jun 2019 19:54:48 +0000 (15:54 -0400)]
Fix: `ctf` plugin: do not have an `mdec` variable where not strictly needed
Issue
=====
The `metadata-info` query needs to call
ctf_metadata_decoder_packetized_file_stream_to_buf() with a custom log
level and no self component (`NULL`). Eventually, this reaches
decode_packet() which is in the `decoder.c` file and thus uses
`mdec->self_comp` to find its self component in the BT_COMP_LOG*()
macros. But in this case, `mdec` is `NULL`, so there's an invalid
memory access.
Solution
========
Instead of using BT_COMP_LOG_CUR_LVL() everywhere in this function, and
because decode_packet() and
ctf_metadata_decoder_packetized_file_stream_to_buf_with_mdec() do not
strictly need `mdec` except for logging its address at some places, move
the functions to the new `decoder-packetized-file-stream-to-buf.c` file
and make them not accept an `mdec` argument.
This new file's logging uses the local `log_level` and `self_comp`
variables, so the logging statement are not modified.
Known drawbacks
===============
None.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I55874790b2b873ff1718a774e57011300e57518d
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1526
Tested-by: jenkins <jenkins@lttng.org>
Michael Jeanson [Mon, 17 Jun 2019 20:44:24 +0000 (16:44 -0400)]
tests: Add missing copyright headers
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: If5de85403824e4a77c4a975c3354318070afb0eb
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1495
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Michael Jeanson [Thu, 13 Jun 2019 20:18:40 +0000 (16:18 -0400)]
tests: Move data files to a common directory
* Reduce errors when adding new data files, a single EXTRA_DIST
directive in tests/Makefile.am will cover all data files
* Standardise variables used to refer to the data files path and add
them to 'utils/common.sh'.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I5fd06e5280e5864593aca8e964eeda9121b8a48e
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1428
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Fri, 21 Jun 2019 15:29:19 +0000 (11:29 -0400)]
bt2: add missing parameter to _UserComponentType._query
While running the Python test suite, I saw this unexpected stack trace:
test_query_not_implemented (test_component_class.UserComponentClassTestCase) ...
06-21 11:22:56.091 24065 24065 E BT2-PY bt_py3_component_class_query@native_bt_wrap.c:4442 Failed to call Python class's _query_from_native() method: py-cls-addr=0x6190001ce898
06-21 11:22:56.092 24065 24065 E BT2-PY bt2_py_loge_exception@native_bt_wrap.c:3838 Traceback (most recent call last):
File "/home/smarchi/build/babeltrace/src/bindings/python/bt2/build/build_lib/bt2/component.py", line 539, in _query_from_native
results = cls._query(query_exec, obj, params, log_level)
TypeError: _query() takes 4 positional arguments but 5 were given
This is because method _UserComponentType._query is missing the
log_level argument that was added in a recent commit. The reason the
test still passes is that it expects bt2.Error to be raised (coming from
the raise NotImplementedError). The failure to call _query also ends up
raising a bt2.Error. So it succeeds to fail, but it doesn't fail the
right way, and the test fails to properly catch that failure.
Change-Id: If13bfdecc2876610fe8568a12043be60762d1596
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1530
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Simon Marchi [Fri, 21 Jun 2019 14:30:11 +0000 (10:30 -0400)]
test utils: add failfast option to our testrunner.py
When iterating on a test, I like using the -f|--failfast option of the
unittest module. This patch adds the option to pass it to our
testrunner.
Here's one way to use it (with the babeltrace build dir as the current working
directory):
tests/utils/test_python_bt2_env python3 /home/smarchi/src/babeltrace/tests/utils/python/testrunner.py /home/smarchi/src/babeltrace/tests/bindings/python/bt2/ -f
Note that this is not absolutely essential, it is also possible to call
unittest directly:
tests/utils/test_python_bt2_env python3 -m unittest discover -s /home/smarchi/src/babeltrace/tests/bindings/python/bt2/ -f
However, I prefer using the same runner as what the testsuite uses.
To facilitate the handling of optional arguments, I made the script use
argparse.
Change-Id: Ia4c082dc0952cc8649491b2410ab2d99f1477c1b
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1528
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Michael Jeanson [Mon, 17 Jun 2019 16:46:29 +0000 (12:46 -0400)]
fix: move static functions inside ifdef
Move static functions inside ifdef where they are used so we don't get
unused functions warnings on MINGW.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: Ie35fcdc7b0f7bf41ed53ed06b9dfd50042510207
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1477
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Philippe Proulx [Thu, 20 Jun 2019 19:50:20 +0000 (15:50 -0400)]
Fix: bt_config_convert_from_args(): set default log level at the end too
Issue
=====
There are code paths which make bt_config_convert_from_args() return a
configuration while not having set the default log level.
For example, with `-o ctf-metadata`, the function calls
bt_config_print_ctf_metadata_create() to create such a configuration,
and then goes to the `end` label).
Solution
========
Make sure it is set to the CLI's default log level value when reaching
the end of the function.
Known drawbacks
===============
None.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I2ee21a754aeaea65fd6d4fbfcae5bd2f07fcba7c
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1525
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Thu, 20 Jun 2019 18:23:39 +0000 (14:23 -0400)]
Rename VERBOSE log level to TRACE
Some people reported that they have a hard time guessing whether the
VERBOSE log level is more or less verbose than the DEBUG log level.
The existing logging frameworks I looked at (Apache Log4j 2, SLF4J,
`java.util.logging`, syslog, Python, Ruby, Boost.Test, ASP.NET Core, to
name a few popular ones) do not have the VERBOSE level; they almost
always have the DEBUG level, and sometimes the TRACE level.
To conform with the common practice, let's use TRACE instead of VERBOSE.
It is my wish that DEBUG vs. TRACE will speak to more developers than
DEBUG vs. VERBOSE.
This means that BT_LOGV() and its variants become BT_LOGT(). Also,
the log level environment variables and the CLI's `--log-level` parameter
accept `T` and `TRACE` instead of `V` and `VERBOSE`. In the log output,
the messages contain `T` instead of `V`:
06-20 14:31:23.356 3612 3612 T PLUGIN/CTF/BFCR
read_unsigned_bitfield@bfcr.c:483 [N/A] Read unsigned bit array:
cur=32, size=8, bo=1, val=33
`CONTRIBUTING.adoc` is updated to document the TRACE level instead of
the VERBOSE level.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I20460c4569f8b755440511c6621a68a1ef6424fc
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1524
CI-Build: Simon Marchi <simon.marchi@efficios.com>
CI-Build: Jonathan Rajotte Julien <jonathan.rajotte-julien@efficios.com>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Simon Marchi [Mon, 17 Jun 2019 16:00:21 +0000 (12:00 -0400)]
bt2: Rename _set_default_clock_snapshot_ptr callback to _set_default_clock_snapshot
I don't think it should have the _ptr suffix, as it doesn't take a SWIG
pointer object, but a uint64_t.
Change-Id: I5a6915e61cd0b482fe04a1ba62babbc3f3bc63bb
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1475
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Jonathan Rajotte [Wed, 19 Jun 2019 17:28:14 +0000 (13:28 -0400)]
Fix: Unmap before truncating
The mmap/mman compat layer for mingw uses the CreateFileMapping
and UnmapViewOfFile thus implicitly imposes an order for truncation and
ummapping [1].
For truncation calls, the underlying windows API call is SetEndOfFile.
This function requires that the file be unmapped before being called [1].
[1]
If CreateFileMapping is called to create a file mapping object for
hFile, UnmapViewOfFile must be called first to unmap all views and
call CloseHandle to close the file mapping object before you can call
SetEndOfFile.
[1] https://docs.microsoft.com/en-us/windows/desktop/api/fileapi/nf-fileapi-setendoffile#remarks
Change-Id: Id4713ca3af612baa24e1fa4a749384eab452598a
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1519
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
Michael Jeanson [Mon, 17 Jun 2019 16:54:48 +0000 (12:54 -0400)]
fix: Add missing stdint include on Windows
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I3e1369e282360401a6e0c0516828068ea15de780
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1478
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Jonathan Rajotte Julien <jonathan.rajotte-julien@efficios.com>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Michael Jeanson [Mon, 17 Jun 2019 16:10:34 +0000 (12:10 -0400)]
fix: test_trimmer on macOs and Solaris
The 'wc' tool on BSD based system adds leading spaces to it's output,
which breaks the quoted compare. Use bash parameter expansion to trim all
spaces from the 'num_events' variable.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I15aef8c6987e40bcb018f32c7c094eabbc3d83c3
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1476
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Fri, 14 Jun 2019 21:24:49 +0000 (17:24 -0400)]
lib: remove BT_LIB_LOG*() macro usage comment
This is explained in `CONTRIBUTING.adoc` now.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I76ed90889f4648311735b0c66389c82b2a1cf31b
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1447
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 18:08:28 +0000 (14:08 -0400)]
Update `CONTRIBUTING.adoc`
Changes:
* Change to Asciidoctor format. This is what GitHub uses, so this guide
is correctly converted on GitHub.
* Update reference count section's terminology and function names.
* Update logging section:
* Reorganize sections, making guides explicit.
* Header paths.
* More details about the available log levels.
* Library-specific logging statement macros (more or less copied from
`src/lib/logging.h`).
* Component-specific logging statement macros.
* Have clear guides on how to instrument generic, library, and
component class C source and header file
* More details about which log level to choose.
* More details about which logging tag to choose.
Removing the `CONTRIBUTING.html` global Makefile target as we cannot
use Asciidoc to build `CONTRIBUTING.adoc` anymore.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I98effa1fb087274c453014d95115d471b5b115ad
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1446
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Wed, 19 Jun 2019 07:11:36 +0000 (03:11 -0400)]
lib: add comment about why `bt_lib_log_level` is exported
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ic3dd3ff9cb6f39ac369a55c06ef9a752d60d7fc7
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1512
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Wed, 19 Jun 2019 07:03:38 +0000 (03:03 -0400)]
lib: use `LIBBABELTRACE2_INIT_LOG_LEVEL` env. var. to initialize log level
Use the `LIBBABELTRACE2_INIT_LOG_LEVEL` environment variable instead of
`BABELTRACE_LOGGING_GLOBAL_LEVEL` to make it very clear that it's about
the library, and not related to the individual component log levels, for
example.
`INIT` is in the name to indicate that it's only the initial log level;
the library user can still change it at run time with
bt_logging_set_global_level(), while the other log level environment
variables, `BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL` and
`BABELTRACE_PYTHON_BT2_LOG_LEVEL`, are used to set the definitive log
levels of those modules.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ibf580bed6c30d88b4fbe3aed20f38cc969bc9295
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1511
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Wed, 19 Jun 2019 06:38:56 +0000 (02:38 -0400)]
src.ctf.fs: use BT_COMP_LOG*() instead of BT_LOG*()
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Iee65b871881b4719d429b6343e3a7e437bac732c
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1510
Philippe Proulx [Wed, 19 Jun 2019 06:14:39 +0000 (02:14 -0400)]
src.ctf.fs: honor component's initial log level
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I75064d71438939a351748671534efcdf83059192
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1509
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Wed, 19 Jun 2019 05:42:10 +0000 (01:42 -0400)]
src.ctf.lttng-live: use BT_COMP_LOG*() instead of BT_LOG*()
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I9fe4f0ca7e6c061e90a3c46019e9e0913f737842
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1508
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Tue, 18 Jun 2019 19:20:23 +0000 (15:20 -0400)]
sink.ctf.fs: use BT_COMP_LOG*() instead of BT_LOG*()
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I1b337c6fb7c38def67cd5418c96df2df6faa020e
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1502
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Tue, 18 Jun 2019 18:58:17 +0000 (14:58 -0400)]
sink.text.details: use BT_COMP_LOG*() instead of BT_LOG*()
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: If44884543ec8e79ef4f940955033c991d1112ecb
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1501
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Tue, 18 Jun 2019 18:48:54 +0000 (14:48 -0400)]
sink.text.details: honor component's initial log level
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: If24cf10be949c4e637b4677b9780c00a58e14df2
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1500
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Tue, 18 Jun 2019 18:38:53 +0000 (14:38 -0400)]
`ctf` plugin: metadata: use BT_COMP_LOG*() instead of BT_LOG*()
Because we need to pass around the log level and the self component
pointer at several places within the files of this directory, this patch
adds a new internal `struct meta_log_config` which contains both and can
be passed as a single parameter and contained as a single member. It is
not meant to be known by anything calling the functions from files
outside this directory.
The generated parser and lexer can't use the BT_COMP_LOG*() macros
because they lack contextual data to access the self component pointer,
so they are left as is.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ifa95256e7931416b890e8da0bb7c2552f396a8d2
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1499
Philippe Proulx [Tue, 18 Jun 2019 17:50:28 +0000 (13:50 -0400)]
`ctf` plugin: `bt_msg_iter`: use BT_COMP_LOG*() instead of BT_LOG*()
As of this patch, the users of `bt_msg_iter` set the new self component
parameter to `NULL` as this work is reserved for a following patch.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I98328d43e0f67d1c4b1cf5493fa9c9cd02a32393
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1498
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Tue, 18 Jun 2019 17:35:19 +0000 (13:35 -0400)]
`ctf` plugin: `bt_bfcr`: use BT_COMP_LOG*() instead of BT_LOG*()
As of this patch, the only user of `bt_bfcr` is `bt_msg_iter`, which
sets the new self component parameter to `NULL` because it's not
available at this point (work reserved for a following patch).
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Idcdbc21f0d6ab3062e4c9350228456bdfdeb23cf
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1497
Philippe Proulx [Tue, 18 Jun 2019 17:24:33 +0000 (13:24 -0400)]
sink.ctf.fs: honor component's initial log level
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I5381ab04b9f2e3611c5f08006896a30e63451635
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1496
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Tue, 18 Jun 2019 05:22:38 +0000 (01:22 -0400)]
src.ctf.lttng-live: honor component's initial log level and query LL
Except for `viewer-connection.c` which is pretty consistent in having a
named "viewer connection" instance in each function, the other files
deal with too many objects/concepts to have a systematic expression to
identify the log level, so they use local `log_level` variables.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I102408375d4d3d2df21c756b6581c642ece77ff1
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1494
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Tue, 18 Jun 2019 04:01:25 +0000 (00:01 -0400)]
lib/object.h: log conditionally to `BT_OBJECT_DONT_LOG` undefined
There are a few places within the project, but outside the library, that
for historic reasons use the library's internal `bt_object` API to have
reference counting. The `bt_object` API belongs to the library for the
moment and should not be included as such.
There's an issue when you need logging in your module and the functions
which log within `object.h` cannot make sense of the
`BT_LOG_OUTPUT_LEVEL` expression. To avoid this and save short-term
development time, make them not log if `BT_OBJECT_DONT_LOG` is defined.
Then, outside the library, you can do something like:
#define BT_LOG_OUTPUT_LEVEL my_log_level
#define BT_LOG_TAG MY-TAG
#include "logging/log.h"
#define BT_OBJECT_DONT_LOG
#include "lib/object.h"
Another solution would be to include `lib/logging.h` before
`logging/log.h`, but that's not always easy.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: If3037b67e5c4f87f57db96528d0a9516c8f9d6ea
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1493
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Mon, 17 Jun 2019 23:28:23 +0000 (19:28 -0400)]
Remove unused `src/plugins/ctf/print.h`
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I989c98d9273f69362fd9f4d7390a91323e780886
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1492
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Mon, 17 Jun 2019 23:27:16 +0000 (19:27 -0400)]
Remove unused `src/plugins/ctf/common/utils`
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ia66dfc005c8091187c3883727bf7f68582a201da
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1491
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Mon, 17 Jun 2019 23:20:08 +0000 (19:20 -0400)]
`ctf` plugin: metadata: use local log level
As of this patch, the users of the common metadata functions and objects
set the new log level parameters to their own (global) log level.
The goal is to eventually have a per-component log level for the `ctf`
plugin's component classes.
Unfortunately, `YYFPRINTF` and `YY_FATAL_ERROR` are pretty limited in
terms of available context. I'm leaving the
`BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL` environment variable to set
the logging level of the parser and lexer modules.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I34651e6d0c14b5acc9b4198681c2aea4c003dc7a
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1490
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Mon, 17 Jun 2019 22:13:54 +0000 (18:13 -0400)]
`ctf` plugin: `bt_msg_iter`: use object's log level
As of this patch, the users of `bt_msg_iter` set the new log level
parameter to their own (global) log level.
The goal is to eventually have a per-component log level for the `ctf`
plugin's component classes.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I279d22831c5857dc10622e6cabacf64c32fa5ed4
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1488
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Mon, 17 Jun 2019 22:00:09 +0000 (18:00 -0400)]
`ctf` plugin: `bt_bfcr`: use object's log level
As of this patch, the only user of `bt_bfcr` is `bt_msg_iter`, which
sets the new log level parameter to its own (global) log level.
The goal is to eventually have a per-component log level for the `ctf`
plugin's component classes.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ie77969d587c03c7d0257c19bb151ee22707b9842
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1487
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Mon, 17 Jun 2019 17:19:57 +0000 (13:19 -0400)]
utils.sink.counter: use BT_COMP_LOG*() instead of BT_LOG*()
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ic963197053b374df6b891c8b6af1050255c626d9
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1481
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Mon, 17 Jun 2019 17:18:11 +0000 (13:18 -0400)]
flt.lttng-utils.debug-info: use BT_COMP_LOG*() instead of BT_LOG*()
Note that the API of `bin-info.h` is tested in
`tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c`, and since
the BT_COMP_LOG*() macros can call bt_component_get_name(), which is
defined in the Babeltrace library, `test_bin_info` needs to be linked
with the Babeltrace library now.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ibb29ece3936478f0e82f28d7f889a067d771a703
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1480
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Mon, 17 Jun 2019 05:45:14 +0000 (01:45 -0400)]
flt.lttng-utils.debug-info: honor component's initial log level
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I49d4f5ecbdcc546c511e2469581db4f0e785a54a
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1479
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 17:02:55 +0000 (13:02 -0400)]
lib: rename `lib-logging.h` to `logging.h`
Now we include "lib/logging.h" instead of "lib/lib-logging.h" to get
internal library logging support. The old file name was redundant.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I996b58c4b8c4914207a9f7e0b8ff6146ad65f5cb
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1473
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 16:58:38 +0000 (12:58 -0400)]
Logging: define `BT_LOG*_SUPPORTED` when logging is supported
Rely on those new `BT_LOG_SUPPORTED`, `BT_LIB_LOG_SUPPORTED`,
`BT_COMP_LOG_SUPPORTED`, definitions instead of the header include
guards to know whether or not logging is supported at a given point.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I4d076e30b528882d036f7cfc367b5dbb39401dda
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1472
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 15:32:09 +0000 (11:32 -0400)]
flt.utils.muxer: use BT_COMP_LOG*() instead of BT_LOG*()
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I57e8c7980ad50ae687cfa545c5f434d4027b18e3
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1471
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 15:23:27 +0000 (11:23 -0400)]
flt.utils.trimmer: use BT_COMP_LOG*() instead of BT_LOG*()
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ib4280e02ef7520fdca0dc4718ae36d5e34ae56ca
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1470
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 15:18:39 +0000 (11:18 -0400)]
src.text.dmesg: use BT_COMP_LOG*() instead of BT_LOG*()
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I38ff470120dbc9c303bd0fb23e1b552b99e07fc0
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1469
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 15:04:54 +0000 (11:04 -0400)]
Logging: add `src/plugins/comp-logging.h` (BT_COMP_LOG*())
This new header is intended to be included by the different component
class files so that their logging statements can automatically include
the component's name. The BT_COMP_LOG*() macros prepend a prefix similar
to this to the logging message:
[mein-sink]
where `mein-sink` is a component's name.
Having the component name within each logging message of a given
component class adds valuable context and can help resolve issues
faster.
I did not include the plugin name and the component class's type and
name within the prefix because we already have them thanks to the
logging tag, for example `PLUGIN/SRC.CTF.FS`. This would be redundant,
make the logging message longer, and make `comp-logging.h` more complex.
The BT_COMP_LOG*() macros rely on the `BT_COMP_LOG_SELF_COMP`
definition. This is an expression which is, in the logging statement
context, the `bt_self_component *` address. Because we have the self
component there, we are free to prepend more contextual information to
the logging message in the future, should we need it.
Typically, when a component class source file defines
`BT_LOG_OUTPUT_LEVEL` to `(my_comp->log_level)`, where `my_comp` points
to the component's private structure, it will also define
`BT_COMP_LOG_SELF_COMP` to `(my_comp->self_comp)`.
If `BT_COMP_LOG_SELF_COMP` evaluates to `NULL`, the macros use the
prefix
[N/A]
This could be the case when instrumenting code that is shared for both
graph and non-graph contexts, for example the metadata and stream
decoders of the `ctf` plugin which can also be used within a query
operation.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I62c63ed78d234922f556631726fb7bb852924f0a
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1468
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 06:39:50 +0000 (02:39 -0400)]
flt.utils.trimmer: honor component's initial log level
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I785a46dad409a9d1ab75426ce49059169e47c74e
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1467
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 06:31:40 +0000 (02:31 -0400)]
flt.utils.muxer: honor component's initial log level
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ie0a6c76fa2c462bcd352081e98aa14411bfd13d8
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1466
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 06:29:58 +0000 (02:29 -0400)]
Move bt_{self_component,message_iterator}_status_string() to `common.h`
Now `muxer.c` does not include internal library headers.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I33a9cf2db3df6a8d06d385f352280d90a922c4d9
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1465
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 05:59:47 +0000 (01:59 -0400)]
sink.utils.counter: honor component's initial log level
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ib5bc755a8ff3db0a869b448f83dd9a888ee7df9b
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1464
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 02:41:01 +0000 (22:41 -0400)]
src.text.dmesg: honor component's initial log level
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ibf940cce2980389241ee6f4790c4c651280918a5
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1463
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 04:44:52 +0000 (00:44 -0400)]
tests: bt2: add query log level tests
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I725d3b7d64b4a820da1f3762c3217af9a88a0ca3
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1462
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 04:42:10 +0000 (00:42 -0400)]
lib: pass log level to bt_query_executor_query()
This new parameter indicates the log level to use during the query
execution.
The project's component classes are changed to receive this log level,
but they do not use it. This work is reserved for a future patch.
The CLI passes its default log level (main `--log-level` option) to
bt_query_executor_query().
Python bindings are adapted accordingly.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I929d545a1df2f4d6d083f6c536f6fcf26aa972bd
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1461
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 03:59:04 +0000 (23:59 -0400)]
Logging: pass dynamic log level to common functions and subsystems
This patch makes the project's common functions and subsystems get a
dynamic log level instead of using a global one set from an environment
variable. The goal is to achieve per-component log levels, so the common
functions and subsystems must receive, eventually, the component's
specific log level.
"Naked" functions (without a context object of some sort) simply get
their log level from a new parameter. In that case `BT_LOG_OUTPUT_LEVEL`
is simply defined to `log_level`, so a local `log_level` variable must
exist when using logging statements. Subsystems, such as an FD cache or
a CTF serializer, get their log level from a new parameter in their
initialization function and then use it for their other operations.
It was somehow hard to do this for `src/common` alone without also doing
it for the rest so I'm doing all of them at once here.
For those subsystems, the local `logging.c` and `logging.h` disappear.
`tests/plugins/flt.lttng-utils.debug-info/test_bin_info.c` needs to pass
a log level to the FD cache subsystem; I used the WARN level instead of
setting the log level from an environment variable for this test alone.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I35979a8fe4c74afe5921c3b6651015cd7ee2760a
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1460
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 03:29:46 +0000 (23:29 -0400)]
src/logging/log.h: add BT_LOG_WRITE_CUR_LVL(), BT_LOG_WRITE_ERRNO_CUR_LVL()
BT_LOG_WRITE_CUR_LVL() is like BT_LOG_WRITE(), but it compares the
given log level to a current log level parameter instead of
`_BT_LOG_OUTPUT_LEVEL`.
BT_LOG_WRITE_ERRNO_CUR_LVL() is the same thing, but for
BT_LOG_WRITE_ERRNO().
The goal of this is to be able to control which variable contains the
current log level at the call site to achieve per-component log levels.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I670664a7cb465954c2f0f8b3551ea49fd1465e32
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1459
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 02:52:27 +0000 (22:52 -0400)]
cli: add component-specific `--log-level` option (run/convert commands)
This new option makes it possible to specify a log level for a specific
component instance. The main program's `--log-level` option becomes the
default log level which the specific `--log-level` options override.
For example:
babeltrace2 -c src.mein.source --log-level=I \
-c sink.ctf.fs --log-level=D
makes the log level of the source be INFO and the log level of the
sink be DEBUG. The log level of the other components (implicit muxer),
of the CLI, and of the library is the default WARN.
babeltrace2 --log-level=E -c src.mein.source --log-level=I \
-c sink.ctf.fs
makes the log level of the source be INFO and the log level of the sink,
of the other components (implicit muxer), of the CLI, and of the library
be ERROR.
The CLI still sets the known log level environment variables until
subsequent patches make each component honor its initial log level, that
is, until each component uses the log level for its logging statements
as returned by bt_component_get_logging_level().
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I8a3b05b7147fdb0149ecff670c542c9a229beddb
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1458
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 01:52:15 +0000 (21:52 -0400)]
sink.text.pretty: remove logging (not used)
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I5449d5a3aa89466764bea8ba7523c580ac695e29
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1457
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 01:48:50 +0000 (21:48 -0400)]
test_graph.py: add bt2.Graph.add_component() logging level parameter tests
GraphTestCase.test_add_component_logging_level() is pretty much the same
test as GenericComponentTestCase.test_logging_level(), but the former's
purpose is to test the bt2.Graph.add_component() part of this, while the
latter tests the component's public `logging_level` property.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I9c82e8a7ab6a733810eabfee5ccef66cd619a610
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1456
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 01:44:11 +0000 (21:44 -0400)]
test_component.py: add `logging_level` property tests
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ibc7dbbbb3d497efe8b8c237488fd0733c094f242
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1455
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 01:16:07 +0000 (21:16 -0400)]
lib: set component's initial log level when adding it to the graph
This patch changes the bt_graph_add_*_component*() functions so that
they accept a log level parameter. This is now considered the
component's initial log level, so that we can achieve per-component log
levels.
The component initialization method types are not changed: because the
log level is part of a component's state, a component initialization
method can retrieve its own, current log level with the new
bt_component_get_logging_level() function. When you call
bt_graph_add_*_component*(), the function creates an initial component
object, sets its initial log level, and then calls its initialization
method.
Eventually, we can add a new, optional "logging level changed" component
method to notify it that its log level changed (caused by a call to
bt_component_set_logging_level(), for example).
The project's components do not honor their initial log level within the
scope of this patch: this is postponed to another patch. In other words,
they still use shared object constructors and environment variables to
set their log level at the component class level.
The CLI passes the configured log level (`--log-level`, `-v`, or `-d`
options) when it calls the bt_graph_add_*_component() functions. As of
this patch, it also still sets the known log level environment
variables.
Python bindings are adjusted accordingly. Their tests are not changed
because the log level parameter is optional (defaults to
`bt2.LoggingLevel.NONE`) and it's the last one of
bt2.Graph.add_component(). The constructor of `bt2.ComponentSpec` also
accepts a new, optional log level parameter to configure the component
specifier as such. You can access the log level of a component with the
new `logging_level` property.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: If258335f46ffabb587dd777b5109fc66d8a59f54
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1454
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 01:14:06 +0000 (21:14 -0400)]
Add internal bt_common_logging_level_string()
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I6fd26a0657d93efc8a30d6055d755c5e2b852f2e
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1453
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 01:09:51 +0000 (21:09 -0400)]
cli: use log level integer instead of letter in configuration
This patch makes `struct bt_config` have an integer log level (to be set
to one of the `BT_LOG_*` values) instead of a letter. The
bt_log_get_letter_from_level() and bt_log_get_level_from_letter() can be
used to translate from/to a log level letter/integer, so we use that.
This is just cleaner and makes more sense than carrying a letter in the
configuration which is just one encoding of a log level value.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I5cbc3f2cb9ac868bc99e9458468a09c58e716884
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1452
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Sat, 15 Jun 2019 01:06:03 +0000 (21:06 -0400)]
src/logging/log.h: add utility functions for log level to/from string
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I389b5da1a574523a986d2884126b8f862765d914
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1451
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Fri, 14 Jun 2019 21:29:56 +0000 (17:29 -0400)]
Logging: standardize logging tags
Use `/` to show the subsystem to source file hierarchy, and use typical
component class identifier, but in uppercase (for example,
`SRC.CTF.FS`).
See the changes in `CONTRIBUTING.adoc` for more details.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I94aaf431e6a93e607496267c54419b012564daaf
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1449
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
Philippe Proulx [Fri, 14 Jun 2019 21:15:27 +0000 (17:15 -0400)]
configure.ac: change default minimal log level from VERBOSE to DEBUG
The goal here is that Babeltrace users have enough logging by default
without impacting the performance too much. From what I measured once
this patch is applied, the performance is very similar to an INFO build.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I20346f0f3eecf725e730a3e5add94804637c7193
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1445
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Fri, 14 Jun 2019 21:13:59 +0000 (17:13 -0400)]
sink.text.pretty: remove message iterator inactivity message logging
This is not the role of this component class. A detailed component
class, `sink.text.details`, shows all the messages.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ic01b766a81fd622fc768d71f70aec4b4a136c3d0
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1444
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Fri, 14 Jun 2019 21:12:36 +0000 (17:12 -0400)]
lib: plugin.h: force header user to include "lib/logging.h"
This pattern is found in other headers where, instead of including the
logging header for the user, we ask her to set up the logging and then
include the header.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I922b09f63eff41b9c3ba30df7ace0b8b30b5b5b2
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1443
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Fri, 14 Jun 2019 21:11:40 +0000 (17:11 -0400)]
Logging: check `BT_DEBUG_MODE` instead of `NDEBUG`
This project does not rely on `NDEBUG`.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I35b282711f373998ea8361b343e9abf32fb6390c
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1442
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Fri, 14 Jun 2019 21:10:26 +0000 (17:10 -0400)]
lib: `component-class-sink-colander.c`: remove useless `void *` cast
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Iddd16093dbdd9236151d948f09afe084c5685a6f
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1441
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Fri, 14 Jun 2019 21:08:08 +0000 (17:08 -0400)]
Rename: <some/internal-header.h> -> "some/internal-header.h"
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Icad3fb88de3c5c2e6658c44dc00ece97cb1096b8
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1440
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Philippe Proulx [Fri, 14 Jun 2019 20:58:49 +0000 (16:58 -0400)]
Standardize log levels used by logging statements across the project
Let's use this approach now:
INFO level:
Any useful information which a non-developer user would possibly
understand.
Anything logged with this level must _not_ happen repetitively on
the fast path, that is, nothing related to each message, for
example. This level is used for sporadic and one-shot events.
* CLI or component configuration report.
* Successful plugin, component, or message iterator initialization.
* In the library: anything related to plugins, graphs, component
classes, components, message iterators, connections, and ports
which is not on the fast path.
* Successful connection to or disconnection from another system.
* An _optional_ subsystem cannot be loaded.
* An _optional_ field/datum cannot be found.
DEBUG level:
Something that only Babeltrace developers would be interested into,
which can occur on the fast path, but not more often than once per
message.
* Object construction and destruction.
* Object recycling (except fields).
* Object copying (except fields and values).
* Object freezing (whatever the type, as freezing only occurs in
developer mode).
* Object cancellation.
* Calling user methods and logging the result.
* Setting object properties (except fields and values).
VERBOSE level:
Low-level debugging context information (anything that does not fit
the other log levels). More appropriate for tracing in general.
* Reference count change.
* Fast path, low level state machine's state change.
* Get or set an object's property.
* Object comparison's intermediate results.
This will also be written in `CONTRIBUTING.adoc` by another patch.
The goal here is to make the DEBUG level the default minimal, build-time
log level, so that Babeltrace users have enough logging by default
without impacting the performance too much. From what I measured once
this patch is applied, the performance is very similar to an INFO build.
Many DEBUG logging statements are upgraded to the INFO level because
they only occur once, or very rarely, and consist of interesting
information for someone who does not have deep knowledge of the
Babeltrace source code.
Many VERBOSE logging statements are upgraded to the DEBUG level so that,
by default, we have more information in the log file of someone who
needs support. Those statements are executed seldom enough (at most once
per message) to be promoted as such.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Icdd1ec8f1f54396eea5588968d85e446030f282d
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1439
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Philippe Proulx [Mon, 17 Jun 2019 20:48:53 +0000 (16:48 -0400)]
bt2: message_iterator.py: packet beginning/end messages have a single CS
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ia650a2e33483a999216aaf15dccecc5196bb4876
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1483
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Philippe Proulx [Fri, 14 Jun 2019 02:22:26 +0000 (22:22 -0400)]
bt2: stream activity messages: create with unknown/infinite default CS
This patch makes it possible to create stream activity beginning and end
messages with unknown or infinite default clock snapshots. It was
already possible to create them with known default clock snapshots, that
is, with a value.
With this patch, you pass either `self._unknown_clock_snapshot` or
`self._infinite_clock_snapshot`, when implementing a
`bt2._UserMessageIterator`, as the default clock snapshot when you call
self._create_stream_activity_beginning_message() or
self._create_stream_activity_end_message(). They are instances of
internal types which are only used for this. The creation methods use
`_unknown_clock_snapshot` by default. This is similar to how
bt_message_stream_activity_beginning_create() and
bt_message_stream_activity_end_create() create messages with unknown
default clock snapshots.
`test_message.py` tests the new feature.
Also in this patch: `_BaseClockSnapshot` does not inherit
`object._UniqueObject` anymore so that `_UnknownClockSnapshot` and
`_InfiniteClockSnapshot` do not either. This is so that the default
clock snapshot properties of the stream activity beginning/end messages
can return instances of those types without having actual native
pointers, because there are none.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I56d5cd9fffb77d505f61522073aaf80ccd58eb8e
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1430
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Philippe Proulx [Thu, 13 Jun 2019 15:22:26 +0000 (11:22 -0400)]
Put `flt.lttng-utils.debug-info` tests into their own directory
The goal is to have each component class tests in their own directory
under `tests/plugins`.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I3f68d2af9087690c6a34d238197c9bb9e96b021c
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1423
Tested-by: jenkins
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
Philippe Proulx [Thu, 13 Jun 2019 15:13:13 +0000 (11:13 -0400)]
Remove unused `tests/plugins/test_utils_muxer_complete.in`
This script was the runner for the `flt.utils.muxer` test running in C,
which does not exist anymore. We'll write `flt.utils.muxer` tests either
in Python or with `sink.text.details` and expectation files.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I28df6d20c3bd3ee0b056790046d041787e702430
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1422
Tested-by: jenkins
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
Philippe Proulx [Tue, 11 Jun 2019 23:08:46 +0000 (19:08 -0400)]
Add facilities to test CLI and plugin regressions with expectation files
This patch adds `tests/utils/diff.sh.in` (which becomes
`tests/utils/diff.sh`) which contains shell functions to use the CLI and
a `sink.text.details` component to easily test the CLI itself and
plugins for regressions with expectation files.
There are three functions in `tests/utils/diff.sh.in`:
bt_diff_cli():
Compares the output of the CLI with specific arguments to the
content of a file.
bt_diff_details_ctf_single():
Compares the output of the CLI using an `src.ctf.fs` component to
open a specific CTF trace and a `sink.text.details` component to the
content of a file.
bt_diff_details_ctf_gen_single():
Like bt_diff_details_ctf_single(), but runs a given CTF trace
generating program instead of using an existing CTF trace.
When there's any difference, the functions write the full diff to the
standard error. This makes it possible to look at what's wrong in the
CI.
`tests/plugins/ctf` is moved to `tests/plugins/src.ctf.fs` to indicate
that we're testing this specific component class. The specific query
tests are moved to `tests/plugins/src.ctf.fs/query`.
`tests/plugins/src.ctf.fs/diff/test_diff.in` uses `tests/utils/diff.sh`
to show how to use bt_diff_details_ctf_single() and
bt_diff_details_ctf_gen_single().
The functions test_ctf_single() and test_ctf_gen_single() use resp.
bt_diff_details_ctf_single() and bt_diff_details_ctf_gen_single() to
compare the given CTF traces using a `sink.text.details` component to
expectation files ending with `.expect` in the same directory.
In both test_ctf_single() and test_ctf_gen_single(), we make the
`sink.text.details` component hide the trace and stream names because
`src.ctf.fs` puts absolute paths in them. For test_ctf_gen_single(), we
also make the `sink.text.details` component hide UUIDs because CTF
writer creates random ones by default.
More specifically, this line:
test_ctf_gen_single simple
means:
1. Run the program `gen-trace-simple` in the same directory to generate
a CTF trace.
2. Get the output of:
babeltrace2 /path/to/trace -c sink.text.details \
-p with-uuid=no,with-trace-name=no,with-stream-name=no
3. Compare the content of 2. to the file `trace-simple.expect` in the
same directory.
This line:
test_ctf_single smalltrace
means:
1. Get the output of:
babeltrace2 "$BTDIR/tests/ctf-traces/succeed/smalltrace" \
-c sink.text.details \
-p with-trace-name=no,with-stream-name=no
2. Compare the content of 1. to the file `trace-smalltrace.expect` in
the same directory.
Eventually, we can move the test_ctf_gen_single() and test_ctf_single()
functions outside the `src.ctf.fs` tests to make them available to test
other plugins and parts of the project. They are placed there for the
moment because only the `src.ctf.fs` tests need them.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I53660111c23117926e3ee114b5d0cd060fff87d3
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1414
Tested-by: jenkins
Philippe Proulx [Sat, 8 Jun 2019 00:26:34 +0000 (20:26 -0400)]
Add `sink.text.details`, a testing textual sink which prints details
This patch adds a new sink component class, `sink.text.details`. Such
a sink component prints all the messages and their details, including
the full metadata objects, in a deterministic way.
You can test it easily like this:
babeltrace2 /path/to/trace -c sink.text.details
The purpose of this sink is to use it for regression testing using the
following approach:
1. Run the `babeltrace2` program with a `sink.text.details` component,
providing a known input trace to the graph, for example a CTF trace
with `src.ctf.fs`. The graph can include one or more filters with
specific parameters to test them specifically.
2. Inspect the output with your human eyes and brain. Verify that
everything is as expected. It is possible that, for a given test,
some elements of the output are less important (for example, the
metadata objects or the message times): there are component
parameters to remove parts of the output to reduce the noise.
3. Save the output of 2. to a file.
4. Create a test which runs 1. with the same input and compares its
output to the file saved in 3. Any regression will show up as a
difference between both inputs.
Step 2. is particularly important because this is where you validate
that the output shows what you expect from the graph. To make this
easier, I tried to make the output format of `sink.text.details` as
human-readable as possible:
* The component optionally colorizes the output. This is the default
when the terminal supports it. There's no color codes by default when
you redirect the output.
* The component honors the preferred display base of integer fields and
prepends the typical `0x` and `0` prefixes.
* The component inserts digit separators to make it easier to read large
numbers, for example `102,354,895,784,619` and `0x7f4d:d04f:c636`.
* The component does not print the metadata objects interlaced with the
data and message objects. I found that this was noisy, for example
showing all the integer field class details for each integer field
when what you really want is to inspect the event payloads from one
message to the other.
Instead, I chose to print trace classes, stream classes, and event
classes only once, and before the message which is associated to them.
This typically occurs before a stream beginning message, but for event
classes, it can also occur before an event message, as a source can
add event classes to an existing stream class.
* The component assigns a unique ID to each trace object to follow the
messages associated to a specific stream more easily, as many streams
can share the same ID, across difference traces or even with the same
trace, when they have different stream classes.
The component prints this unique trace ID, as well as the stream
class and stream IDs, before each message type as such
(`{Trace 1, Stream class ID 0, Stream ID 2}` in the following
example):
[102,354,895,784,619 cycles, 1,441,852,773,172,610,636 ns from origin]
{Trace 1, Stream class ID 0, Stream ID 2}
Event `lttng_ust_statedump:build_id` (Class ID 56):
Common context:
vpid: 17,868
ip: 0x7f4d:d04f:c636
Payload:
baddr: 0x7f4d:d02d:1000
...
A unique trace ID is never reused for two different traces within the
lifetime of a `sink.text.details` component.
You can track all the messages of a given stream with this unique
tuple. For example, you can find the last packet beginning message for
the packet of a given event message having unique trace ID 0, stream
class ID 2, and stream ID 5 by finding the last
{Trace 0, Stream class ID 2, Stream ID 5}
Packet beginning
string.
This makes it possible to avoid redundancy and reduce textual noise in
the printed messages. For example, the component does not print the
packet context field for each event message, but only for the packet
beginning message.
In order to make step 4. continue to work in the future and really test
regressions, the output of step 1. must always be the same
(deterministic). For `sink.text.details`, this means:
* The component does not print run-time addresses.
* The component sorts mappings of enumeration field classes (by label),
and ranges within such mappings, before it prints them.
* The component sorts event classes of stream classes (by ID) before
it prints them.
* The component sorts stream classes of trace classes (by ID) before
it prints them.
* The component sorts streams of traces (by ID and class ID) before
it prints them.
* The component sorts environment entries of trace classes (by name)
before it prints them.
To make step 3. easier, the component does not print trailing spaces
or trailing empty lines.
A `sink.text.details` component can also be used for support if we want
all the details of a given graph's output.
The available component parameters are:
`color`:
`never`, `auto`, or `always` (just like `sink.text.pretty`).
Default: `auto`
`with-metadata`:
True to print metadata objects (only the first time they are
encountered).
Default: true
`with-time`:
True to print message times.
Default: true
`with-trace-class-name`:
True to print trace class names.
Default: true
`with-trace-name`:
True to print trace names.
Default: true
`with-stream-class-name`:
True to print stream class names.
Default: true
`with-stream-name`:
True to print stream names.
Default: true
`with-uuid`:
True to print UUIDs.
Default: true
`compact`:
True to make the output compact (one message per line, no property
names).
Default: false
This patch does not add the facilities to create tests easily using the
CLI and a `sink.text.details` component: this is reserved for a future
patch.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I9cc39cdfe44436974600388342029a2e4e2acb76
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1412
Tested-by: jenkins
Reviewed-by: Simon Marchi <simon.marchi@efficios.com>
Philippe Proulx [Tue, 11 Jun 2019 14:59:56 +0000 (10:59 -0400)]
Add bt_common_sep_digits()
This new utility function adds digit separators to a string representing
a number. For example, `
1983291832` can become `1,983,291,832`.
See the function's comment for more details.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I39dedc69fbc76b31252a64c68261a35d8ac7c7a8
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1411
Tested-by: jenkins
Michael Jeanson [Fri, 14 Jun 2019 21:15:23 +0000 (17:15 -0400)]
fix: Add missing glib include on MINGW
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I4b8486406270314f610e6001eba854ddd189983c
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1437
Tested-by: jenkins
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Michael Jeanson [Thu, 13 Jun 2019 18:23:20 +0000 (14:23 -0400)]
tests: Move ctf-writer to it's own directory
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I4033b31392867c468419aa43f31675af3842c6f1
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1427
Tested-by: jenkins
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Michael Jeanson [Thu, 13 Jun 2019 18:10:51 +0000 (14:10 -0400)]
tests: Move libtestcommon to utils
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I4efe6edae5d70921cbfb106f5184c58f7e2e5abb
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1426
Tested-by: jenkins
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Michael Jeanson [Thu, 13 Jun 2019 15:09:29 +0000 (11:09 -0400)]
Cleanup: remove plugin-common.h
It was only used to define 'UNUSED_VAR' which we can use literally.
Change-Id: Idf84f6ecee711e2caf4b7d68f5e6f598b0aca22e
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1425
Tested-by: jenkins
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Michael Jeanson [Wed, 12 Jun 2019 22:09:37 +0000 (18:09 -0400)]
Cleanup: remove private babeltrace.h
* Remove unused macros
* Replace duplicated macros with their glib equivalent
* Move the *safe* static inlines to their own header
* Namespace the remaining macros and move them to macros.h
* Explicitly include 'common/macros.h' in all private headers that use
'BT_HIDDEN'.
* Remove BT_UNUSED, the attribute is a hard requirement anyway
* Remove zmalloc and replace the only callsite with calloc
Change-Id: I1bd765ad27c808c8bbe5ef232062267cb4a230d9
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1424
Tested-by: jenkins
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Michael Jeanson [Thu, 13 Jun 2019 14:50:42 +0000 (10:50 -0400)]
fix: Static build fails with ctfser missing symbols
Spliting the ctf-writer from the main library had the side effect of not
including the ctfser convience library in the main lib anymore. Thus it
should now be linked with the binairies to satisfy the dependencies when
we statically link the plugins in.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I4626dcabce1914f0af2287afe8c3fcf7b7db9946
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1421
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Michael Jeanson [Mon, 10 Jun 2019 21:44:09 +0000 (17:44 -0400)]
Re-organize sources
* Create a top-level 'src' directory.
* Move all private headers from the public include directory to the
'src' directory.
* Rename all those private headers to remove the 'internal' notation.
* Use double quotes in `#include` directives when including a private
header so that we can easily know.
Change-Id: I05fbb81d969b3735aaf303ec2c222be7142c19ab
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1413
Tested-by: jenkins
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Michael Jeanson [Wed, 12 Jun 2019 14:50:30 +0000 (10:50 -0400)]
tap-driver.sh: flush stdout after each test result
This is useful in a CI system where stdout is fully buffered and you
look at the console output to see which test is hanging.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I998b83347ca2445f46c3e195b797ce75b0096adb
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1415
Tested-by: jenkins
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Francis Deslauriers [Mon, 10 Jun 2019 16:30:10 +0000 (12:30 -0400)]
Fix: src.ctf.fs: increment packet offset before init of index entry
Issue
=====
The `current_packet_offset_bytes` variable is incremented before the
initialization of the current `index_entry` by `init_index_entry()`.
This lead to each entry having the offset of the next entry and the last
entry having a erroneous offset.
Solution
========
Increment the `current_packet_offset_bytes` variable after the
initialization of each entry.
Drawbacks
=========
None.
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Change-Id: I7592b2d70f402aa413de97a687bfe4fe1bf1b825
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1409
Tested-by: jenkins
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Michael Jeanson [Fri, 7 Jun 2019 16:25:10 +0000 (12:25 -0400)]
ctf-writer: externalize libbabeltrace2-ctf-writer
Completely split the ctf writer part from the main babeltrace2 library.
* Remove the obsolete libbabeltrace2-ctf library
* Add a new libbabeltrace2-ctf-writer library
* Remove the ctf writer includes from the main include file
* Fork an internal copy of assert-pre.h that doesn't use the library
structures.
* Add a logging context specific to ctf writer
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: Iff9ab62ee9eeb8abd290fb1d758a73050e21c99b
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1410
Tested-by: jenkins
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Michael Jeanson [Thu, 30 May 2019 15:35:17 +0000 (11:35 -0400)]
Cleanup: Move build logic to python-plugin-provider Makefile
Simplify the root Makefile, group the python provider build logic in a
single Makefile.
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I580a3577e0a84f5b6e624ed2ed74a56a0b6b3960
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1353
Tested-by: jenkins
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Michael Jeanson [Thu, 30 May 2019 15:36:26 +0000 (11:36 -0400)]
Cleanup: remove useless Makefiles from extras
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Change-Id: I8eaf99fab641f264699c16b2069b81c16e27bda5
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1354
CI-Build: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Philippe Proulx [Sat, 8 Jun 2019 00:31:02 +0000 (20:31 -0400)]
Fix: use `babeltrace2` instead of `babeltrace` in plugin paths
This was overlooked when renaming some parts of the project from
`babeltrace` to `babeltrace2` recently.
Basically it made the project not work when installed.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ie1079cee61d6cb6b9bc3787332e4635ee738542f
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1408
Philippe Proulx [Fri, 7 Jun 2019 15:13:35 +0000 (11:13 -0400)]
Fix: doc/bindings/python/Makefile.am: run the `sphinx` Python 3 package
In `sphinx-build.py` (removed), importing `main` and `make_main` from
the `sphinx` package is not considered stable: it used to work for me,
but now it doesn't (cannot import). Instead, run the `sphinx` package
directly with the Python interpreter's `-m` option.
We do this instead of running `sphinx-build` directly because we want to
pick Sphinx for Python 3 (because we're importing the `bt2` package for
autodoc), not for Python 2, and the installed `sphinx-build` program can
be the one for Python 2 on some distributions.
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I158dbb96a8b3a26db67dd6e16254a64ac9d24446
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1401
This page took 0.050697 seconds and 4 git commands to generate.