From 3fadfbc0c91f82c46bd36e6e0657ea93570c9db1 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 4 Jun 2019 15:39:50 -0400 Subject: [PATCH] lib: rename include dir to babeltrace2 Rename the include dir to be co-installable with bt1. Change-Id: Icb9a048988544eaca7054648b9c7a9e76d70b9db Signed-off-by: Michael Jeanson Reviewed-on: https://review.lttng.org/c/babeltrace/+/1405 Tested-by: jenkins Reviewed-by: Philippe Proulx --- CONTRIBUTING.adoc | 22 +- bindings/python/bt2/bt2/logging.c | 2 +- bindings/python/bt2/bt2/logging.h | 2 +- bindings/python/bt2/bt2/native_bt.i | 6 +- bindings/python/bt2/bt2/native_bt_logging.i | 2 +- cli/babeltrace2-cfg-cli-args-connect.c | 4 +- cli/babeltrace2-cfg-cli-args-connect.h | 2 +- cli/babeltrace2-cfg-cli-args-default.c | 2 +- cli/babeltrace2-cfg-cli-args.c | 6 +- cli/babeltrace2-cfg-cli-args.h | 8 +- cli/babeltrace2-cfg.c | 4 +- cli/babeltrace2-cfg.h | 8 +- cli/babeltrace2-log.c | 4 +- cli/babeltrace2.c | 4 +- cli/logging.c | 2 +- cli/logging.h | 2 +- common/assert.c | 4 +- common/common.c | 8 +- common/logging.c | 2 +- common/logging.h | 2 +- compat/compat_mman.c | 2 +- compat/compat_uuid.c | 2 +- compat/logging.c | 2 +- compat/logging.h | 2 +- ctfser/ctfser.c | 12 +- ctfser/logging.c | 2 +- ctfser/logging.h | 2 +- doc/api/dox/examples-ctfir.dox | 10 +- doc/api/dox/includes-build.dox | 2 +- extras/gen-babeltrace-h.py | 4 +- fd-cache/fd-cache.c | 4 +- fd-cache/logging.c | 2 +- fd-cache/logging.h | 2 +- include/Makefile.am | 440 +++++++++--------- include/babeltrace/babeltrace.h | 155 ------ include/babeltrace/ctf-ir/event-fields.h | 2 - include/babeltrace/ctf-ir/stream-class.h | 2 - include/babeltrace/ctf/events.h | 7 - .../align-internal.h | 4 +- .../assert-internal.h | 2 +- .../assert-pre-internal.h | 12 +- .../babeltrace-internal.h | 4 +- include/babeltrace2/babeltrace.h | 156 +++++++ .../bitfield-internal.h | 4 +- .../common-internal.h | 14 +- .../compat/fcntl-internal.h | 0 .../compat/glib-internal.h | 0 .../compat/limits-internal.h | 0 .../compat/memstream-internal.h | 2 +- .../compat/mman-internal.h | 0 .../compat/socket-internal.h | 0 .../compat/stdio-internal.h | 2 +- .../compat/stdlib-internal.h | 0 .../compat/string-internal.h | 0 .../compat/time-internal.h | 0 .../compat/unistd-internal.h | 0 .../compat/utc-internal.h | 0 .../compat/uuid-internal.h | 0 .../compiler-internal.h | 0 .../ctf-ir/clock.h | 2 +- include/babeltrace2/ctf-ir/event-fields.h | 2 + .../ctf-ir/event-types.h | 2 +- .../ctf-ir/event.h | 2 +- .../ctf-ir/field-types.h | 2 +- .../ctf-ir/fields.h | 2 +- include/babeltrace2/ctf-ir/stream-class.h | 2 + .../ctf-ir/stream.h | 2 +- .../ctf-ir/trace.h | 2 +- .../ctf-ir/utils.h | 2 +- .../ctf-writer/attributes-internal.h | 4 +- .../ctf-writer/clock-class-internal.h | 10 +- .../ctf-writer/clock-class.h | 0 .../ctf-writer/clock-internal.h | 12 +- .../ctf-writer/clock.h | 4 +- .../ctf-writer/event-class-internal.h | 20 +- .../ctf-writer/event-fields.h | 6 +- .../ctf-writer/event-internal.h | 32 +- .../ctf-writer/event-types.h | 4 +- .../ctf-writer/event.h | 2 +- .../ctf-writer/field-path-internal.h | 8 +- .../ctf-writer/field-types-internal.h | 14 +- .../ctf-writer/field-types.h | 2 +- .../ctf-writer/field-wrapper-internal.h | 6 +- .../ctf-writer/fields-internal.h | 18 +- .../ctf-writer/fields.h | 0 .../ctf-writer/functor-internal.h | 2 +- .../ctf-writer/object-internal.h | 4 +- .../ctf-writer/object-pool-internal.h | 2 +- .../ctf-writer/object.h | 2 +- .../ctf-writer/resolve-internal.h | 8 +- .../ctf-writer/stream-class-internal.h | 22 +- .../ctf-writer/stream-class.h | 2 +- .../ctf-writer/stream-internal.h | 16 +- .../ctf-writer/stream.h | 0 .../ctf-writer/trace-internal.h | 26 +- .../ctf-writer/trace.h | 0 .../ctf-writer/utils-internal.h | 8 +- .../ctf-writer/utils.h | 2 +- .../ctf-writer/validation-internal.h | 4 +- .../ctf-writer/values-internal.h | 2 +- .../ctf-writer/visitor-internal.h | 4 +- .../ctf-writer/visitor.h | 2 +- .../ctf-writer/writer-internal.h | 8 +- .../ctf-writer/writer.h | 8 +- include/babeltrace2/ctf/events.h | 7 + .../ctfser-internal.h | 16 +- .../endian-internal.h | 0 .../fd-cache-internal.h | 2 +- .../graph/component-class-const.h | 2 +- .../graph/component-class-filter-const.h | 2 +- .../graph/component-class-filter.h | 10 +- .../graph/component-class-internal.h | 18 +- .../component-class-sink-colander-internal.h | 4 +- .../graph/component-class-sink-const.h | 2 +- .../graph/component-class-sink.h | 8 +- .../graph/component-class-source-const.h | 2 +- .../graph/component-class-source.h | 10 +- .../graph/component-class.h | 6 +- .../graph/component-const.h | 4 +- .../graph/component-filter-const.h | 2 +- .../graph/component-filter-internal.h | 8 +- .../graph/component-internal.h | 14 +- .../graph/component-sink-const.h | 2 +- .../graph/component-sink-internal.h | 10 +- .../graph/component-source-const.h | 2 +- .../graph/component-source-internal.h | 6 +- .../graph/connection-const.h | 2 +- .../graph/connection-internal.h | 10 +- .../graph/graph-const.h | 2 +- .../graph/graph-internal.h | 18 +- .../{babeltrace => babeltrace2}/graph/graph.h | 4 +- .../graph/message-const.h | 2 +- .../graph/message-discarded-events-const.h | 2 +- .../graph/message-discarded-events.h | 2 +- .../graph/message-discarded-items-internal.h | 8 +- .../graph/message-discarded-packets-const.h | 2 +- .../graph/message-discarded-packets.h | 2 +- .../graph/message-event-const.h | 2 +- .../graph/message-event-internal.h | 10 +- .../graph/message-event.h | 2 +- .../graph/message-internal.h | 16 +- .../graph/message-iterator-const.h | 0 .../graph/message-iterator-internal.h | 14 +- ...essage-message-iterator-inactivity-const.h | 2 +- ...age-message-iterator-inactivity-internal.h | 4 +- .../message-message-iterator-inactivity.h | 2 +- .../graph/message-packet-beginning-const.h | 2 +- .../graph/message-packet-beginning.h | 2 +- .../graph/message-packet-end-const.h | 2 +- .../graph/message-packet-end.h | 2 +- .../graph/message-packet-internal.h | 10 +- .../message-stream-activity-beginning-const.h | 4 +- .../graph/message-stream-activity-beginning.h | 4 +- .../graph/message-stream-activity-const.h | 0 .../graph/message-stream-activity-end-const.h | 4 +- .../graph/message-stream-activity-end.h | 4 +- .../graph/message-stream-activity-internal.h | 8 +- .../graph/message-stream-beginning-const.h | 2 +- .../graph/message-stream-beginning.h | 2 +- .../graph/message-stream-end-const.h | 2 +- .../graph/message-stream-end.h | 2 +- .../graph/message-stream-internal.h | 10 +- .../graph/port-const.h | 2 +- .../graph/port-input-const.h | 2 +- .../graph/port-internal.h | 2 +- .../graph/port-output-const.h | 2 +- .../graph/port-output-message-iterator.h | 4 +- .../graph/query-executor-const.h | 2 +- .../graph/query-executor-internal.h | 8 +- .../graph/query-executor.h | 4 +- .../graph/self-component-class-filter.h | 2 +- .../graph/self-component-class-sink.h | 2 +- .../graph/self-component-class-source.h | 2 +- .../graph/self-component-filter.h | 4 +- ...lf-component-port-input-message-iterator.h | 4 +- .../graph/self-component-port-input.h | 2 +- .../graph/self-component-port-output.h | 2 +- .../graph/self-component-port.h | 2 +- .../graph/self-component-sink.h | 4 +- .../graph/self-component-source.h | 4 +- .../graph/self-component.h | 2 +- .../graph/self-message-iterator.h | 4 +- .../lib-logging-internal.h | 4 +- .../list-internal.h | 0 .../logging-internal.h | 22 +- include/{babeltrace => babeltrace2}/logging.h | 2 +- .../mmap-align-internal.h | 6 +- .../object-internal.h | 4 +- .../object-pool-internal.h | 2 +- .../plugin/plugin-const.h | 4 +- .../plugin/plugin-dev.h | 10 +- .../plugin/plugin-internal.h | 18 +- .../plugin/plugin-set-const.h | 2 +- .../plugin/plugin-so-internal.h | 2 +- .../plugin/python-plugin-provider-internal.h | 2 +- .../prio-heap-internal.h | 2 +- .../property-internal.h | 6 +- .../{babeltrace => babeltrace2}/property.h | 0 .../trace-ir/attributes-internal.h | 4 +- .../trace-ir/clock-class-const.h | 2 +- .../trace-ir/clock-class-internal.h | 18 +- .../trace-ir/clock-class.h | 4 +- .../trace-ir/clock-snapshot-const.h | 2 +- .../trace-ir/clock-snapshot-internal.h | 8 +- .../trace-ir/clock-snapshot-set-internal.h | 6 +- .../trace-ir/event-class-const.h | 4 +- .../trace-ir/event-class-internal.h | 26 +- .../trace-ir/event-class.h | 4 +- .../trace-ir/event-const.h | 2 +- .../trace-ir/event-internal.h | 30 +- .../trace-ir/event.h | 4 +- .../trace-ir/field-class-const.h | 2 +- .../trace-ir/field-class-internal.h | 12 +- .../trace-ir/field-class.h | 4 +- .../trace-ir/field-const.h | 4 +- .../trace-ir/field-internal.h | 14 +- .../trace-ir/field-path-const.h | 2 +- .../trace-ir/field-path-internal.h | 6 +- .../trace-ir/field-wrapper-internal.h | 6 +- .../trace-ir/field.h | 4 +- .../trace-ir/packet-const.h | 4 +- .../trace-ir/packet-context-field.h | 2 +- .../trace-ir/packet-internal.h | 18 +- .../trace-ir/packet.h | 4 +- .../trace-ir/resolve-field-path-internal.h | 6 +- .../trace-ir/stream-class-const.h | 2 +- .../trace-ir/stream-class-internal.h | 16 +- .../trace-ir/stream-class.h | 4 +- .../trace-ir/stream-const.h | 2 +- .../trace-ir/stream-internal.h | 10 +- .../trace-ir/stream.h | 4 +- .../trace-ir/trace-class-const.h | 2 +- .../trace-ir/trace-class-internal.h | 26 +- .../trace-ir/trace-class.h | 4 +- .../trace-ir/trace-const.h | 2 +- .../trace-ir/trace-internal.h | 28 +- .../trace-ir/trace.h | 4 +- .../trace-ir/utils-internal.h | 6 +- include/{babeltrace => babeltrace2}/types.h | 2 +- include/{babeltrace => babeltrace2}/util.h | 0 .../{babeltrace => babeltrace2}/value-const.h | 2 +- .../value-internal.h | 8 +- include/{babeltrace => babeltrace2}/value.h | 4 +- include/{babeltrace => babeltrace2}/version.h | 0 lib/babeltrace2.c | 4 +- lib/ctf-writer/attributes.c | 18 +- lib/ctf-writer/clock-class.c | 24 +- lib/ctf-writer/clock.c | 22 +- lib/ctf-writer/event-class.c | 46 +- lib/ctf-writer/event.c | 46 +- lib/ctf-writer/field-path.c | 10 +- lib/ctf-writer/field-types.c | 34 +- lib/ctf-writer/field-wrapper.c | 10 +- lib/ctf-writer/fields.c | 26 +- lib/ctf-writer/functor.c | 4 +- lib/ctf-writer/object-pool.c | 6 +- lib/ctf-writer/object.c | 2 +- lib/ctf-writer/resolve.c | 24 +- lib/ctf-writer/stream-class.c | 44 +- lib/ctf-writer/stream.c | 38 +- lib/ctf-writer/trace.c | 50 +- lib/ctf-writer/utils.c | 12 +- lib/ctf-writer/validation.c | 26 +- lib/ctf-writer/values.c | 22 +- lib/ctf-writer/visitor.c | 4 +- lib/ctf-writer/writer.c | 30 +- lib/graph/component-class-sink-colander.c | 22 +- lib/graph/component-class.c | 30 +- lib/graph/component-filter.c | 24 +- lib/graph/component-sink.c | 22 +- lib/graph/component-source.c | 26 +- lib/graph/component.c | 46 +- lib/graph/connection.c | 24 +- lib/graph/graph.c | 44 +- lib/graph/iterator.c | 88 ++-- lib/graph/message/discarded-items.c | 32 +- lib/graph/message/event.c | 34 +- .../message/message-iterator-inactivity.c | 20 +- lib/graph/message/message.c | 12 +- lib/graph/message/packet.c | 36 +- lib/graph/message/stream-activity.c | 30 +- lib/graph/message/stream.c | 28 +- lib/graph/port.c | 30 +- lib/graph/query-executor.c | 26 +- lib/lib-logging.c | 84 ++-- lib/logging.c | 6 +- lib/object-pool.c | 8 +- lib/plugin/plugin-so.c | 32 +- lib/plugin/plugin.c | 28 +- lib/prio_heap/prio_heap.c | 6 +- lib/trace-ir/attributes.c | 22 +- lib/trace-ir/clock-class.c | 28 +- lib/trace-ir/clock-snapshot.c | 24 +- lib/trace-ir/event-class.c | 44 +- lib/trace-ir/event.c | 42 +- lib/trace-ir/field-class.c | 36 +- lib/trace-ir/field-path.c | 14 +- lib/trace-ir/field-wrapper.c | 10 +- lib/trace-ir/field.c | 24 +- lib/trace-ir/packet-context-field.c | 12 +- lib/trace-ir/packet.c | 32 +- lib/trace-ir/resolve-field-path.c | 16 +- lib/trace-ir/stream-class.c | 36 +- lib/trace-ir/stream.c | 30 +- lib/trace-ir/trace-class.c | 54 +-- lib/trace-ir/trace.c | 56 +-- lib/trace-ir/utils.c | 8 +- lib/util.c | 8 +- lib/value.c | 20 +- logging/log.c | 10 +- plugins/ctf/common/bfcr/bfcr.c | 10 +- plugins/ctf/common/bfcr/bfcr.h | 4 +- plugins/ctf/common/bfcr/logging.c | 2 +- plugins/ctf/common/bfcr/logging.h | 2 +- plugins/ctf/common/metadata/ast.h | 6 +- .../ctf/common/metadata/ctf-meta-resolve.c | 8 +- .../ctf/common/metadata/ctf-meta-translate.c | 6 +- .../ctf-meta-update-default-clock-classes.c | 6 +- .../common/metadata/ctf-meta-update-in-ir.c | 8 +- .../metadata/ctf-meta-update-meanings.c | 6 +- .../ctf-meta-update-stream-class-config.c | 6 +- .../ctf-meta-update-text-array-sequence.c | 6 +- .../ctf-meta-update-value-storing-indexes.c | 6 +- .../ctf/common/metadata/ctf-meta-validate.c | 6 +- .../ctf/common/metadata/ctf-meta-visitors.h | 4 +- .../ctf-meta-warn-meaningless-header-fields.c | 6 +- plugins/ctf/common/metadata/ctf-meta.h | 6 +- plugins/ctf/common/metadata/decoder.c | 8 +- plugins/ctf/common/metadata/decoder.h | 2 +- plugins/ctf/common/metadata/logging.c | 2 +- plugins/ctf/common/metadata/logging.h | 2 +- plugins/ctf/common/metadata/objstack.c | 6 +- plugins/ctf/common/metadata/parser.y | 4 +- .../ctf/common/metadata/visitor-generate-ir.c | 10 +- .../common/metadata/visitor-parent-links.c | 6 +- .../metadata/visitor-semantic-validator.c | 4 +- plugins/ctf/common/msg-iter/logging.c | 2 +- plugins/ctf/common/msg-iter/logging.h | 2 +- plugins/ctf/common/msg-iter/msg-iter.c | 6 +- plugins/ctf/common/msg-iter/msg-iter.h | 4 +- plugins/ctf/common/print.h | 2 +- plugins/ctf/common/utils/logging.c | 2 +- plugins/ctf/common/utils/logging.h | 2 +- plugins/ctf/common/utils/utils.h | 4 +- plugins/ctf/fs-sink/fs-sink-ctf-meta.h | 8 +- plugins/ctf/fs-sink/fs-sink-stream.c | 8 +- plugins/ctf/fs-sink/fs-sink-stream.h | 6 +- plugins/ctf/fs-sink/fs-sink-trace.c | 6 +- plugins/ctf/fs-sink/fs-sink-trace.h | 6 +- plugins/ctf/fs-sink/fs-sink.c | 6 +- plugins/ctf/fs-sink/fs-sink.h | 4 +- plugins/ctf/fs-sink/logging.c | 2 +- plugins/ctf/fs-sink/logging.h | 2 +- .../ctf/fs-sink/translate-ctf-ir-to-tsdl.c | 8 +- .../fs-sink/translate-trace-ir-to-ctf-ir.c | 8 +- .../fs-sink/translate-trace-ir-to-ctf-ir.h | 4 +- plugins/ctf/fs-src/data-stream-file.c | 10 +- plugins/ctf/fs-src/data-stream-file.h | 4 +- plugins/ctf/fs-src/file.h | 2 +- plugins/ctf/fs-src/fs.c | 8 +- plugins/ctf/fs-src/fs.h | 4 +- plugins/ctf/fs-src/logging.c | 2 +- plugins/ctf/fs-src/logging.h | 2 +- plugins/ctf/fs-src/lttng-index.h | 2 +- plugins/ctf/fs-src/metadata.c | 8 +- plugins/ctf/fs-src/metadata.h | 4 +- plugins/ctf/fs-src/query.c | 8 +- plugins/ctf/fs-src/query.h | 4 +- plugins/ctf/lttng-live/data-stream.c | 6 +- plugins/ctf/lttng-live/data-stream.h | 4 +- plugins/ctf/lttng-live/logging.c | 2 +- plugins/ctf/lttng-live/logging.h | 2 +- plugins/ctf/lttng-live/lttng-live.c | 8 +- plugins/ctf/lttng-live/lttng-live.h | 4 +- plugins/ctf/lttng-live/lttng-viewer-abi.h | 2 +- plugins/ctf/lttng-live/metadata.c | 4 +- plugins/ctf/lttng-live/metadata.h | 4 +- plugins/ctf/lttng-live/viewer-connection.c | 10 +- plugins/ctf/lttng-live/viewer-connection.h | 6 +- plugins/ctf/plugin.c | 2 +- plugins/lttng-utils/debug-info/bin-info.c | 2 +- plugins/lttng-utils/debug-info/bin-info.h | 4 +- plugins/lttng-utils/debug-info/crc32.h | 2 +- plugins/lttng-utils/debug-info/debug-info.c | 6 +- plugins/lttng-utils/debug-info/debug-info.h | 4 +- plugins/lttng-utils/debug-info/dwarf.h | 2 +- plugins/lttng-utils/debug-info/logging.c | 2 +- plugins/lttng-utils/debug-info/logging.h | 2 +- .../debug-info/trace-ir-data-copy.c | 2 +- .../debug-info/trace-ir-data-copy.h | 2 +- .../lttng-utils/debug-info/trace-ir-mapping.c | 6 +- .../lttng-utils/debug-info/trace-ir-mapping.h | 4 +- .../debug-info/trace-ir-metadata-copy.c | 2 +- .../debug-info/trace-ir-metadata-copy.h | 2 +- .../trace-ir-metadata-field-class-copy.c | 8 +- .../trace-ir-metadata-field-class-copy.h | 2 +- plugins/lttng-utils/debug-info/utils.h | 2 +- plugins/lttng-utils/plugin.c | 2 +- plugins/text/dmesg/dmesg.c | 12 +- plugins/text/dmesg/dmesg.h | 4 +- plugins/text/dmesg/logging.c | 2 +- plugins/text/dmesg/logging.h | 2 +- plugins/text/plugin.c | 2 +- plugins/text/pretty/logging.c | 2 +- plugins/text/pretty/logging.h | 2 +- plugins/text/pretty/pretty.c | 8 +- plugins/text/pretty/pretty.h | 4 +- plugins/text/pretty/print.c | 10 +- plugins/utils/counter/counter.c | 8 +- plugins/utils/counter/counter.h | 2 +- plugins/utils/counter/logging.c | 2 +- plugins/utils/counter/logging.h | 2 +- plugins/utils/dummy/dummy.c | 6 +- plugins/utils/dummy/dummy.h | 4 +- plugins/utils/muxer/logging.c | 2 +- plugins/utils/muxer/logging.h | 2 +- plugins/utils/muxer/muxer.c | 18 +- plugins/utils/muxer/muxer.h | 4 +- plugins/utils/plugin.c | 2 +- plugins/utils/trimmer/logging.c | 2 +- plugins/utils/trimmer/logging.h | 2 +- plugins/utils/trimmer/trimmer.c | 10 +- plugins/utils/trimmer/trimmer.h | 4 +- .../python-plugin-provider.c | 12 +- tests/lib/test-plugin-plugins/minimal.c | 2 +- tests/lib/test-plugin-plugins/sfs.c | 4 +- tests/lib/test_bitfield.c | 2 +- tests/lib/test_bt_values.c | 4 +- tests/lib/test_ctf_writer.c | 30 +- tests/lib/test_graph_topo.c | 4 +- tests/lib/test_plugin.c | 4 +- tests/lib/test_trace_ir_ref.c | 8 +- tests/plugins/test_bin_info.c | 4 +- 433 files changed, 2186 insertions(+), 2185 deletions(-) delete mode 100644 include/babeltrace/babeltrace.h delete mode 100644 include/babeltrace/ctf-ir/event-fields.h delete mode 100644 include/babeltrace/ctf-ir/stream-class.h delete mode 100644 include/babeltrace/ctf/events.h rename include/{babeltrace => babeltrace2}/align-internal.h (97%) rename include/{babeltrace => babeltrace2}/assert-internal.h (98%) rename include/{babeltrace => babeltrace2}/assert-pre-internal.h (90%) rename include/{babeltrace => babeltrace2}/babeltrace-internal.h (97%) create mode 100644 include/babeltrace2/babeltrace.h rename include/{babeltrace => babeltrace2}/bitfield-internal.h (99%) rename include/{babeltrace => babeltrace2}/common-internal.h (98%) rename include/{babeltrace => babeltrace2}/compat/fcntl-internal.h (100%) rename include/{babeltrace => babeltrace2}/compat/glib-internal.h (100%) rename include/{babeltrace => babeltrace2}/compat/limits-internal.h (100%) rename include/{babeltrace => babeltrace2}/compat/memstream-internal.h (99%) rename include/{babeltrace => babeltrace2}/compat/mman-internal.h (100%) rename include/{babeltrace => babeltrace2}/compat/socket-internal.h (100%) rename include/{babeltrace => babeltrace2}/compat/stdio-internal.h (98%) rename include/{babeltrace => babeltrace2}/compat/stdlib-internal.h (100%) rename include/{babeltrace => babeltrace2}/compat/string-internal.h (100%) rename include/{babeltrace => babeltrace2}/compat/time-internal.h (100%) rename include/{babeltrace => babeltrace2}/compat/unistd-internal.h (100%) rename include/{babeltrace => babeltrace2}/compat/utc-internal.h (100%) rename include/{babeltrace => babeltrace2}/compat/uuid-internal.h (100%) rename include/{babeltrace => babeltrace2}/compiler-internal.h (100%) rename include/{babeltrace => babeltrace2}/ctf-ir/clock.h (53%) create mode 100644 include/babeltrace2/ctf-ir/event-fields.h rename include/{babeltrace => babeltrace2}/ctf-ir/event-types.h (50%) rename include/{babeltrace => babeltrace2}/ctf-ir/event.h (53%) rename include/{babeltrace => babeltrace2}/ctf-ir/field-types.h (50%) rename include/{babeltrace => babeltrace2}/ctf-ir/fields.h (52%) create mode 100644 include/babeltrace2/ctf-ir/stream-class.h rename include/{babeltrace => babeltrace2}/ctf-ir/stream.h (52%) rename include/{babeltrace => babeltrace2}/ctf-ir/trace.h (53%) rename include/{babeltrace => babeltrace2}/ctf-ir/utils.h (53%) rename include/{babeltrace => babeltrace2}/ctf-writer/attributes-internal.h (95%) rename include/{babeltrace => babeltrace2}/ctf-writer/clock-class-internal.h (94%) rename include/{babeltrace => babeltrace2}/ctf-writer/clock-class.h (100%) rename include/{babeltrace => babeltrace2}/ctf-writer/clock-internal.h (85%) rename include/{babeltrace => babeltrace2}/ctf-writer/clock.h (99%) rename include/{babeltrace => babeltrace2}/ctf-writer/event-class-internal.h (96%) rename include/{babeltrace => babeltrace2}/ctf-writer/event-fields.h (94%) rename include/{babeltrace => babeltrace2}/ctf-writer/event-internal.h (90%) rename include/{babeltrace => babeltrace2}/ctf-writer/event-types.h (96%) rename include/{babeltrace => babeltrace2}/ctf-writer/event.h (99%) rename include/{babeltrace => babeltrace2}/ctf-writer/field-path-internal.h (92%) rename include/{babeltrace => babeltrace2}/ctf-writer/field-types-internal.h (98%) rename include/{babeltrace => babeltrace2}/ctf-writer/field-types.h (99%) rename include/{babeltrace => babeltrace2}/ctf-writer/field-wrapper-internal.h (91%) rename include/{babeltrace => babeltrace2}/ctf-writer/fields-internal.h (98%) rename include/{babeltrace => babeltrace2}/ctf-writer/fields.h (100%) rename include/{babeltrace => babeltrace2}/ctf-writer/functor-internal.h (97%) rename include/{babeltrace => babeltrace2}/ctf-writer/object-internal.h (98%) rename include/{babeltrace => babeltrace2}/ctf-writer/object-pool-internal.h (99%) rename include/{babeltrace => babeltrace2}/ctf-writer/object.h (99%) rename include/{babeltrace => babeltrace2}/ctf-writer/resolve-internal.h (93%) rename include/{babeltrace => babeltrace2}/ctf-writer/stream-class-internal.h (96%) rename include/{babeltrace => babeltrace2}/ctf-writer/stream-class.h (98%) rename include/{babeltrace => babeltrace2}/ctf-writer/stream-internal.h (89%) rename include/{babeltrace => babeltrace2}/ctf-writer/stream.h (100%) rename include/{babeltrace => babeltrace2}/ctf-writer/trace-internal.h (94%) rename include/{babeltrace => babeltrace2}/ctf-writer/trace.h (100%) rename include/{babeltrace => babeltrace2}/ctf-writer/utils-internal.h (97%) rename include/{babeltrace => babeltrace2}/ctf-writer/utils.h (98%) rename include/{babeltrace => babeltrace2}/ctf-writer/validation-internal.h (98%) rename include/{babeltrace => babeltrace2}/ctf-writer/values-internal.h (99%) rename include/{babeltrace => babeltrace2}/ctf-writer/visitor-internal.h (95%) rename include/{babeltrace => babeltrace2}/ctf-writer/visitor.h (99%) rename include/{babeltrace => babeltrace2}/ctf-writer/writer-internal.h (92%) rename include/{babeltrace => babeltrace2}/ctf-writer/writer.h (97%) create mode 100644 include/babeltrace2/ctf/events.h rename include/{babeltrace => babeltrace2}/ctfser-internal.h (97%) rename include/{babeltrace => babeltrace2}/endian-internal.h (100%) rename include/{babeltrace => babeltrace2}/fd-cache-internal.h (97%) rename include/{babeltrace => babeltrace2}/graph/component-class-const.h (99%) rename include/{babeltrace => babeltrace2}/graph/component-class-filter-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/component-class-filter.h (97%) rename include/{babeltrace => babeltrace2}/graph/component-class-internal.h (93%) rename include/{babeltrace => babeltrace2}/graph/component-class-sink-colander-internal.h (95%) rename include/{babeltrace => babeltrace2}/graph/component-class-sink-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/component-class-sink.h (96%) rename include/{babeltrace => babeltrace2}/graph/component-class-source-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/component-class-source.h (96%) rename include/{babeltrace => babeltrace2}/graph/component-class.h (94%) rename include/{babeltrace => babeltrace2}/graph/component-const.h (97%) rename include/{babeltrace => babeltrace2}/graph/component-filter-const.h (99%) rename include/{babeltrace => babeltrace2}/graph/component-filter-internal.h (88%) rename include/{babeltrace => babeltrace2}/graph/component-internal.h (94%) rename include/{babeltrace => babeltrace2}/graph/component-sink-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/component-sink-internal.h (87%) rename include/{babeltrace => babeltrace2}/graph/component-source-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/component-source-internal.h (91%) rename include/{babeltrace => babeltrace2}/graph/connection-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/connection-internal.h (91%) rename include/{babeltrace => babeltrace2}/graph/graph-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/graph-internal.h (95%) rename include/{babeltrace => babeltrace2}/graph/graph.h (99%) rename include/{babeltrace => babeltrace2}/graph/message-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-discarded-events-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-discarded-events.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-discarded-items-internal.h (88%) rename include/{babeltrace => babeltrace2}/graph/message-discarded-packets-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-discarded-packets.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-event-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-event-internal.h (89%) rename include/{babeltrace => babeltrace2}/graph/message-event.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-internal.h (92%) rename include/{babeltrace => babeltrace2}/graph/message-iterator-const.h (100%) rename include/{babeltrace => babeltrace2}/graph/message-iterator-internal.h (95%) rename include/{babeltrace => babeltrace2}/graph/message-message-iterator-inactivity-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-message-iterator-inactivity-internal.h (93%) rename include/{babeltrace => babeltrace2}/graph/message-message-iterator-inactivity.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-packet-beginning-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-packet-beginning.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-packet-end-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-packet-end.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-packet-internal.h (89%) rename include/{babeltrace => babeltrace2}/graph/message-stream-activity-beginning-const.h (95%) rename include/{babeltrace => babeltrace2}/graph/message-stream-activity-beginning.h (95%) rename include/{babeltrace => babeltrace2}/graph/message-stream-activity-const.h (100%) rename include/{babeltrace => babeltrace2}/graph/message-stream-activity-end-const.h (95%) rename include/{babeltrace => babeltrace2}/graph/message-stream-activity-end.h (95%) rename include/{babeltrace => babeltrace2}/graph/message-stream-activity-internal.h (90%) rename include/{babeltrace => babeltrace2}/graph/message-stream-beginning-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-stream-beginning.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-stream-end-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-stream-end.h (98%) rename include/{babeltrace => babeltrace2}/graph/message-stream-internal.h (85%) rename include/{babeltrace => babeltrace2}/graph/port-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/port-input-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/port-internal.h (98%) rename include/{babeltrace => babeltrace2}/graph/port-output-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/port-output-message-iterator.h (97%) rename include/{babeltrace => babeltrace2}/graph/query-executor-const.h (98%) rename include/{babeltrace => babeltrace2}/graph/query-executor-internal.h (94%) rename include/{babeltrace => babeltrace2}/graph/query-executor.h (95%) rename include/{babeltrace => babeltrace2}/graph/self-component-class-filter.h (98%) rename include/{babeltrace => babeltrace2}/graph/self-component-class-sink.h (98%) rename include/{babeltrace => babeltrace2}/graph/self-component-class-source.h (98%) rename include/{babeltrace => babeltrace2}/graph/self-component-filter.h (97%) rename include/{babeltrace => babeltrace2}/graph/self-component-port-input-message-iterator.h (97%) rename include/{babeltrace => babeltrace2}/graph/self-component-port-input.h (98%) rename include/{babeltrace => babeltrace2}/graph/self-component-port-output.h (98%) rename include/{babeltrace => babeltrace2}/graph/self-component-port.h (98%) rename include/{babeltrace => babeltrace2}/graph/self-component-sink.h (96%) rename include/{babeltrace => babeltrace2}/graph/self-component-source.h (96%) rename include/{babeltrace => babeltrace2}/graph/self-component.h (98%) rename include/{babeltrace => babeltrace2}/graph/self-message-iterator.h (96%) rename include/{babeltrace => babeltrace2}/lib-logging-internal.h (98%) rename include/{babeltrace => babeltrace2}/list-internal.h (100%) rename include/{babeltrace => babeltrace2}/logging-internal.h (98%) rename include/{babeltrace => babeltrace2}/logging.h (99%) rename include/{babeltrace => babeltrace2}/mmap-align-internal.h (96%) rename include/{babeltrace => babeltrace2}/object-internal.h (99%) rename include/{babeltrace => babeltrace2}/object-pool-internal.h (99%) rename include/{babeltrace => babeltrace2}/plugin/plugin-const.h (98%) rename include/{babeltrace => babeltrace2}/plugin/plugin-dev.h (99%) rename include/{babeltrace => babeltrace2}/plugin/plugin-internal.h (96%) rename include/{babeltrace => babeltrace2}/plugin/plugin-set-const.h (98%) rename include/{babeltrace => babeltrace2}/plugin/plugin-so-internal.h (98%) rename include/{babeltrace => babeltrace2}/plugin/python-plugin-provider-internal.h (96%) rename include/{babeltrace => babeltrace2}/prio-heap-internal.h (98%) rename include/{babeltrace => babeltrace2}/property-internal.h (94%) rename include/{babeltrace => babeltrace2}/property.h (100%) rename include/{babeltrace => babeltrace2}/trace-ir/attributes-internal.h (96%) rename include/{babeltrace => babeltrace2}/trace-ir/clock-class-const.h (98%) rename include/{babeltrace => babeltrace2}/trace-ir/clock-class-internal.h (89%) rename include/{babeltrace => babeltrace2}/trace-ir/clock-class.h (96%) rename include/{babeltrace => babeltrace2}/trace-ir/clock-snapshot-const.h (98%) rename include/{babeltrace => babeltrace2}/trace-ir/clock-snapshot-internal.h (93%) rename include/{babeltrace => babeltrace2}/trace-ir/clock-snapshot-set-internal.h (96%) rename include/{babeltrace => babeltrace2}/trace-ir/event-class-const.h (98%) rename include/{babeltrace => babeltrace2}/trace-ir/event-class-internal.h (80%) rename include/{babeltrace => babeltrace2}/trace-ir/event-class.h (97%) rename include/{babeltrace => babeltrace2}/trace-ir/event-const.h (98%) rename include/{babeltrace => babeltrace2}/trace-ir/event-internal.h (88%) rename include/{babeltrace => babeltrace2}/trace-ir/event.h (96%) rename include/{babeltrace => babeltrace2}/trace-ir/field-class-const.h (99%) rename include/{babeltrace => babeltrace2}/trace-ir/field-class-internal.h (97%) rename include/{babeltrace => babeltrace2}/trace-ir/field-class.h (98%) rename include/{babeltrace => babeltrace2}/trace-ir/field-const.h (97%) rename include/{babeltrace => babeltrace2}/trace-ir/field-internal.h (94%) rename include/{babeltrace => babeltrace2}/trace-ir/field-path-const.h (98%) rename include/{babeltrace => babeltrace2}/trace-ir/field-path-internal.h (95%) rename include/{babeltrace => babeltrace2}/trace-ir/field-wrapper-internal.h (92%) rename include/{babeltrace => babeltrace2}/trace-ir/field.h (97%) rename include/{babeltrace => babeltrace2}/trace-ir/packet-const.h (97%) rename include/{babeltrace => babeltrace2}/trace-ir/packet-context-field.h (98%) rename include/{babeltrace => babeltrace2}/trace-ir/packet-internal.h (82%) rename include/{babeltrace => babeltrace2}/trace-ir/packet.h (95%) rename include/{babeltrace => babeltrace2}/trace-ir/resolve-field-path-internal.h (92%) rename include/{babeltrace => babeltrace2}/trace-ir/stream-class-const.h (99%) rename include/{babeltrace => babeltrace2}/trace-ir/stream-class-internal.h (88%) rename include/{babeltrace => babeltrace2}/trace-ir/stream-class.h (97%) rename include/{babeltrace => babeltrace2}/trace-ir/stream-const.h (98%) rename include/{babeltrace => babeltrace2}/trace-ir/stream-internal.h (90%) rename include/{babeltrace => babeltrace2}/trace-ir/stream.h (96%) rename include/{babeltrace => babeltrace2}/trace-ir/trace-class-const.h (99%) rename include/{babeltrace => babeltrace2}/trace-ir/trace-class-internal.h (77%) rename include/{babeltrace => babeltrace2}/trace-ir/trace-class.h (96%) rename include/{babeltrace => babeltrace2}/trace-ir/trace-const.h (98%) rename include/{babeltrace => babeltrace2}/trace-ir/trace-internal.h (78%) rename include/{babeltrace => babeltrace2}/trace-ir/trace.h (96%) rename include/{babeltrace => babeltrace2}/trace-ir/utils-internal.h (97%) rename include/{babeltrace => babeltrace2}/types.h (99%) rename include/{babeltrace => babeltrace2}/util.h (100%) rename include/{babeltrace => babeltrace2}/value-const.h (99%) rename include/{babeltrace => babeltrace2}/value-internal.h (93%) rename include/{babeltrace => babeltrace2}/value.h (98%) rename include/{babeltrace => babeltrace2}/version.h (100%) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index 797b8865..32fd7963 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -280,22 +280,22 @@ library (`logging` directory). The logging API headers are: -``:: +``:: Public header which a library user can use to control and read libbabeltrace2's current log level. -``:: +``:: Internal, generic logging API which you can use in any Babeltrace subproject. This is the translation of `zf_log.h`. -``:: +``:: Specific internal header to use within the library. This header defines `BT_LOG_OUTPUT_LEVEL` to a custom, library-wide hidden symbol which is the library's current log level before including - ``. + ``. -Do not include `` or -`` in a header which contains logging +Do not include `` or +`` in a header which contains logging statements: this header could be included in source files which define a different <>, for example. See <>. @@ -355,10 +355,10 @@ get the configured minimal log level. `_bt_log_global_output_lvl` symbol. In practice, we never use this symbol, and always make sure that `BT_LOG_OUTPUT_LEVEL` is defined to a module-wise or subproject-wise hidden symbol before including -``. In the library, -`` does this job: just include this +``. In the library, +`` does this job: just include this header which defines `BT_LOG_OUTPUT_LEVEL` to the appropriate symbol -before it includes ``. In plugins, for +before it includes ``. In plugins, for example, there is one log level per component class, which makes log filtering easier during execution. + @@ -593,7 +593,7 @@ Follow those steps to make your module loggable: */ #define BT_LOG_OUTPUT_LEVEL my_module_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(my_module_log_level, "BABELTRACE_MY_MODULE_LOG_LEVEL"); ---- @@ -639,7 +639,7 @@ the environment variable and sets the log level symbol accordingly. */ #define BT_LOG_OUTPUT_LEVEL my_module_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(my_module_log_level); diff --git a/bindings/python/bt2/bt2/logging.c b/bindings/python/bt2/bt2/logging.c index be64a862..698baf9f 100644 --- a/bindings/python/bt2/bt2/logging.c +++ b/bindings/python/bt2/bt2/logging.c @@ -21,7 +21,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_python_bindings_bt2_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(bt_python_bindings_bt2_log_level, "BABELTRACE_PYTHON_BT2_LOG_LEVEL"); diff --git a/bindings/python/bt2/bt2/logging.h b/bindings/python/bt2/bt2/logging.h index fb0ef9f3..21b58503 100644 --- a/bindings/python/bt2/bt2/logging.h +++ b/bindings/python/bt2/bt2/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_python_bindings_bt2_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(bt_python_bindings_bt2_log_level); diff --git a/bindings/python/bt2/bt2/native_bt.i b/bindings/python/bt2/bt2/native_bt.i index fe289b0b..8a43edf0 100644 --- a/bindings/python/bt2/bt2/native_bt.i +++ b/bindings/python/bt2/bt2/native_bt.i @@ -32,9 +32,9 @@ #define BT_LOG_TAG "PY-NATIVE" #include "logging.h" -#include -#include -#include +#include +#include +#include typedef const uint8_t *bt_uuid; %} diff --git a/bindings/python/bt2/bt2/native_bt_logging.i b/bindings/python/bt2/bt2/native_bt_logging.i index 0406a2aa..df364bdf 100644 --- a/bindings/python/bt2/bt2/native_bt_logging.i +++ b/bindings/python/bt2/bt2/native_bt_logging.i @@ -23,7 +23,7 @@ */ %{ -#include +#include %} /* Log levels */ diff --git a/cli/babeltrace2-cfg-cli-args-connect.c b/cli/babeltrace2-cfg-cli-args-connect.c index f1d71047..f269ecc6 100644 --- a/cli/babeltrace2-cfg-cli-args-connect.c +++ b/cli/babeltrace2-cfg-cli-args-connect.c @@ -21,8 +21,8 @@ */ #include -#include -#include +#include +#include #include "babeltrace2-cfg.h" #include "babeltrace2-cfg-cli-args-connect.h" diff --git a/cli/babeltrace2-cfg-cli-args-connect.h b/cli/babeltrace2-cfg-cli-args-connect.h index 5130cd91..37799bb8 100644 --- a/cli/babeltrace2-cfg-cli-args-connect.h +++ b/cli/babeltrace2-cfg-cli-args-connect.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include "babeltrace2-cfg.h" diff --git a/cli/babeltrace2-cfg-cli-args-default.c b/cli/babeltrace2-cfg-cli-args-default.c index 5cd0bcf8..aef23a53 100644 --- a/cli/babeltrace2-cfg-cli-args-default.c +++ b/cli/babeltrace2-cfg-cli-args-default.c @@ -21,7 +21,7 @@ * SOFTWARE. */ -#include +#include #include "babeltrace2-cfg.h" #include "babeltrace2-cfg-cli-args.h" #include "babeltrace2-cfg-cli-args-default.h" diff --git a/cli/babeltrace2-cfg-cli-args.c b/cli/babeltrace2-cfg-cli-args.c index 7a7b855a..09d11e31 100644 --- a/cli/babeltrace2-cfg-cli-args.c +++ b/cli/babeltrace2-cfg-cli-args.c @@ -28,12 +28,12 @@ #include #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/cli/babeltrace2-cfg-cli-args.h b/cli/babeltrace2-cfg-cli-args.h index 66d29841..7f1fd003 100644 --- a/cli/babeltrace2-cfg-cli-args.h +++ b/cli/babeltrace2-cfg-cli-args.h @@ -25,10 +25,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include "babeltrace2-cfg.h" diff --git a/cli/babeltrace2-cfg.c b/cli/babeltrace2-cfg.c index 923afbd2..4704efb3 100644 --- a/cli/babeltrace2-cfg.c +++ b/cli/babeltrace2-cfg.c @@ -22,8 +22,8 @@ * SOFTWARE. */ -#include -#include +#include +#include #include #include "babeltrace2-cfg.h" diff --git a/cli/babeltrace2-cfg.h b/cli/babeltrace2-cfg.h index 6d98cd33..0608e36d 100644 --- a/cli/babeltrace2-cfg.h +++ b/cli/babeltrace2-cfg.h @@ -28,10 +28,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include enum bt_config_command { diff --git a/cli/babeltrace2-log.c b/cli/babeltrace2-log.c index 4d97b90b..7d6021d9 100644 --- a/cli/babeltrace2-log.c +++ b/cli/babeltrace2-log.c @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/cli/babeltrace2.c b/cli/babeltrace2.c index a8a0dc00..91dc1ce5 100644 --- a/cli/babeltrace2.c +++ b/cli/babeltrace2.c @@ -25,8 +25,8 @@ #define BT_LOG_TAG "CLI" #include "logging.h" -#include -#include +#include +#include #include #include #include diff --git a/cli/logging.c b/cli/logging.c index 52d531c7..a2a522bc 100644 --- a/cli/logging.c +++ b/cli/logging.c @@ -21,6 +21,6 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_cli_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(bt_cli_log_level, "BABELTRACE_CLI_LOG_LEVEL"); diff --git a/cli/logging.h b/cli/logging.h index ccc6c527..6e5dc9fe 100644 --- a/cli/logging.h +++ b/cli/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_cli_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(bt_cli_log_level); diff --git a/common/assert.c b/common/assert.c index ce204d02..1e28219f 100644 --- a/common/assert.c +++ b/common/assert.c @@ -20,8 +20,8 @@ * SOFTWARE. */ -#include -#include +#include +#include void bt_common_assert_failed(const char *file, int line, const char *func, const char *assertion) diff --git a/common/common.c b/common/common.c index 68f537ba..89f63d70 100644 --- a/common/common.c +++ b/common/common.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -39,9 +39,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #ifndef __MINGW32__ #include diff --git a/common/logging.c b/common/logging.c index 6e520d25..234ee628 100644 --- a/common/logging.c +++ b/common/logging.c @@ -21,6 +21,6 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_common_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(bt_common_log_level, "BABELTRACE_COMMON_LOG_LEVEL"); diff --git a/common/logging.h b/common/logging.h index c5b8e5e2..a7029dc5 100644 --- a/common/logging.h +++ b/common/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_common_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(bt_common_log_level); diff --git a/compat/compat_mman.c b/compat/compat_mman.c index 6b0229e3..bef80d48 100644 --- a/compat/compat_mman.c +++ b/compat/compat_mman.c @@ -45,7 +45,7 @@ int bt_mman_dummy_symbol; #include #include #include -#include +#include struct mmap_mapping { /* The duplicated handle. */ diff --git a/compat/compat_uuid.c b/compat/compat_uuid.c index a79a01e7..b367ec13 100644 --- a/compat/compat_uuid.c +++ b/compat/compat_uuid.c @@ -38,7 +38,7 @@ int bt_uuid_dummy_symbol; #include #include -#include +#include /* MinGW does not provide byteswap - implement our own version. */ static diff --git a/compat/logging.c b/compat/logging.c index b982a4b6..1a359525 100644 --- a/compat/logging.c +++ b/compat/logging.c @@ -21,6 +21,6 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_compat_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(bt_compat_log_level, "BABELTRACE_COMPAT_LOG_LEVEL"); diff --git a/compat/logging.h b/compat/logging.h index 0c2518e1..6e4b5d26 100644 --- a/compat/logging.h +++ b/compat/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_compat_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(bt_compat_log_level); diff --git a/ctfser/ctfser.c b/ctfser/ctfser.c index bb9590ab..32cc9d0b 100644 --- a/ctfser/ctfser.c +++ b/ctfser/ctfser.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -37,11 +37,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include static inline uint64_t get_packet_size_increment_bytes(void) diff --git a/ctfser/logging.c b/ctfser/logging.c index 8ef6ed06..249c3ca0 100644 --- a/ctfser/logging.c +++ b/ctfser/logging.c @@ -21,6 +21,6 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_ctfser_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(bt_ctfser_log_level, "BABELTRACE_CTFSER_LOG_LEVEL"); diff --git a/ctfser/logging.h b/ctfser/logging.h index 5892ac8d..f18e7265 100644 --- a/ctfser/logging.h +++ b/ctfser/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_ctfser_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(bt_ctfser_log_level); diff --git a/doc/api/dox/examples-ctfir.dox b/doc/api/dox/examples-ctfir.dox index 1c411add..3c1850d3 100644 --- a/doc/api/dox/examples-ctfir.dox +++ b/doc/api/dox/examples-ctfir.dox @@ -23,7 +23,7 @@ This page contains usage examples of the \ref ctfirfieldtypes API. @code{.c} #include -#include +#include struct bt_field_type *create_int_field_type(void) { @@ -40,7 +40,7 @@ struct bt_field_type *create_int_field_type(void) @code{.c} #include -#include +#include struct bt_field_type *create_int_field_type(void) { @@ -65,7 +65,7 @@ struct bt_field_type *create_int_field_type(void) @code{.c} #include -#include +#include struct bt_field_type *create_int_field_type( struct bt_clock_class *clock_class) @@ -96,7 +96,7 @@ struct bt_field_type *create_int_field_type( @code{.c} #include -#include +#include struct bt_field_type *create_float_field_type(void) { @@ -113,7 +113,7 @@ struct bt_field_type *create_float_field_type(void) @code{.c} #include -#include +#include struct bt_field_type *create_float_field_type(void) { diff --git a/doc/api/dox/includes-build.dox b/doc/api/dox/includes-build.dox index 9c348541..78c880fc 100644 --- a/doc/api/dox/includes-build.dox +++ b/doc/api/dox/includes-build.dox @@ -16,7 +16,7 @@ You can also use the "master" include file which provides everything, but which necessarily makes the compilation slower: @code -#include +#include @endcode @section howtobuild How to build diff --git a/extras/gen-babeltrace-h.py b/extras/gen-babeltrace-h.py index b604ea31..f03110fc 100644 --- a/extras/gen-babeltrace-h.py +++ b/extras/gen-babeltrace-h.py @@ -24,10 +24,10 @@ def _get_sections(file): cur_title = m.group(1) continue - m = re.match(r'^\s+(babeltrace/.+\.h).*$', line) + m = re.match(r'^\s+(babeltrace2/.+\.h).*$', line) if m: - if m.group(1) != 'babeltrace/babeltrace.h': + if m.group(1) != 'babeltrace2/babeltrace.h': cur_filenames.append(m.group(1)) continue diff --git a/fd-cache/fd-cache.c b/fd-cache/fd-cache.c index 7e78fcb2..fcd4f4c2 100644 --- a/fd-cache/fd-cache.c +++ b/fd-cache/fd-cache.c @@ -35,8 +35,8 @@ #include #include -#include -#include +#include +#include struct file_key { uint64_t dev; diff --git a/fd-cache/logging.c b/fd-cache/logging.c index cd4029d1..e203ee74 100644 --- a/fd-cache/logging.c +++ b/fd-cache/logging.c @@ -21,6 +21,6 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_fd_cache_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(bt_fd_cache_log_level, "BABELTRACE_FD_CACHE_LOG_LEVEL"); diff --git a/fd-cache/logging.h b/fd-cache/logging.h index 343f3d46..ae851e71 100644 --- a/fd-cache/logging.h +++ b/fd-cache/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_fd_cache_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(bt_fd_cache_log_level); diff --git a/include/Makefile.am b/include/Makefile.am index 2d8cb554..e069b2cc 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -69,239 +69,239 @@ CLEANFILES = version.i.tmp DISTCLEANFILES = version.i # Core API -babeltraceincludedir = "$(includedir)/babeltrace" -babeltraceinclude_HEADERS = \ - babeltrace/babeltrace.h \ - babeltrace/logging.h \ - babeltrace/property.h \ - babeltrace/types.h \ - babeltrace/util.h \ - babeltrace/value-const.h \ - babeltrace/value.h \ - babeltrace/version.h +babeltrace2includedir = "$(includedir)/babeltrace2" +babeltrace2include_HEADERS = \ + babeltrace2/babeltrace.h \ + babeltrace2/logging.h \ + babeltrace2/property.h \ + babeltrace2/types.h \ + babeltrace2/util.h \ + babeltrace2/value-const.h \ + babeltrace2/value.h \ + babeltrace2/version.h # Legacy API (for CTF writer) -babeltracectfincludedir = "$(includedir)/babeltrace/ctf" -babeltracectfinclude_HEADERS = \ - babeltrace/ctf/events.h +babeltrace2ctfincludedir = "$(includedir)/babeltrace2/ctf" +babeltrace2ctfinclude_HEADERS = \ + babeltrace2/ctf/events.h # CTF writer API -babeltracectfwriterincludedir = "$(includedir)/babeltrace/ctf-writer" -babeltracectfwriterinclude_HEADERS = \ - babeltrace/ctf-writer/clock-class.h \ - babeltrace/ctf-writer/clock.h \ - babeltrace/ctf-writer/event-fields.h \ - babeltrace/ctf-writer/event-types.h \ - babeltrace/ctf-writer/event.h \ - babeltrace/ctf-writer/field-types.h \ - babeltrace/ctf-writer/fields.h \ - babeltrace/ctf-writer/object.h \ - babeltrace/ctf-writer/stream-class.h \ - babeltrace/ctf-writer/stream.h \ - babeltrace/ctf-writer/trace.h \ - babeltrace/ctf-writer/utils.h \ - babeltrace/ctf-writer/visitor.h \ - babeltrace/ctf-writer/writer.h +babeltrace2ctfwriterincludedir = "$(includedir)/babeltrace2/ctf-writer" +babeltrace2ctfwriterinclude_HEADERS = \ + babeltrace2/ctf-writer/clock-class.h \ + babeltrace2/ctf-writer/clock.h \ + babeltrace2/ctf-writer/event-fields.h \ + babeltrace2/ctf-writer/event-types.h \ + babeltrace2/ctf-writer/event.h \ + babeltrace2/ctf-writer/field-types.h \ + babeltrace2/ctf-writer/fields.h \ + babeltrace2/ctf-writer/object.h \ + babeltrace2/ctf-writer/stream-class.h \ + babeltrace2/ctf-writer/stream.h \ + babeltrace2/ctf-writer/trace.h \ + babeltrace2/ctf-writer/utils.h \ + babeltrace2/ctf-writer/visitor.h \ + babeltrace2/ctf-writer/writer.h # Legacy API (for CTF writer) -babeltracectfirincludedir = "$(includedir)/babeltrace/ctf-ir" -babeltracectfirinclude_HEADERS = \ - babeltrace/ctf-ir/clock.h \ - babeltrace/ctf-ir/event-fields.h \ - babeltrace/ctf-ir/event-types.h \ - babeltrace/ctf-ir/event.h \ - babeltrace/ctf-ir/field-types.h \ - babeltrace/ctf-ir/fields.h \ - babeltrace/ctf-ir/stream-class.h \ - babeltrace/ctf-ir/stream.h \ - babeltrace/ctf-ir/trace.h \ - babeltrace/ctf-ir/utils.h +babeltrace2ctfirincludedir = "$(includedir)/babeltrace2/ctf-ir" +babeltrace2ctfirinclude_HEADERS = \ + babeltrace2/ctf-ir/clock.h \ + babeltrace2/ctf-ir/event-fields.h \ + babeltrace2/ctf-ir/event-types.h \ + babeltrace2/ctf-ir/event.h \ + babeltrace2/ctf-ir/field-types.h \ + babeltrace2/ctf-ir/fields.h \ + babeltrace2/ctf-ir/stream-class.h \ + babeltrace2/ctf-ir/stream.h \ + babeltrace2/ctf-ir/trace.h \ + babeltrace2/ctf-ir/utils.h # Trace IR API -babeltracetraceirincludedir = "$(includedir)/babeltrace/trace-ir" -babeltracetraceirinclude_HEADERS = \ - babeltrace/trace-ir/clock-class-const.h \ - babeltrace/trace-ir/clock-class.h \ - babeltrace/trace-ir/clock-snapshot-const.h \ - babeltrace/trace-ir/event-class-const.h \ - babeltrace/trace-ir/event-class.h \ - babeltrace/trace-ir/event-const.h \ - babeltrace/trace-ir/event.h \ - babeltrace/trace-ir/field-class-const.h \ - babeltrace/trace-ir/field-class.h \ - babeltrace/trace-ir/field-path-const.h \ - babeltrace/trace-ir/field-const.h \ - babeltrace/trace-ir/field.h \ - babeltrace/trace-ir/packet-const.h \ - babeltrace/trace-ir/packet-context-field.h \ - babeltrace/trace-ir/packet.h \ - babeltrace/trace-ir/stream-class-const.h \ - babeltrace/trace-ir/stream-class.h \ - babeltrace/trace-ir/stream-const.h \ - babeltrace/trace-ir/stream.h \ - babeltrace/trace-ir/trace-class-const.h \ - babeltrace/trace-ir/trace-class.h \ - babeltrace/trace-ir/trace-const.h \ - babeltrace/trace-ir/trace.h +babeltrace2traceirincludedir = "$(includedir)/babeltrace2/trace-ir" +babeltrace2traceirinclude_HEADERS = \ + babeltrace2/trace-ir/clock-class-const.h \ + babeltrace2/trace-ir/clock-class.h \ + babeltrace2/trace-ir/clock-snapshot-const.h \ + babeltrace2/trace-ir/event-class-const.h \ + babeltrace2/trace-ir/event-class.h \ + babeltrace2/trace-ir/event-const.h \ + babeltrace2/trace-ir/event.h \ + babeltrace2/trace-ir/field-class-const.h \ + babeltrace2/trace-ir/field-class.h \ + babeltrace2/trace-ir/field-path-const.h \ + babeltrace2/trace-ir/field-const.h \ + babeltrace2/trace-ir/field.h \ + babeltrace2/trace-ir/packet-const.h \ + babeltrace2/trace-ir/packet-context-field.h \ + babeltrace2/trace-ir/packet.h \ + babeltrace2/trace-ir/stream-class-const.h \ + babeltrace2/trace-ir/stream-class.h \ + babeltrace2/trace-ir/stream-const.h \ + babeltrace2/trace-ir/stream.h \ + babeltrace2/trace-ir/trace-class-const.h \ + babeltrace2/trace-ir/trace-class.h \ + babeltrace2/trace-ir/trace-const.h \ + babeltrace2/trace-ir/trace.h # Plugin and plugin development API -babeltracepluginincludedir = "$(includedir)/babeltrace/plugin" -babeltraceplugininclude_HEADERS = \ - babeltrace/plugin/plugin-dev.h \ - babeltrace/plugin/plugin-const.h \ - babeltrace/plugin/plugin-set-const.h +babeltrace2pluginincludedir = "$(includedir)/babeltrace2/plugin" +babeltrace2plugininclude_HEADERS = \ + babeltrace2/plugin/plugin-dev.h \ + babeltrace2/plugin/plugin-const.h \ + babeltrace2/plugin/plugin-set-const.h # Graph, component, and message API -babeltracegraphincludedir = "$(includedir)/babeltrace/graph" -babeltracegraphinclude_HEADERS = \ - babeltrace/graph/component-class-const.h \ - babeltrace/graph/component-class-filter-const.h \ - babeltrace/graph/component-class-filter.h \ - babeltrace/graph/component-class-sink-const.h \ - babeltrace/graph/component-class-sink.h \ - babeltrace/graph/component-class-source-const.h \ - babeltrace/graph/component-class-source.h \ - babeltrace/graph/component-class.h \ - babeltrace/graph/component-const.h \ - babeltrace/graph/component-filter-const.h \ - babeltrace/graph/component-sink-const.h \ - babeltrace/graph/component-source-const.h \ - babeltrace/graph/connection-const.h \ - babeltrace/graph/graph-const.h \ - babeltrace/graph/graph.h \ - babeltrace/graph/message-const.h \ - babeltrace/graph/message-discarded-events-const.h \ - babeltrace/graph/message-discarded-events.h \ - babeltrace/graph/message-discarded-packets-const.h \ - babeltrace/graph/message-discarded-packets.h \ - babeltrace/graph/message-event-const.h \ - babeltrace/graph/message-event.h \ - babeltrace/graph/message-message-iterator-inactivity-const.h \ - babeltrace/graph/message-message-iterator-inactivity.h \ - babeltrace/graph/message-iterator-const.h \ - babeltrace/graph/message-packet-beginning-const.h \ - babeltrace/graph/message-packet-beginning.h \ - babeltrace/graph/message-packet-end-const.h \ - babeltrace/graph/message-packet-end.h \ - babeltrace/graph/message-stream-activity-beginning-const.h \ - babeltrace/graph/message-stream-activity-beginning.h \ - babeltrace/graph/message-stream-activity-const.h \ - babeltrace/graph/message-stream-activity-end-const.h \ - babeltrace/graph/message-stream-activity-end.h \ - babeltrace/graph/message-stream-beginning-const.h \ - babeltrace/graph/message-stream-beginning.h \ - babeltrace/graph/message-stream-end-const.h \ - babeltrace/graph/message-stream-end.h \ - babeltrace/graph/port-const.h \ - babeltrace/graph/port-input-const.h \ - babeltrace/graph/port-output-const.h \ - babeltrace/graph/port-output-message-iterator.h \ - babeltrace/graph/query-executor-const.h \ - babeltrace/graph/query-executor.h \ - babeltrace/graph/self-component-class-filter.h \ - babeltrace/graph/self-component-class-sink.h \ - babeltrace/graph/self-component-class-source.h \ - babeltrace/graph/self-component-filter.h \ - babeltrace/graph/self-component-port-input-message-iterator.h \ - babeltrace/graph/self-component-port-input.h \ - babeltrace/graph/self-component-port-output.h \ - babeltrace/graph/self-component-port.h \ - babeltrace/graph/self-component-sink.h \ - babeltrace/graph/self-component-source.h \ - babeltrace/graph/self-component.h \ - babeltrace/graph/self-message-iterator.h +babeltrace2graphincludedir = "$(includedir)/babeltrace2/graph" +babeltrace2graphinclude_HEADERS = \ + babeltrace2/graph/component-class-const.h \ + babeltrace2/graph/component-class-filter-const.h \ + babeltrace2/graph/component-class-filter.h \ + babeltrace2/graph/component-class-sink-const.h \ + babeltrace2/graph/component-class-sink.h \ + babeltrace2/graph/component-class-source-const.h \ + babeltrace2/graph/component-class-source.h \ + babeltrace2/graph/component-class.h \ + babeltrace2/graph/component-const.h \ + babeltrace2/graph/component-filter-const.h \ + babeltrace2/graph/component-sink-const.h \ + babeltrace2/graph/component-source-const.h \ + babeltrace2/graph/connection-const.h \ + babeltrace2/graph/graph-const.h \ + babeltrace2/graph/graph.h \ + babeltrace2/graph/message-const.h \ + babeltrace2/graph/message-discarded-events-const.h \ + babeltrace2/graph/message-discarded-events.h \ + babeltrace2/graph/message-discarded-packets-const.h \ + babeltrace2/graph/message-discarded-packets.h \ + babeltrace2/graph/message-event-const.h \ + babeltrace2/graph/message-event.h \ + babeltrace2/graph/message-message-iterator-inactivity-const.h \ + babeltrace2/graph/message-message-iterator-inactivity.h \ + babeltrace2/graph/message-iterator-const.h \ + babeltrace2/graph/message-packet-beginning-const.h \ + babeltrace2/graph/message-packet-beginning.h \ + babeltrace2/graph/message-packet-end-const.h \ + babeltrace2/graph/message-packet-end.h \ + babeltrace2/graph/message-stream-activity-beginning-const.h \ + babeltrace2/graph/message-stream-activity-beginning.h \ + babeltrace2/graph/message-stream-activity-const.h \ + babeltrace2/graph/message-stream-activity-end-const.h \ + babeltrace2/graph/message-stream-activity-end.h \ + babeltrace2/graph/message-stream-beginning-const.h \ + babeltrace2/graph/message-stream-beginning.h \ + babeltrace2/graph/message-stream-end-const.h \ + babeltrace2/graph/message-stream-end.h \ + babeltrace2/graph/port-const.h \ + babeltrace2/graph/port-input-const.h \ + babeltrace2/graph/port-output-const.h \ + babeltrace2/graph/port-output-message-iterator.h \ + babeltrace2/graph/query-executor-const.h \ + babeltrace2/graph/query-executor.h \ + babeltrace2/graph/self-component-class-filter.h \ + babeltrace2/graph/self-component-class-sink.h \ + babeltrace2/graph/self-component-class-source.h \ + babeltrace2/graph/self-component-filter.h \ + babeltrace2/graph/self-component-port-input-message-iterator.h \ + babeltrace2/graph/self-component-port-input.h \ + babeltrace2/graph/self-component-port-output.h \ + babeltrace2/graph/self-component-port.h \ + babeltrace2/graph/self-component-sink.h \ + babeltrace2/graph/self-component-source.h \ + babeltrace2/graph/self-component.h \ + babeltrace2/graph/self-message-iterator.h noinst_HEADERS = \ - babeltrace/compat/stdlib-internal.h \ - babeltrace/compat/fcntl-internal.h \ - babeltrace/compat/glib-internal.h \ - babeltrace/compat/uuid-internal.h \ - babeltrace/compat/unistd-internal.h \ - babeltrace/compat/stdio-internal.h \ - babeltrace/compat/time-internal.h \ - babeltrace/compat/utc-internal.h \ - babeltrace/compat/memstream-internal.h \ - babeltrace/compat/string-internal.h \ - babeltrace/compat/limits-internal.h \ - babeltrace/compat/mman-internal.h \ - babeltrace/compat/socket-internal.h \ - babeltrace/common-internal.h \ - babeltrace/ctfser-internal.h \ - babeltrace/bitfield-internal.h \ - babeltrace/object-internal.h \ - babeltrace/object-pool-internal.h \ - babeltrace/plugin/plugin-internal.h \ - babeltrace/plugin/plugin-so-internal.h \ - babeltrace/plugin/python-plugin-provider-internal.h \ - babeltrace/assert-internal.h \ - babeltrace/value-internal.h \ - babeltrace/ctf-writer/attributes-internal.h \ - babeltrace/ctf-writer/clock-class-internal.h \ - babeltrace/ctf-writer/clock-internal.h \ - babeltrace/ctf-writer/event-class-internal.h \ - babeltrace/ctf-writer/event-internal.h \ - babeltrace/ctf-writer/field-path-internal.h \ - babeltrace/ctf-writer/fields-internal.h \ - babeltrace/ctf-writer/field-types-internal.h \ - babeltrace/ctf-writer/field-wrapper-internal.h \ - babeltrace/ctf-writer/functor-internal.h \ - babeltrace/ctf-writer/object-internal.h \ - babeltrace/ctf-writer/object-pool-internal.h \ - babeltrace/ctf-writer/resolve-internal.h \ - babeltrace/ctf-writer/stream-class-internal.h \ - babeltrace/ctf-writer/stream-internal.h \ - babeltrace/ctf-writer/trace-internal.h \ - babeltrace/ctf-writer/utils-internal.h \ - babeltrace/ctf-writer/validation-internal.h \ - babeltrace/ctf-writer/values-internal.h \ - babeltrace/ctf-writer/visitor-internal.h \ - babeltrace/ctf-writer/writer-internal.h \ - babeltrace/mmap-align-internal.h \ - babeltrace/align-internal.h \ - babeltrace/logging-internal.h \ - babeltrace/endian-internal.h \ - babeltrace/trace-ir/attributes-internal.h \ - babeltrace/trace-ir/clock-class-internal.h \ - babeltrace/trace-ir/clock-snapshot-internal.h \ - babeltrace/trace-ir/clock-snapshot-set-internal.h \ - babeltrace/trace-ir/event-class-internal.h \ - babeltrace/trace-ir/event-internal.h \ - babeltrace/trace-ir/field-class-internal.h \ - babeltrace/trace-ir/field-path-internal.h \ - babeltrace/trace-ir/field-internal.h \ - babeltrace/trace-ir/field-wrapper-internal.h \ - babeltrace/trace-ir/packet-internal.h \ - babeltrace/trace-ir/resolve-field-path-internal.h \ - babeltrace/trace-ir/stream-class-internal.h \ - babeltrace/trace-ir/stream-internal.h \ - babeltrace/trace-ir/trace-class-internal.h \ - babeltrace/trace-ir/trace-internal.h \ - babeltrace/trace-ir/utils-internal.h \ - babeltrace/prio-heap-internal.h \ - babeltrace/lib-logging-internal.h \ - babeltrace/compiler-internal.h \ - babeltrace/babeltrace-internal.h \ - babeltrace/assert-pre-internal.h \ - babeltrace/graph/component-class-internal.h \ - babeltrace/graph/component-class-sink-colander-internal.h \ - babeltrace/graph/component-filter-internal.h \ - babeltrace/graph/component-internal.h \ - babeltrace/graph/component-sink-internal.h \ - babeltrace/graph/component-source-internal.h \ - babeltrace/graph/connection-internal.h \ - babeltrace/graph/graph-internal.h \ - babeltrace/graph/message-discarded-items-internal.h \ - babeltrace/graph/message-event-internal.h \ - babeltrace/graph/message-message-iterator-inactivity-internal.h \ - babeltrace/graph/message-internal.h \ - babeltrace/graph/message-iterator-internal.h \ - babeltrace/graph/message-packet-internal.h \ - babeltrace/graph/message-stream-activity-internal.h \ - babeltrace/graph/message-stream-internal.h \ - babeltrace/graph/port-internal.h \ - babeltrace/graph/query-executor-internal.h \ - babeltrace/list-internal.h \ - babeltrace/fd-cache-internal.h \ - babeltrace/property-internal.h \ + babeltrace2/compat/stdlib-internal.h \ + babeltrace2/compat/fcntl-internal.h \ + babeltrace2/compat/glib-internal.h \ + babeltrace2/compat/uuid-internal.h \ + babeltrace2/compat/unistd-internal.h \ + babeltrace2/compat/stdio-internal.h \ + babeltrace2/compat/time-internal.h \ + babeltrace2/compat/utc-internal.h \ + babeltrace2/compat/memstream-internal.h \ + babeltrace2/compat/string-internal.h \ + babeltrace2/compat/limits-internal.h \ + babeltrace2/compat/mman-internal.h \ + babeltrace2/compat/socket-internal.h \ + babeltrace2/common-internal.h \ + babeltrace2/ctfser-internal.h \ + babeltrace2/bitfield-internal.h \ + babeltrace2/object-internal.h \ + babeltrace2/object-pool-internal.h \ + babeltrace2/plugin/plugin-internal.h \ + babeltrace2/plugin/plugin-so-internal.h \ + babeltrace2/plugin/python-plugin-provider-internal.h \ + babeltrace2/assert-internal.h \ + babeltrace2/value-internal.h \ + babeltrace2/ctf-writer/attributes-internal.h \ + babeltrace2/ctf-writer/clock-class-internal.h \ + babeltrace2/ctf-writer/clock-internal.h \ + babeltrace2/ctf-writer/event-class-internal.h \ + babeltrace2/ctf-writer/event-internal.h \ + babeltrace2/ctf-writer/field-path-internal.h \ + babeltrace2/ctf-writer/fields-internal.h \ + babeltrace2/ctf-writer/field-types-internal.h \ + babeltrace2/ctf-writer/field-wrapper-internal.h \ + babeltrace2/ctf-writer/functor-internal.h \ + babeltrace2/ctf-writer/object-internal.h \ + babeltrace2/ctf-writer/object-pool-internal.h \ + babeltrace2/ctf-writer/resolve-internal.h \ + babeltrace2/ctf-writer/stream-class-internal.h \ + babeltrace2/ctf-writer/stream-internal.h \ + babeltrace2/ctf-writer/trace-internal.h \ + babeltrace2/ctf-writer/utils-internal.h \ + babeltrace2/ctf-writer/validation-internal.h \ + babeltrace2/ctf-writer/values-internal.h \ + babeltrace2/ctf-writer/visitor-internal.h \ + babeltrace2/ctf-writer/writer-internal.h \ + babeltrace2/mmap-align-internal.h \ + babeltrace2/align-internal.h \ + babeltrace2/logging-internal.h \ + babeltrace2/endian-internal.h \ + babeltrace2/trace-ir/attributes-internal.h \ + babeltrace2/trace-ir/clock-class-internal.h \ + babeltrace2/trace-ir/clock-snapshot-internal.h \ + babeltrace2/trace-ir/clock-snapshot-set-internal.h \ + babeltrace2/trace-ir/event-class-internal.h \ + babeltrace2/trace-ir/event-internal.h \ + babeltrace2/trace-ir/field-class-internal.h \ + babeltrace2/trace-ir/field-path-internal.h \ + babeltrace2/trace-ir/field-internal.h \ + babeltrace2/trace-ir/field-wrapper-internal.h \ + babeltrace2/trace-ir/packet-internal.h \ + babeltrace2/trace-ir/resolve-field-path-internal.h \ + babeltrace2/trace-ir/stream-class-internal.h \ + babeltrace2/trace-ir/stream-internal.h \ + babeltrace2/trace-ir/trace-class-internal.h \ + babeltrace2/trace-ir/trace-internal.h \ + babeltrace2/trace-ir/utils-internal.h \ + babeltrace2/prio-heap-internal.h \ + babeltrace2/lib-logging-internal.h \ + babeltrace2/compiler-internal.h \ + babeltrace2/babeltrace-internal.h \ + babeltrace2/assert-pre-internal.h \ + babeltrace2/graph/component-class-internal.h \ + babeltrace2/graph/component-class-sink-colander-internal.h \ + babeltrace2/graph/component-filter-internal.h \ + babeltrace2/graph/component-internal.h \ + babeltrace2/graph/component-sink-internal.h \ + babeltrace2/graph/component-source-internal.h \ + babeltrace2/graph/connection-internal.h \ + babeltrace2/graph/graph-internal.h \ + babeltrace2/graph/message-discarded-items-internal.h \ + babeltrace2/graph/message-event-internal.h \ + babeltrace2/graph/message-message-iterator-inactivity-internal.h \ + babeltrace2/graph/message-internal.h \ + babeltrace2/graph/message-iterator-internal.h \ + babeltrace2/graph/message-packet-internal.h \ + babeltrace2/graph/message-stream-activity-internal.h \ + babeltrace2/graph/message-stream-internal.h \ + babeltrace2/graph/port-internal.h \ + babeltrace2/graph/query-executor-internal.h \ + babeltrace2/list-internal.h \ + babeltrace2/fd-cache-internal.h \ + babeltrace2/property-internal.h \ version.h \ version.i diff --git a/include/babeltrace/babeltrace.h b/include/babeltrace/babeltrace.h deleted file mode 100644 index ecf70b3f..00000000 --- a/include/babeltrace/babeltrace.h +++ /dev/null @@ -1,155 +0,0 @@ -#ifndef BABELTRACE_BABELTRACE_H -#define BABELTRACE_BABELTRACE_H - -/* - * Babeltrace API - * - * Copyright 2010-2018 EfficiOS Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -/* Core API */ -#include -#include -#include -#include -#include -#include -#include - -/* Legacy API (for CTF writer) */ -#include - -/* CTF writer API */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* Legacy API (for CTF writer) */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* Trace IR API */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* Plugin and plugin development API */ -#include -#include -#include - -/* Graph, component, and message API */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif /* BABELTRACE_BABELTRACE_H */ diff --git a/include/babeltrace/ctf-ir/event-fields.h b/include/babeltrace/ctf-ir/event-fields.h deleted file mode 100644 index 0c9395a7..00000000 --- a/include/babeltrace/ctf-ir/event-fields.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Pre-2.0 CTF writer backward compatibility */ -#include diff --git a/include/babeltrace/ctf-ir/stream-class.h b/include/babeltrace/ctf-ir/stream-class.h deleted file mode 100644 index 0322d671..00000000 --- a/include/babeltrace/ctf-ir/stream-class.h +++ /dev/null @@ -1,2 +0,0 @@ -/* Pre-2.0 CTF writer backward compatibility */ -#include diff --git a/include/babeltrace/ctf/events.h b/include/babeltrace/ctf/events.h deleted file mode 100644 index 68ec9a6e..00000000 --- a/include/babeltrace/ctf/events.h +++ /dev/null @@ -1,7 +0,0 @@ -/* Pre-2.0 CTF writer backward compatibility */ -#include -#include -#include -#include -#include -#include diff --git a/include/babeltrace/align-internal.h b/include/babeltrace2/align-internal.h similarity index 97% rename from include/babeltrace/align-internal.h rename to include/babeltrace2/align-internal.h index d7c71bef..4e76cd01 100644 --- a/include/babeltrace/align-internal.h +++ b/include/babeltrace2/align-internal.h @@ -23,8 +23,8 @@ * SOFTWARE. */ -#include -#include +#include +#include #define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a) - 1) #define __ALIGN_MASK(x, mask) (((x) + (mask)) & ~(mask)) diff --git a/include/babeltrace/assert-internal.h b/include/babeltrace2/assert-internal.h similarity index 98% rename from include/babeltrace/assert-internal.h rename to include/babeltrace2/assert-internal.h index f8fd0b92..2df876d6 100644 --- a/include/babeltrace/assert-internal.h +++ b/include/babeltrace2/assert-internal.h @@ -25,7 +25,7 @@ */ #include -#include +#include #ifdef BT_DEBUG_MODE diff --git a/include/babeltrace/assert-pre-internal.h b/include/babeltrace2/assert-pre-internal.h similarity index 90% rename from include/babeltrace/assert-pre-internal.h rename to include/babeltrace2/assert-pre-internal.h index e1a57dfe..cb503665 100644 --- a/include/babeltrace/assert-pre-internal.h +++ b/include/babeltrace2/assert-pre-internal.h @@ -26,24 +26,24 @@ /* * The macros in this header use macros defined in - * . We don't want this header to - * automatically include because you + * . We don't want this header to + * automatically include because you * need to manually define BT_LOG_TAG before including - * and it is unexpected that you + * and it is unexpected that you * also need to define it before including this header. * * This is a reminder that in order to use - * , you also need to use logging + * , you also need to use logging * explicitly. */ #ifndef BABELTRACE_LIB_LOGGING_INTERNAL_H -# error Include before this header. +# error Include before this header. #endif #include #include -#include +#include #ifdef BT_DEV_MODE /* diff --git a/include/babeltrace/babeltrace-internal.h b/include/babeltrace2/babeltrace-internal.h similarity index 97% rename from include/babeltrace/babeltrace-internal.h rename to include/babeltrace2/babeltrace-internal.h index 981f84b1..c30725d4 100644 --- a/include/babeltrace/babeltrace-internal.h +++ b/include/babeltrace2/babeltrace-internal.h @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #define PERROR_BUFLEN 200 diff --git a/include/babeltrace2/babeltrace.h b/include/babeltrace2/babeltrace.h new file mode 100644 index 00000000..45509a8a --- /dev/null +++ b/include/babeltrace2/babeltrace.h @@ -0,0 +1,156 @@ +#ifndef BABELTRACE_BABELTRACE_H +#define BABELTRACE_BABELTRACE_H + +/* + * Babeltrace API + * + * Copyright 2010-2018 EfficiOS Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/* Core API */ +#include +#include +#include +#include +#include +#include +#include + +/* Legacy API (for CTF writer) */ +#include + +/* CTF writer API */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Legacy API (for CTF writer) */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Trace IR API */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Plugin and plugin development API */ +#include +#include +#include + +/* Graph, component, and message API */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif /* BABELTRACE_BABELTRACE_H */ diff --git a/include/babeltrace/bitfield-internal.h b/include/babeltrace2/bitfield-internal.h similarity index 99% rename from include/babeltrace/bitfield-internal.h rename to include/babeltrace2/bitfield-internal.h index 6969179c..1835b9d9 100644 --- a/include/babeltrace/bitfield-internal.h +++ b/include/babeltrace2/bitfield-internal.h @@ -25,8 +25,8 @@ #include /* C99 5.2.4.2 Numerical limits */ #include /* C99 7.16 bool type */ -#include /* C99 5.2.4.2 Numerical limits */ -#include /* Non-standard BIG_ENDIAN, LITTLE_ENDIAN, BYTE_ORDER */ +#include /* C99 5.2.4.2 Numerical limits */ +#include /* Non-standard BIG_ENDIAN, LITTLE_ENDIAN, BYTE_ORDER */ /* * This header strictly follows the C99 standard, except for use of the diff --git a/include/babeltrace/common-internal.h b/include/babeltrace2/common-internal.h similarity index 98% rename from include/babeltrace/common-internal.h rename to include/babeltrace2/common-internal.h index 4290f0bd..7ca39469 100644 --- a/include/babeltrace/common-internal.h +++ b/include/babeltrace2/common-internal.h @@ -25,13 +25,13 @@ */ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/include/babeltrace/compat/fcntl-internal.h b/include/babeltrace2/compat/fcntl-internal.h similarity index 100% rename from include/babeltrace/compat/fcntl-internal.h rename to include/babeltrace2/compat/fcntl-internal.h diff --git a/include/babeltrace/compat/glib-internal.h b/include/babeltrace2/compat/glib-internal.h similarity index 100% rename from include/babeltrace/compat/glib-internal.h rename to include/babeltrace2/compat/glib-internal.h diff --git a/include/babeltrace/compat/limits-internal.h b/include/babeltrace2/compat/limits-internal.h similarity index 100% rename from include/babeltrace/compat/limits-internal.h rename to include/babeltrace2/compat/limits-internal.h diff --git a/include/babeltrace/compat/memstream-internal.h b/include/babeltrace2/compat/memstream-internal.h similarity index 99% rename from include/babeltrace/compat/memstream-internal.h rename to include/babeltrace2/compat/memstream-internal.h index fa7514d0..60ff60bd 100644 --- a/include/babeltrace/compat/memstream-internal.h +++ b/include/babeltrace2/compat/memstream-internal.h @@ -41,7 +41,7 @@ FILE *bt_fmemopen(void *buf, size_t size, const char *mode) #include #include #include -#include +#include #ifdef __MINGW32__ diff --git a/include/babeltrace/compat/mman-internal.h b/include/babeltrace2/compat/mman-internal.h similarity index 100% rename from include/babeltrace/compat/mman-internal.h rename to include/babeltrace2/compat/mman-internal.h diff --git a/include/babeltrace/compat/socket-internal.h b/include/babeltrace2/compat/socket-internal.h similarity index 100% rename from include/babeltrace/compat/socket-internal.h rename to include/babeltrace2/compat/socket-internal.h diff --git a/include/babeltrace/compat/stdio-internal.h b/include/babeltrace2/compat/stdio-internal.h similarity index 98% rename from include/babeltrace/compat/stdio-internal.h rename to include/babeltrace2/compat/stdio-internal.h index 332d74da..4c737639 100644 --- a/include/babeltrace/compat/stdio-internal.h +++ b/include/babeltrace2/compat/stdio-internal.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #define BT_GETLINE_MINBUFLEN 64 diff --git a/include/babeltrace/compat/stdlib-internal.h b/include/babeltrace2/compat/stdlib-internal.h similarity index 100% rename from include/babeltrace/compat/stdlib-internal.h rename to include/babeltrace2/compat/stdlib-internal.h diff --git a/include/babeltrace/compat/string-internal.h b/include/babeltrace2/compat/string-internal.h similarity index 100% rename from include/babeltrace/compat/string-internal.h rename to include/babeltrace2/compat/string-internal.h diff --git a/include/babeltrace/compat/time-internal.h b/include/babeltrace2/compat/time-internal.h similarity index 100% rename from include/babeltrace/compat/time-internal.h rename to include/babeltrace2/compat/time-internal.h diff --git a/include/babeltrace/compat/unistd-internal.h b/include/babeltrace2/compat/unistd-internal.h similarity index 100% rename from include/babeltrace/compat/unistd-internal.h rename to include/babeltrace2/compat/unistd-internal.h diff --git a/include/babeltrace/compat/utc-internal.h b/include/babeltrace2/compat/utc-internal.h similarity index 100% rename from include/babeltrace/compat/utc-internal.h rename to include/babeltrace2/compat/utc-internal.h diff --git a/include/babeltrace/compat/uuid-internal.h b/include/babeltrace2/compat/uuid-internal.h similarity index 100% rename from include/babeltrace/compat/uuid-internal.h rename to include/babeltrace2/compat/uuid-internal.h diff --git a/include/babeltrace/compiler-internal.h b/include/babeltrace2/compiler-internal.h similarity index 100% rename from include/babeltrace/compiler-internal.h rename to include/babeltrace2/compiler-internal.h diff --git a/include/babeltrace/ctf-ir/clock.h b/include/babeltrace2/ctf-ir/clock.h similarity index 53% rename from include/babeltrace/ctf-ir/clock.h rename to include/babeltrace2/ctf-ir/clock.h index 72ca2a3a..4823d826 100644 --- a/include/babeltrace/ctf-ir/clock.h +++ b/include/babeltrace2/ctf-ir/clock.h @@ -1,2 +1,2 @@ /* Pre-2.0 CTF writer backward compatibility */ -#include +#include diff --git a/include/babeltrace2/ctf-ir/event-fields.h b/include/babeltrace2/ctf-ir/event-fields.h new file mode 100644 index 00000000..e0e5d3cd --- /dev/null +++ b/include/babeltrace2/ctf-ir/event-fields.h @@ -0,0 +1,2 @@ +/* Pre-2.0 CTF writer backward compatibility */ +#include diff --git a/include/babeltrace/ctf-ir/event-types.h b/include/babeltrace2/ctf-ir/event-types.h similarity index 50% rename from include/babeltrace/ctf-ir/event-types.h rename to include/babeltrace2/ctf-ir/event-types.h index 5bbdda27..bd24fc3a 100644 --- a/include/babeltrace/ctf-ir/event-types.h +++ b/include/babeltrace2/ctf-ir/event-types.h @@ -1,2 +1,2 @@ /* Pre-2.0 CTF writer backward compatibility */ -#include +#include diff --git a/include/babeltrace/ctf-ir/event.h b/include/babeltrace2/ctf-ir/event.h similarity index 53% rename from include/babeltrace/ctf-ir/event.h rename to include/babeltrace2/ctf-ir/event.h index 3106be8d..922d1c1a 100644 --- a/include/babeltrace/ctf-ir/event.h +++ b/include/babeltrace2/ctf-ir/event.h @@ -1,2 +1,2 @@ /* Pre-2.0 CTF writer backward compatibility */ -#include +#include diff --git a/include/babeltrace/ctf-ir/field-types.h b/include/babeltrace2/ctf-ir/field-types.h similarity index 50% rename from include/babeltrace/ctf-ir/field-types.h rename to include/babeltrace2/ctf-ir/field-types.h index ba9e929c..cd2f54c8 100644 --- a/include/babeltrace/ctf-ir/field-types.h +++ b/include/babeltrace2/ctf-ir/field-types.h @@ -1,2 +1,2 @@ /* Pre-2.0 CTF writer backward compatibility */ -#include +#include diff --git a/include/babeltrace/ctf-ir/fields.h b/include/babeltrace2/ctf-ir/fields.h similarity index 52% rename from include/babeltrace/ctf-ir/fields.h rename to include/babeltrace2/ctf-ir/fields.h index dc6543b0..24dbc943 100644 --- a/include/babeltrace/ctf-ir/fields.h +++ b/include/babeltrace2/ctf-ir/fields.h @@ -1,2 +1,2 @@ /* Pre-2.0 CTF writer backward compatibility */ -#include +#include diff --git a/include/babeltrace2/ctf-ir/stream-class.h b/include/babeltrace2/ctf-ir/stream-class.h new file mode 100644 index 00000000..a9e670c4 --- /dev/null +++ b/include/babeltrace2/ctf-ir/stream-class.h @@ -0,0 +1,2 @@ +/* Pre-2.0 CTF writer backward compatibility */ +#include diff --git a/include/babeltrace/ctf-ir/stream.h b/include/babeltrace2/ctf-ir/stream.h similarity index 52% rename from include/babeltrace/ctf-ir/stream.h rename to include/babeltrace2/ctf-ir/stream.h index eb7d57fe..c9d546c1 100644 --- a/include/babeltrace/ctf-ir/stream.h +++ b/include/babeltrace2/ctf-ir/stream.h @@ -1,2 +1,2 @@ /* Pre-2.0 CTF writer backward compatibility */ -#include +#include diff --git a/include/babeltrace/ctf-ir/trace.h b/include/babeltrace2/ctf-ir/trace.h similarity index 53% rename from include/babeltrace/ctf-ir/trace.h rename to include/babeltrace2/ctf-ir/trace.h index 84b9b7a9..ce0195d8 100644 --- a/include/babeltrace/ctf-ir/trace.h +++ b/include/babeltrace2/ctf-ir/trace.h @@ -1,2 +1,2 @@ /* Pre-2.0 CTF writer backward compatibility */ -#include +#include diff --git a/include/babeltrace/ctf-ir/utils.h b/include/babeltrace2/ctf-ir/utils.h similarity index 53% rename from include/babeltrace/ctf-ir/utils.h rename to include/babeltrace2/ctf-ir/utils.h index ce14a424..6f9cf29c 100644 --- a/include/babeltrace/ctf-ir/utils.h +++ b/include/babeltrace2/ctf-ir/utils.h @@ -1,2 +1,2 @@ /* Pre-2.0 CTF writer backward compatibility */ -#include +#include diff --git a/include/babeltrace/ctf-writer/attributes-internal.h b/include/babeltrace2/ctf-writer/attributes-internal.h similarity index 95% rename from include/babeltrace/ctf-writer/attributes-internal.h rename to include/babeltrace2/ctf-writer/attributes-internal.h index 8b372f6e..cb365128 100644 --- a/include/babeltrace/ctf-writer/attributes-internal.h +++ b/include/babeltrace2/ctf-writer/attributes-internal.h @@ -29,8 +29,8 @@ extern "C" { #endif #include -#include -#include +#include +#include BT_HIDDEN struct bt_ctf_private_value *bt_ctf_attributes_create(void); diff --git a/include/babeltrace/ctf-writer/clock-class-internal.h b/include/babeltrace2/ctf-writer/clock-class-internal.h similarity index 94% rename from include/babeltrace/ctf-writer/clock-class-internal.h rename to include/babeltrace2/ctf-writer/clock-class-internal.h index f5743422..a9d96721 100644 --- a/include/babeltrace/ctf-writer/clock-class-internal.h +++ b/include/babeltrace2/ctf-writer/clock-class-internal.h @@ -25,11 +25,11 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/include/babeltrace/ctf-writer/clock-class.h b/include/babeltrace2/ctf-writer/clock-class.h similarity index 100% rename from include/babeltrace/ctf-writer/clock-class.h rename to include/babeltrace2/ctf-writer/clock-class.h diff --git a/include/babeltrace/ctf-writer/clock-internal.h b/include/babeltrace2/ctf-writer/clock-internal.h similarity index 85% rename from include/babeltrace/ctf-writer/clock-internal.h rename to include/babeltrace2/ctf-writer/clock-internal.h index c263b1be..8d3e1418 100644 --- a/include/babeltrace/ctf-writer/clock-internal.h +++ b/include/babeltrace2/ctf-writer/clock-internal.h @@ -23,13 +23,13 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include struct bt_ctf_clock { struct bt_ctf_object base; diff --git a/include/babeltrace/ctf-writer/clock.h b/include/babeltrace2/ctf-writer/clock.h similarity index 99% rename from include/babeltrace/ctf-writer/clock.h rename to include/babeltrace2/ctf-writer/clock.h index 36e191f3..8cef6b69 100644 --- a/include/babeltrace/ctf-writer/clock.h +++ b/include/babeltrace2/ctf-writer/clock.h @@ -29,8 +29,8 @@ */ #include -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/ctf-writer/event-class-internal.h b/include/babeltrace2/ctf-writer/event-class-internal.h similarity index 96% rename from include/babeltrace/ctf-writer/event-class-internal.h rename to include/babeltrace2/ctf-writer/event-class-internal.h index 1a12ac11..34ce8ce4 100644 --- a/include/babeltrace/ctf-writer/event-class-internal.h +++ b/include/babeltrace2/ctf-writer/event-class-internal.h @@ -25,16 +25,16 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include struct bt_ctf_event_class_common { diff --git a/include/babeltrace/ctf-writer/event-fields.h b/include/babeltrace2/ctf-writer/event-fields.h similarity index 94% rename from include/babeltrace/ctf-writer/event-fields.h rename to include/babeltrace2/ctf-writer/event-fields.h index f99f6812..23600cc2 100644 --- a/include/babeltrace/ctf-writer/event-fields.h +++ b/include/babeltrace2/ctf-writer/event-fields.h @@ -28,9 +28,9 @@ * http://www.efficios.com/ctf */ -#include -#include -#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/ctf-writer/event-internal.h b/include/babeltrace2/ctf-writer/event-internal.h similarity index 90% rename from include/babeltrace/ctf-writer/event-internal.h rename to include/babeltrace2/ctf-writer/event-internal.h index 7b6a5a67..d1d3dc9d 100644 --- a/include/babeltrace/ctf-writer/event-internal.h +++ b/include/babeltrace2/ctf-writer/event-internal.h @@ -28,22 +28,22 @@ * http://www.efficios.com/ctf */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include struct bt_ctf_stream_class; struct bt_ctf_stream_pos; diff --git a/include/babeltrace/ctf-writer/event-types.h b/include/babeltrace2/ctf-writer/event-types.h similarity index 96% rename from include/babeltrace/ctf-writer/event-types.h rename to include/babeltrace2/ctf-writer/event-types.h index 176fbb42..a6fbd61a 100644 --- a/include/babeltrace/ctf-writer/event-types.h +++ b/include/babeltrace2/ctf-writer/event-types.h @@ -28,8 +28,8 @@ * http://www.efficios.com/ctf */ -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/ctf-writer/event.h b/include/babeltrace2/ctf-writer/event.h similarity index 99% rename from include/babeltrace/ctf-writer/event.h rename to include/babeltrace2/ctf-writer/event.h index c4e8965b..1afc4453 100644 --- a/include/babeltrace/ctf-writer/event.h +++ b/include/babeltrace2/ctf-writer/event.h @@ -28,7 +28,7 @@ * http://www.efficios.com/ctf */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/ctf-writer/field-path-internal.h b/include/babeltrace2/ctf-writer/field-path-internal.h similarity index 92% rename from include/babeltrace/ctf-writer/field-path-internal.h rename to include/babeltrace2/ctf-writer/field-path-internal.h index 8bf1b4b2..d018e409 100644 --- a/include/babeltrace/ctf-writer/field-path-internal.h +++ b/include/babeltrace2/ctf-writer/field-path-internal.h @@ -26,10 +26,10 @@ * http://www.efficios.com/ctf */ -#include -#include -#include -#include +#include +#include +#include +#include #include struct bt_ctf_field_path { diff --git a/include/babeltrace/ctf-writer/field-types-internal.h b/include/babeltrace2/ctf-writer/field-types-internal.h similarity index 98% rename from include/babeltrace/ctf-writer/field-types-internal.h rename to include/babeltrace2/ctf-writer/field-types-internal.h index 48a36538..9f514772 100644 --- a/include/babeltrace/ctf-writer/field-types-internal.h +++ b/include/babeltrace2/ctf-writer/field-types-internal.h @@ -31,13 +31,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #define BT_ASSERT_PRE_CTF_FT_COMMON_HAS_ID(_ft, _type_id, _name) \ BT_ASSERT_PRE(((struct bt_ctf_field_type_common *) (_ft))->id == (_type_id), \ diff --git a/include/babeltrace/ctf-writer/field-types.h b/include/babeltrace2/ctf-writer/field-types.h similarity index 99% rename from include/babeltrace/ctf-writer/field-types.h rename to include/babeltrace2/ctf-writer/field-types.h index 88fcde96..bd0549e1 100644 --- a/include/babeltrace/ctf-writer/field-types.h +++ b/include/babeltrace2/ctf-writer/field-types.h @@ -31,7 +31,7 @@ #include #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/ctf-writer/field-wrapper-internal.h b/include/babeltrace2/ctf-writer/field-wrapper-internal.h similarity index 91% rename from include/babeltrace/ctf-writer/field-wrapper-internal.h rename to include/babeltrace2/ctf-writer/field-wrapper-internal.h index d3a49d7f..dcdf9684 100644 --- a/include/babeltrace/ctf-writer/field-wrapper-internal.h +++ b/include/babeltrace2/ctf-writer/field-wrapper-internal.h @@ -23,9 +23,9 @@ * SOFTWARE. */ -#include -#include -#include +#include +#include +#include struct bt_ctf_field_wrapper { struct bt_ctf_object base; diff --git a/include/babeltrace/ctf-writer/fields-internal.h b/include/babeltrace2/ctf-writer/fields-internal.h similarity index 98% rename from include/babeltrace/ctf-writer/fields-internal.h rename to include/babeltrace2/ctf-writer/fields-internal.h index e56c4f30..0586fdd7 100644 --- a/include/babeltrace/ctf-writer/fields-internal.h +++ b/include/babeltrace2/ctf-writer/fields-internal.h @@ -31,15 +31,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/include/babeltrace/ctf-writer/fields.h b/include/babeltrace2/ctf-writer/fields.h similarity index 100% rename from include/babeltrace/ctf-writer/fields.h rename to include/babeltrace2/ctf-writer/fields.h diff --git a/include/babeltrace/ctf-writer/functor-internal.h b/include/babeltrace2/ctf-writer/functor-internal.h similarity index 97% rename from include/babeltrace/ctf-writer/functor-internal.h rename to include/babeltrace2/ctf-writer/functor-internal.h index 3e2d4e0b..0d6cda19 100644 --- a/include/babeltrace/ctf-writer/functor-internal.h +++ b/include/babeltrace2/ctf-writer/functor-internal.h @@ -26,7 +26,7 @@ */ #include -#include +#include BT_HIDDEN void value_exists(gpointer element, gpointer search_query); diff --git a/include/babeltrace/ctf-writer/object-internal.h b/include/babeltrace2/ctf-writer/object-internal.h similarity index 98% rename from include/babeltrace/ctf-writer/object-internal.h rename to include/babeltrace2/ctf-writer/object-internal.h index 1b5f3ae6..365b1126 100644 --- a/include/babeltrace/ctf-writer/object-internal.h +++ b/include/babeltrace2/ctf-writer/object-internal.h @@ -25,8 +25,8 @@ * SOFTWARE. */ -#include -#include +#include +#include #include struct bt_ctf_object; diff --git a/include/babeltrace/ctf-writer/object-pool-internal.h b/include/babeltrace2/ctf-writer/object-pool-internal.h similarity index 99% rename from include/babeltrace/ctf-writer/object-pool-internal.h rename to include/babeltrace2/ctf-writer/object-pool-internal.h index f72deb46..1217ef12 100644 --- a/include/babeltrace/ctf-writer/object-pool-internal.h +++ b/include/babeltrace2/ctf-writer/object-pool-internal.h @@ -50,7 +50,7 @@ */ #include -#include +#include typedef void *(*bt_ctf_object_pool_new_object_func)(void *data); typedef void *(*bt_ctf_object_pool_destroy_object_func)(void *obj, void *data); diff --git a/include/babeltrace/ctf-writer/object.h b/include/babeltrace2/ctf-writer/object.h similarity index 99% rename from include/babeltrace/ctf-writer/object.h rename to include/babeltrace2/ctf-writer/object.h index 12df7514..f82f4870 100644 --- a/include/babeltrace/ctf-writer/object.h +++ b/include/babeltrace2/ctf-writer/object.h @@ -35,7 +35,7 @@ extern "C" { @brief Common reference counting management for all Babeltrace objects. @code -#include +#include @endcode The macros and functions of this module are everything that is needed diff --git a/include/babeltrace/ctf-writer/resolve-internal.h b/include/babeltrace2/ctf-writer/resolve-internal.h similarity index 93% rename from include/babeltrace/ctf-writer/resolve-internal.h rename to include/babeltrace2/ctf-writer/resolve-internal.h index 340694e5..f779238d 100644 --- a/include/babeltrace/ctf-writer/resolve-internal.h +++ b/include/babeltrace2/ctf-writer/resolve-internal.h @@ -27,10 +27,10 @@ * SOFTWARE. */ -#include -#include -#include -#include +#include +#include +#include +#include #include enum bt_ctf_resolve_flag { diff --git a/include/babeltrace/ctf-writer/stream-class-internal.h b/include/babeltrace2/ctf-writer/stream-class-internal.h similarity index 96% rename from include/babeltrace/ctf-writer/stream-class-internal.h rename to include/babeltrace2/ctf-writer/stream-class-internal.h index 83f0bd41..20982535 100644 --- a/include/babeltrace/ctf-writer/stream-class-internal.h +++ b/include/babeltrace2/ctf-writer/stream-class-internal.h @@ -28,17 +28,17 @@ * http://www.efficios.com/ctf */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include struct bt_ctf_stream_class_common { diff --git a/include/babeltrace/ctf-writer/stream-class.h b/include/babeltrace2/ctf-writer/stream-class.h similarity index 98% rename from include/babeltrace/ctf-writer/stream-class.h rename to include/babeltrace2/ctf-writer/stream-class.h index f9f49436..a5fb64de 100644 --- a/include/babeltrace/ctf-writer/stream-class.h +++ b/include/babeltrace2/ctf-writer/stream-class.h @@ -28,7 +28,7 @@ * http://www.efficios.com/ctf */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/ctf-writer/stream-internal.h b/include/babeltrace2/ctf-writer/stream-internal.h similarity index 89% rename from include/babeltrace/ctf-writer/stream-internal.h rename to include/babeltrace2/ctf-writer/stream-internal.h index 565d53f2..456a6f4d 100644 --- a/include/babeltrace/ctf-writer/stream-internal.h +++ b/include/babeltrace2/ctf-writer/stream-internal.h @@ -28,14 +28,14 @@ * http://www.efficios.com/ctf */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include struct bt_ctf_stream_common; diff --git a/include/babeltrace/ctf-writer/stream.h b/include/babeltrace2/ctf-writer/stream.h similarity index 100% rename from include/babeltrace/ctf-writer/stream.h rename to include/babeltrace2/ctf-writer/stream.h diff --git a/include/babeltrace/ctf-writer/trace-internal.h b/include/babeltrace2/ctf-writer/trace-internal.h similarity index 94% rename from include/babeltrace/ctf-writer/trace-internal.h rename to include/babeltrace2/ctf-writer/trace-internal.h index fbfd2e03..ff313cf4 100644 --- a/include/babeltrace/ctf-writer/trace-internal.h +++ b/include/babeltrace2/ctf-writer/trace-internal.h @@ -28,19 +28,19 @@ * http://www.efficios.com/ctf */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/include/babeltrace/ctf-writer/trace.h b/include/babeltrace2/ctf-writer/trace.h similarity index 100% rename from include/babeltrace/ctf-writer/trace.h rename to include/babeltrace2/ctf-writer/trace.h diff --git a/include/babeltrace/ctf-writer/utils-internal.h b/include/babeltrace2/ctf-writer/utils-internal.h similarity index 97% rename from include/babeltrace/ctf-writer/utils-internal.h rename to include/babeltrace2/ctf-writer/utils-internal.h index 991207a5..d253824c 100644 --- a/include/babeltrace/ctf-writer/utils-internal.h +++ b/include/babeltrace2/ctf-writer/utils-internal.h @@ -21,10 +21,10 @@ * SOFTWARE. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #define BT_CTF_TO_COMMON(_obj) (&(_obj)->common) diff --git a/include/babeltrace/ctf-writer/utils.h b/include/babeltrace2/ctf-writer/utils.h similarity index 98% rename from include/babeltrace/ctf-writer/utils.h rename to include/babeltrace2/ctf-writer/utils.h index f68e3ab5..416fb3b7 100644 --- a/include/babeltrace/ctf-writer/utils.h +++ b/include/babeltrace2/ctf-writer/utils.h @@ -29,7 +29,7 @@ */ /* For bt_bool */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/ctf-writer/validation-internal.h b/include/babeltrace2/ctf-writer/validation-internal.h similarity index 98% rename from include/babeltrace/ctf-writer/validation-internal.h rename to include/babeltrace2/ctf-writer/validation-internal.h index 996126bd..608078f0 100644 --- a/include/babeltrace/ctf-writer/validation-internal.h +++ b/include/babeltrace2/ctf-writer/validation-internal.h @@ -23,8 +23,8 @@ * SOFTWARE. */ -#include -#include +#include +#include struct bt_ctf_trace_common; struct bt_ctf_stream_class_common; diff --git a/include/babeltrace/ctf-writer/values-internal.h b/include/babeltrace2/ctf-writer/values-internal.h similarity index 99% rename from include/babeltrace/ctf-writer/values-internal.h rename to include/babeltrace2/ctf-writer/values-internal.h index 4cd74e1b..dff46384 100644 --- a/include/babeltrace/ctf-writer/values-internal.h +++ b/include/babeltrace2/ctf-writer/values-internal.h @@ -24,7 +24,7 @@ * SOFTWARE. */ -#include +#include struct bt_ctf_value; struct bt_ctf_private_value; diff --git a/include/babeltrace/ctf-writer/visitor-internal.h b/include/babeltrace2/ctf-writer/visitor-internal.h similarity index 95% rename from include/babeltrace/ctf-writer/visitor-internal.h rename to include/babeltrace2/ctf-writer/visitor-internal.h index 993b92b3..810628d1 100644 --- a/include/babeltrace/ctf-writer/visitor-internal.h +++ b/include/babeltrace2/ctf-writer/visitor-internal.h @@ -25,8 +25,8 @@ * SOFTWARE. */ -#include -#include +#include +#include typedef void *(*bt_ctf_child_accessor)(void *object, int index); typedef int64_t (*bt_ctf_child_count_accessor)(void *object); diff --git a/include/babeltrace/ctf-writer/visitor.h b/include/babeltrace2/ctf-writer/visitor.h similarity index 99% rename from include/babeltrace/ctf-writer/visitor.h rename to include/babeltrace2/ctf-writer/visitor.h index f6bbd0c4..0ff698a5 100644 --- a/include/babeltrace/ctf-writer/visitor.h +++ b/include/babeltrace2/ctf-writer/visitor.h @@ -38,7 +38,7 @@ extern "C" { @brief CTF IR visitor. @code -#include +#include @endcode A CTF IR visitor is a function that you diff --git a/include/babeltrace/ctf-writer/writer-internal.h b/include/babeltrace2/ctf-writer/writer-internal.h similarity index 92% rename from include/babeltrace/ctf-writer/writer-internal.h rename to include/babeltrace2/ctf-writer/writer-internal.h index 3a885dee..7969513b 100644 --- a/include/babeltrace/ctf-writer/writer-internal.h +++ b/include/babeltrace2/ctf-writer/writer-internal.h @@ -25,13 +25,13 @@ * SOFTWARE. */ -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include struct metadata_context { GString *string; diff --git a/include/babeltrace/ctf-writer/writer.h b/include/babeltrace2/ctf-writer/writer.h similarity index 97% rename from include/babeltrace/ctf-writer/writer.h rename to include/babeltrace2/ctf-writer/writer.h index 82719c66..9b918a3a 100644 --- a/include/babeltrace/ctf-writer/writer.h +++ b/include/babeltrace2/ctf-writer/writer.h @@ -28,10 +28,10 @@ * http://www.efficios.com/ctf */ -#include -#include -#include -#include +#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace2/ctf/events.h b/include/babeltrace2/ctf/events.h new file mode 100644 index 00000000..4c67e95d --- /dev/null +++ b/include/babeltrace2/ctf/events.h @@ -0,0 +1,7 @@ +/* Pre-2.0 CTF writer backward compatibility */ +#include +#include +#include +#include +#include +#include diff --git a/include/babeltrace/ctfser-internal.h b/include/babeltrace2/ctfser-internal.h similarity index 97% rename from include/babeltrace/ctfser-internal.h rename to include/babeltrace2/ctfser-internal.h index 3522bae0..983b86f0 100644 --- a/include/babeltrace/ctfser-internal.h +++ b/include/babeltrace2/ctfser-internal.h @@ -31,17 +31,17 @@ #include #include #include -#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include struct bt_ctfser { diff --git a/include/babeltrace/endian-internal.h b/include/babeltrace2/endian-internal.h similarity index 100% rename from include/babeltrace/endian-internal.h rename to include/babeltrace2/endian-internal.h diff --git a/include/babeltrace/fd-cache-internal.h b/include/babeltrace2/fd-cache-internal.h similarity index 97% rename from include/babeltrace/fd-cache-internal.h rename to include/babeltrace2/fd-cache-internal.h index 4a623e0e..546dcfaa 100644 --- a/include/babeltrace/fd-cache-internal.h +++ b/include/babeltrace2/fd-cache-internal.h @@ -28,7 +28,7 @@ * SOFTWARE. */ -#include +#include struct bt_fd_cache_handle { int fd; diff --git a/include/babeltrace/graph/component-class-const.h b/include/babeltrace2/graph/component-class-const.h similarity index 99% rename from include/babeltrace/graph/component-class-const.h rename to include/babeltrace2/graph/component-class-const.h index be76e85e..ad018311 100644 --- a/include/babeltrace/graph/component-class-const.h +++ b/include/babeltrace2/graph/component-class-const.h @@ -25,7 +25,7 @@ */ /* For bt_bool, bt_component_class */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/component-class-filter-const.h b/include/babeltrace2/graph/component-class-filter-const.h similarity index 98% rename from include/babeltrace/graph/component-class-filter-const.h rename to include/babeltrace2/graph/component-class-filter-const.h index 7b11819d..299d2a54 100644 --- a/include/babeltrace/graph/component-class-filter-const.h +++ b/include/babeltrace2/graph/component-class-filter-const.h @@ -28,7 +28,7 @@ * For bt_component_class, bt_component_class_filter, * __BT_UPCAST_CONST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/component-class-filter.h b/include/babeltrace2/graph/component-class-filter.h similarity index 97% rename from include/babeltrace/graph/component-class-filter.h rename to include/babeltrace2/graph/component-class-filter.h index 2e8f472e..74d92ab9 100644 --- a/include/babeltrace/graph/component-class-filter.h +++ b/include/babeltrace2/graph/component-class-filter.h @@ -27,16 +27,16 @@ #include /* For bt_self_component_status */ -#include +#include /* For bt_self_message_iterator_status */ -#include +#include /* For bt_query_status */ -#include +#include /* For bt_component_class_status */ -#include +#include /* * For bt_component_class, bt_component_class_filter, bt_port_input, @@ -45,7 +45,7 @@ * bt_self_component_port_output, bt_value, bt_message_array_const, * bt_bool, bt_self_message_iterator, __BT_UPCAST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/component-class-internal.h b/include/babeltrace2/graph/component-class-internal.h similarity index 93% rename from include/babeltrace/graph/component-class-internal.h rename to include/babeltrace2/graph/component-class-internal.h index b6e71881..4e39404f 100644 --- a/include/babeltrace/graph/component-class-internal.h +++ b/include/babeltrace2/graph/component-class-internal.h @@ -26,15 +26,15 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include struct bt_component_class; diff --git a/include/babeltrace/graph/component-class-sink-colander-internal.h b/include/babeltrace2/graph/component-class-sink-colander-internal.h similarity index 95% rename from include/babeltrace/graph/component-class-sink-colander-internal.h rename to include/babeltrace2/graph/component-class-sink-colander-internal.h index 083f9762..faa7a6eb 100644 --- a/include/babeltrace/graph/component-class-sink-colander-internal.h +++ b/include/babeltrace2/graph/component-class-sink-colander-internal.h @@ -24,8 +24,8 @@ */ #include -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/component-class-sink-const.h b/include/babeltrace2/graph/component-class-sink-const.h similarity index 98% rename from include/babeltrace/graph/component-class-sink-const.h rename to include/babeltrace2/graph/component-class-sink-const.h index fd49c6df..31c0f88b 100644 --- a/include/babeltrace/graph/component-class-sink-const.h +++ b/include/babeltrace2/graph/component-class-sink-const.h @@ -25,7 +25,7 @@ */ /* For bt_component_class, bt_component_class_sink, __BT_UPCAST_CONST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/component-class-sink.h b/include/babeltrace2/graph/component-class-sink.h similarity index 96% rename from include/babeltrace/graph/component-class-sink.h rename to include/babeltrace2/graph/component-class-sink.h index a34dcfd6..4a16a834 100644 --- a/include/babeltrace/graph/component-class-sink.h +++ b/include/babeltrace2/graph/component-class-sink.h @@ -27,13 +27,13 @@ #include /* For bt_self_component_status */ -#include +#include /* For bt_query_status */ -#include +#include /* For bt_component_class_status */ -#include +#include /* * For bt_component_class, bt_component_class_sink, bt_port_output, @@ -41,7 +41,7 @@ * bt_self_component_sink, bt_self_component_port_input, bt_value, * __BT_UPCAST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/component-class-source-const.h b/include/babeltrace2/graph/component-class-source-const.h similarity index 98% rename from include/babeltrace/graph/component-class-source-const.h rename to include/babeltrace2/graph/component-class-source-const.h index f3c87ff6..06419eb2 100644 --- a/include/babeltrace/graph/component-class-source-const.h +++ b/include/babeltrace2/graph/component-class-source-const.h @@ -28,7 +28,7 @@ * For bt_component_class, bt_component_class_source, * __BT_UPCAST_CONST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/component-class-source.h b/include/babeltrace2/graph/component-class-source.h similarity index 96% rename from include/babeltrace/graph/component-class-source.h rename to include/babeltrace2/graph/component-class-source.h index 4a708815..fc53971f 100644 --- a/include/babeltrace/graph/component-class-source.h +++ b/include/babeltrace2/graph/component-class-source.h @@ -27,16 +27,16 @@ #include /* For bt_self_component_status */ -#include +#include /* For bt_self_message_iterator_status */ -#include +#include /* For bt_query_status */ -#include +#include /* For bt_component_class_status */ -#include +#include /* * For bt_component_class, bt_component_class_source, bt_port_input, @@ -45,7 +45,7 @@ * bt_message_array_const, bt_bool, bt_self_message_iterator, * __BT_UPCAST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/component-class.h b/include/babeltrace2/graph/component-class.h similarity index 94% rename from include/babeltrace/graph/component-class.h rename to include/babeltrace2/graph/component-class.h index 0765293d..f2b85930 100644 --- a/include/babeltrace/graph/component-class.h +++ b/include/babeltrace2/graph/component-class.h @@ -25,13 +25,13 @@ */ /* For BT_QUERY_EXECUTOR_STATUS_* */ -#include +#include /* For bt_component_class */ -#include +#include /* For bt_component_class_status */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/component-const.h b/include/babeltrace2/graph/component-const.h similarity index 97% rename from include/babeltrace/graph/component-const.h rename to include/babeltrace2/graph/component-const.h index a0187477..00884cdd 100644 --- a/include/babeltrace/graph/component-const.h +++ b/include/babeltrace2/graph/component-const.h @@ -25,13 +25,13 @@ */ /* For bt_component_class_type */ -#include +#include /* * For bt_bool, bt_component_class, bt_component_graph, bt_component, * bt_value, bt_port */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/component-filter-const.h b/include/babeltrace2/graph/component-filter-const.h similarity index 99% rename from include/babeltrace/graph/component-filter-const.h rename to include/babeltrace2/graph/component-filter-const.h index 545691cd..4f1fa826 100644 --- a/include/babeltrace/graph/component-filter-const.h +++ b/include/babeltrace2/graph/component-filter-const.h @@ -30,7 +30,7 @@ * For bt_component, bt_component_filter, bt_port_input, bt_port_output, * __BT_UPCAST_CONST, bt_component_class_filter */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/component-filter-internal.h b/include/babeltrace2/graph/component-filter-internal.h similarity index 88% rename from include/babeltrace/graph/component-filter-internal.h rename to include/babeltrace2/graph/component-filter-internal.h index fd39f07c..5d4b4a1d 100644 --- a/include/babeltrace/graph/component-filter-internal.h +++ b/include/babeltrace2/graph/component-filter-internal.h @@ -24,10 +24,10 @@ * SOFTWARE. */ -#include -#include -#include -#include +#include +#include +#include +#include struct bt_component_filter { struct bt_component parent; diff --git a/include/babeltrace/graph/component-internal.h b/include/babeltrace2/graph/component-internal.h similarity index 94% rename from include/babeltrace/graph/component-internal.h rename to include/babeltrace2/graph/component-internal.h index 452e6c5a..13986c87 100644 --- a/include/babeltrace/graph/component-internal.h +++ b/include/babeltrace2/graph/component-internal.h @@ -24,13 +24,13 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/include/babeltrace/graph/component-sink-const.h b/include/babeltrace2/graph/component-sink-const.h similarity index 98% rename from include/babeltrace/graph/component-sink-const.h rename to include/babeltrace2/graph/component-sink-const.h index 5ce67982..223a8132 100644 --- a/include/babeltrace/graph/component-sink-const.h +++ b/include/babeltrace2/graph/component-sink-const.h @@ -30,7 +30,7 @@ * For bt_component, bt_component_filter, bt_port_input, * __BT_UPCAST_CONST, bt_component_class_sink */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/component-sink-internal.h b/include/babeltrace2/graph/component-sink-internal.h similarity index 87% rename from include/babeltrace/graph/component-sink-internal.h rename to include/babeltrace2/graph/component-sink-internal.h index 164b9635..d035711d 100644 --- a/include/babeltrace/graph/component-sink-internal.h +++ b/include/babeltrace2/graph/component-sink-internal.h @@ -24,11 +24,11 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include struct bt_component_sink { struct bt_component parent; diff --git a/include/babeltrace/graph/component-source-const.h b/include/babeltrace2/graph/component-source-const.h similarity index 98% rename from include/babeltrace/graph/component-source-const.h rename to include/babeltrace2/graph/component-source-const.h index 8604359a..43e6b49f 100644 --- a/include/babeltrace/graph/component-source-const.h +++ b/include/babeltrace2/graph/component-source-const.h @@ -30,7 +30,7 @@ * For bt_component, bt_component_filter, bt_port_output, * __BT_UPCAST_CONST, bt_component_class_source */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/component-source-internal.h b/include/babeltrace2/graph/component-source-internal.h similarity index 91% rename from include/babeltrace/graph/component-source-internal.h rename to include/babeltrace2/graph/component-source-internal.h index f1fe9e51..9106d8ae 100644 --- a/include/babeltrace/graph/component-source-internal.h +++ b/include/babeltrace2/graph/component-source-internal.h @@ -24,9 +24,9 @@ * SOFTWARE. */ -#include -#include -#include +#include +#include +#include struct bt_component_source { struct bt_component parent; diff --git a/include/babeltrace/graph/connection-const.h b/include/babeltrace2/graph/connection-const.h similarity index 98% rename from include/babeltrace/graph/connection-const.h rename to include/babeltrace2/graph/connection-const.h index 0d2724ad..facef972 100644 --- a/include/babeltrace/graph/connection-const.h +++ b/include/babeltrace2/graph/connection-const.h @@ -25,7 +25,7 @@ */ /* For bt_bool, bt_port_input, bt_port_output, bt_connection */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/connection-internal.h b/include/babeltrace2/graph/connection-internal.h similarity index 91% rename from include/babeltrace/graph/connection-internal.h rename to include/babeltrace2/graph/connection-internal.h index 2c9b9d0d..8c3dc17f 100644 --- a/include/babeltrace/graph/connection-internal.h +++ b/include/babeltrace2/graph/connection-internal.h @@ -24,11 +24,11 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include struct bt_graph; diff --git a/include/babeltrace/graph/graph-const.h b/include/babeltrace2/graph/graph-const.h similarity index 98% rename from include/babeltrace/graph/graph-const.h rename to include/babeltrace2/graph/graph-const.h index 9cb12acf..c2dd64cd 100644 --- a/include/babeltrace/graph/graph-const.h +++ b/include/babeltrace2/graph/graph-const.h @@ -25,7 +25,7 @@ */ /* For bt_bool, bt_graph */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/graph-internal.h b/include/babeltrace2/graph/graph-internal.h similarity index 95% rename from include/babeltrace/graph/graph-internal.h rename to include/babeltrace2/graph/graph-internal.h index fce624fb..dd7374ed 100644 --- a/include/babeltrace/graph/graph-internal.h +++ b/include/babeltrace2/graph/graph-internal.h @@ -24,15 +24,15 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/include/babeltrace/graph/graph.h b/include/babeltrace2/graph/graph.h similarity index 99% rename from include/babeltrace/graph/graph.h rename to include/babeltrace2/graph/graph.h index 18069603..f5bd52d5 100644 --- a/include/babeltrace/graph/graph.h +++ b/include/babeltrace2/graph/graph.h @@ -31,10 +31,10 @@ * bt_component_source, bt_connection, bt_graph, bt_port_input, * bt_port_output, bt_value */ -#include +#include /* For bt_graph_status */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-const.h b/include/babeltrace2/graph/message-const.h similarity index 98% rename from include/babeltrace/graph/message-const.h rename to include/babeltrace2/graph/message-const.h index 564fdf53..7716de59 100644 --- a/include/babeltrace/graph/message-const.h +++ b/include/babeltrace2/graph/message-const.h @@ -25,7 +25,7 @@ */ /* For bt_message */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-discarded-events-const.h b/include/babeltrace2/graph/message-discarded-events-const.h similarity index 98% rename from include/babeltrace/graph/message-discarded-events-const.h rename to include/babeltrace2/graph/message-discarded-events-const.h index 37a7bd69..eddd139a 100644 --- a/include/babeltrace/graph/message-discarded-events-const.h +++ b/include/babeltrace2/graph/message-discarded-events-const.h @@ -24,7 +24,7 @@ */ /* For bt_message, bt_clock_snapshot, bt_stream */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-discarded-events.h b/include/babeltrace2/graph/message-discarded-events.h similarity index 98% rename from include/babeltrace/graph/message-discarded-events.h rename to include/babeltrace2/graph/message-discarded-events.h index 436ddcf6..a2183632 100644 --- a/include/babeltrace/graph/message-discarded-events.h +++ b/include/babeltrace2/graph/message-discarded-events.h @@ -26,7 +26,7 @@ #include /* For bt_message, bt_self_message_iterator, bt_stream */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-discarded-items-internal.h b/include/babeltrace2/graph/message-discarded-items-internal.h similarity index 88% rename from include/babeltrace/graph/message-discarded-items-internal.h rename to include/babeltrace2/graph/message-discarded-items-internal.h index 3bd89413..404a9eef 100644 --- a/include/babeltrace/graph/message-discarded-items-internal.h +++ b/include/babeltrace2/graph/message-discarded-items-internal.h @@ -24,10 +24,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include struct bt_message_discarded_items { struct bt_message parent; diff --git a/include/babeltrace/graph/message-discarded-packets-const.h b/include/babeltrace2/graph/message-discarded-packets-const.h similarity index 98% rename from include/babeltrace/graph/message-discarded-packets-const.h rename to include/babeltrace2/graph/message-discarded-packets-const.h index 2ca8434a..f0b87806 100644 --- a/include/babeltrace/graph/message-discarded-packets-const.h +++ b/include/babeltrace2/graph/message-discarded-packets-const.h @@ -24,7 +24,7 @@ */ /* For bt_message, bt_clock_snapshot, bt_stream */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-discarded-packets.h b/include/babeltrace2/graph/message-discarded-packets.h similarity index 98% rename from include/babeltrace/graph/message-discarded-packets.h rename to include/babeltrace2/graph/message-discarded-packets.h index d12768ca..c0d4af5b 100644 --- a/include/babeltrace/graph/message-discarded-packets.h +++ b/include/babeltrace2/graph/message-discarded-packets.h @@ -26,7 +26,7 @@ #include /* For bt_message, bt_self_message_iterator, bt_stream */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-event-const.h b/include/babeltrace2/graph/message-event-const.h similarity index 98% rename from include/babeltrace/graph/message-event-const.h rename to include/babeltrace2/graph/message-event-const.h index 52044d08..0c5a681b 100644 --- a/include/babeltrace/graph/message-event-const.h +++ b/include/babeltrace2/graph/message-event-const.h @@ -25,7 +25,7 @@ */ /* For bt_bool, bt_message, bt_event. bt_clock_class, bt_clock_snapshot */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-event-internal.h b/include/babeltrace2/graph/message-event-internal.h similarity index 89% rename from include/babeltrace/graph/message-event-internal.h rename to include/babeltrace2/graph/message-event-internal.h index f0d827b9..f8b8946b 100644 --- a/include/babeltrace/graph/message-event-internal.h +++ b/include/babeltrace2/graph/message-event-internal.h @@ -24,11 +24,11 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-event.h b/include/babeltrace2/graph/message-event.h similarity index 98% rename from include/babeltrace/graph/message-event.h rename to include/babeltrace2/graph/message-event.h index 942a1d84..13a2f57c 100644 --- a/include/babeltrace/graph/message-event.h +++ b/include/babeltrace2/graph/message-event.h @@ -30,7 +30,7 @@ * For bt_self_message_iterator, bt_event, bt_packet, * bt_event_class, bt_message */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-internal.h b/include/babeltrace2/graph/message-internal.h similarity index 92% rename from include/babeltrace/graph/message-internal.h rename to include/babeltrace2/graph/message-internal.h index bfe561e5..28c66168 100644 --- a/include/babeltrace/graph/message-internal.h +++ b/include/babeltrace2/graph/message-internal.h @@ -24,14 +24,14 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include typedef struct bt_stream *(*get_stream_func)( struct bt_message *message); diff --git a/include/babeltrace/graph/message-iterator-const.h b/include/babeltrace2/graph/message-iterator-const.h similarity index 100% rename from include/babeltrace/graph/message-iterator-const.h rename to include/babeltrace2/graph/message-iterator-const.h diff --git a/include/babeltrace/graph/message-iterator-internal.h b/include/babeltrace2/graph/message-iterator-internal.h similarity index 95% rename from include/babeltrace/graph/message-iterator-internal.h rename to include/babeltrace2/graph/message-iterator-internal.h index 00ce436e..c6ef7b96 100644 --- a/include/babeltrace/graph/message-iterator-internal.h +++ b/include/babeltrace2/graph/message-iterator-internal.h @@ -24,13 +24,13 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include struct bt_port; diff --git a/include/babeltrace/graph/message-message-iterator-inactivity-const.h b/include/babeltrace2/graph/message-message-iterator-inactivity-const.h similarity index 98% rename from include/babeltrace/graph/message-message-iterator-inactivity-const.h rename to include/babeltrace2/graph/message-message-iterator-inactivity-const.h index 9be2c860..2fb65eba 100644 --- a/include/babeltrace/graph/message-message-iterator-inactivity-const.h +++ b/include/babeltrace2/graph/message-message-iterator-inactivity-const.h @@ -24,7 +24,7 @@ */ /* For bt_message, bt_clock_snapshot */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-message-iterator-inactivity-internal.h b/include/babeltrace2/graph/message-message-iterator-inactivity-internal.h similarity index 93% rename from include/babeltrace/graph/message-message-iterator-inactivity-internal.h rename to include/babeltrace2/graph/message-message-iterator-inactivity-internal.h index cd41177a..5e607e29 100644 --- a/include/babeltrace/graph/message-message-iterator-inactivity-internal.h +++ b/include/babeltrace2/graph/message-message-iterator-inactivity-internal.h @@ -24,8 +24,8 @@ */ #include -#include -#include +#include +#include struct bt_message_message_iterator_inactivity { struct bt_message parent; diff --git a/include/babeltrace/graph/message-message-iterator-inactivity.h b/include/babeltrace2/graph/message-message-iterator-inactivity.h similarity index 98% rename from include/babeltrace/graph/message-message-iterator-inactivity.h rename to include/babeltrace2/graph/message-message-iterator-inactivity.h index 8b8f83a1..701a34db 100644 --- a/include/babeltrace/graph/message-message-iterator-inactivity.h +++ b/include/babeltrace2/graph/message-message-iterator-inactivity.h @@ -26,7 +26,7 @@ #include /* For bt_self_message_iterator, bt_message, bt_clock_class */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-packet-beginning-const.h b/include/babeltrace2/graph/message-packet-beginning-const.h similarity index 98% rename from include/babeltrace/graph/message-packet-beginning-const.h rename to include/babeltrace2/graph/message-packet-beginning-const.h index 85e3294e..3776af08 100644 --- a/include/babeltrace/graph/message-packet-beginning-const.h +++ b/include/babeltrace2/graph/message-packet-beginning-const.h @@ -25,7 +25,7 @@ */ /* For bt_message, bt_packet, bt_clock_snapshot, bt_clock_class */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-packet-beginning.h b/include/babeltrace2/graph/message-packet-beginning.h similarity index 98% rename from include/babeltrace/graph/message-packet-beginning.h rename to include/babeltrace2/graph/message-packet-beginning.h index 931d4bea..5eabd3ba 100644 --- a/include/babeltrace/graph/message-packet-beginning.h +++ b/include/babeltrace2/graph/message-packet-beginning.h @@ -27,7 +27,7 @@ #include /* For bt_message, bt_self_message_iterator, bt_packet */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-packet-end-const.h b/include/babeltrace2/graph/message-packet-end-const.h similarity index 98% rename from include/babeltrace/graph/message-packet-end-const.h rename to include/babeltrace2/graph/message-packet-end-const.h index 81a31ebd..6c6c82bb 100644 --- a/include/babeltrace/graph/message-packet-end-const.h +++ b/include/babeltrace2/graph/message-packet-end-const.h @@ -25,7 +25,7 @@ */ /* For bt_message, bt_packet, bt_clock_snapshot, bt_clock_class */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-packet-end.h b/include/babeltrace2/graph/message-packet-end.h similarity index 98% rename from include/babeltrace/graph/message-packet-end.h rename to include/babeltrace2/graph/message-packet-end.h index 4c9f78f0..458cbb5f 100644 --- a/include/babeltrace/graph/message-packet-end.h +++ b/include/babeltrace2/graph/message-packet-end.h @@ -27,7 +27,7 @@ #include /* For bt_message, bt_self_message_iterator, bt_packet */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-packet-internal.h b/include/babeltrace2/graph/message-packet-internal.h similarity index 89% rename from include/babeltrace/graph/message-packet-internal.h rename to include/babeltrace2/graph/message-packet-internal.h index bcf6d117..6e532bce 100644 --- a/include/babeltrace/graph/message-packet-internal.h +++ b/include/babeltrace2/graph/message-packet-internal.h @@ -24,11 +24,11 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include struct bt_message_packet { struct bt_message parent; diff --git a/include/babeltrace/graph/message-stream-activity-beginning-const.h b/include/babeltrace2/graph/message-stream-activity-beginning-const.h similarity index 95% rename from include/babeltrace/graph/message-stream-activity-beginning-const.h rename to include/babeltrace2/graph/message-stream-activity-beginning-const.h index 3e1d7a9d..02aac777 100644 --- a/include/babeltrace/graph/message-stream-activity-beginning-const.h +++ b/include/babeltrace2/graph/message-stream-activity-beginning-const.h @@ -24,10 +24,10 @@ */ /* For bt_message, bt_clock_snapshot, bt_stream, bt_clock_class */ -#include +#include /* For bt_message_stream_activity_clock_snapshot_state */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-stream-activity-beginning.h b/include/babeltrace2/graph/message-stream-activity-beginning.h similarity index 95% rename from include/babeltrace/graph/message-stream-activity-beginning.h rename to include/babeltrace2/graph/message-stream-activity-beginning.h index f3cbb883..b1c2c3ee 100644 --- a/include/babeltrace/graph/message-stream-activity-beginning.h +++ b/include/babeltrace2/graph/message-stream-activity-beginning.h @@ -26,10 +26,10 @@ #include /* For bt_message, bt_self_message_iterator, bt_stream */ -#include +#include /* For bt_message_stream_activity_clock_snapshot_state */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-stream-activity-const.h b/include/babeltrace2/graph/message-stream-activity-const.h similarity index 100% rename from include/babeltrace/graph/message-stream-activity-const.h rename to include/babeltrace2/graph/message-stream-activity-const.h diff --git a/include/babeltrace/graph/message-stream-activity-end-const.h b/include/babeltrace2/graph/message-stream-activity-end-const.h similarity index 95% rename from include/babeltrace/graph/message-stream-activity-end-const.h rename to include/babeltrace2/graph/message-stream-activity-end-const.h index 4cf957b3..aaab5844 100644 --- a/include/babeltrace/graph/message-stream-activity-end-const.h +++ b/include/babeltrace2/graph/message-stream-activity-end-const.h @@ -24,10 +24,10 @@ */ /* For bt_message, bt_clock_snapshot, bt_stream, bt_clock_class */ -#include +#include /* For bt_message_stream_activity_clock_snapshot_state */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-stream-activity-end.h b/include/babeltrace2/graph/message-stream-activity-end.h similarity index 95% rename from include/babeltrace/graph/message-stream-activity-end.h rename to include/babeltrace2/graph/message-stream-activity-end.h index 967a6123..b28f21b5 100644 --- a/include/babeltrace/graph/message-stream-activity-end.h +++ b/include/babeltrace2/graph/message-stream-activity-end.h @@ -26,10 +26,10 @@ #include /* For bt_message, bt_self_message_iterator, bt_stream */ -#include +#include /* For bt_message_stream_activity_clock_snapshot_state */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-stream-activity-internal.h b/include/babeltrace2/graph/message-stream-activity-internal.h similarity index 90% rename from include/babeltrace/graph/message-stream-activity-internal.h rename to include/babeltrace2/graph/message-stream-activity-internal.h index d90409d4..8298b0c7 100644 --- a/include/babeltrace/graph/message-stream-activity-internal.h +++ b/include/babeltrace2/graph/message-stream-activity-internal.h @@ -24,10 +24,10 @@ */ #include -#include -#include -#include -#include +#include +#include +#include +#include struct bt_message_stream_activity { struct bt_message parent; diff --git a/include/babeltrace/graph/message-stream-beginning-const.h b/include/babeltrace2/graph/message-stream-beginning-const.h similarity index 98% rename from include/babeltrace/graph/message-stream-beginning-const.h rename to include/babeltrace2/graph/message-stream-beginning-const.h index 994fb5cb..630c30c1 100644 --- a/include/babeltrace/graph/message-stream-beginning-const.h +++ b/include/babeltrace2/graph/message-stream-beginning-const.h @@ -25,7 +25,7 @@ */ /* For bt_message, bt_clock_snapshot, bt_stream */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-stream-beginning.h b/include/babeltrace2/graph/message-stream-beginning.h similarity index 98% rename from include/babeltrace/graph/message-stream-beginning.h rename to include/babeltrace2/graph/message-stream-beginning.h index a93dd595..a5773a72 100644 --- a/include/babeltrace/graph/message-stream-beginning.h +++ b/include/babeltrace2/graph/message-stream-beginning.h @@ -25,7 +25,7 @@ */ /* For bt_message, bt_self_message_iterator, bt_stream */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-stream-end-const.h b/include/babeltrace2/graph/message-stream-end-const.h similarity index 98% rename from include/babeltrace/graph/message-stream-end-const.h rename to include/babeltrace2/graph/message-stream-end-const.h index 87153e0b..f4cabd3b 100644 --- a/include/babeltrace/graph/message-stream-end-const.h +++ b/include/babeltrace2/graph/message-stream-end-const.h @@ -25,7 +25,7 @@ */ /* For bt_message, bt_clock_snapshot, bt_stream */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-stream-end.h b/include/babeltrace2/graph/message-stream-end.h similarity index 98% rename from include/babeltrace/graph/message-stream-end.h rename to include/babeltrace2/graph/message-stream-end.h index f78f6f59..4f13eb1c 100644 --- a/include/babeltrace/graph/message-stream-end.h +++ b/include/babeltrace2/graph/message-stream-end.h @@ -25,7 +25,7 @@ */ /* For bt_message, bt_self_message_iterator, bt_stream */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/message-stream-internal.h b/include/babeltrace2/graph/message-stream-internal.h similarity index 85% rename from include/babeltrace/graph/message-stream-internal.h rename to include/babeltrace2/graph/message-stream-internal.h index 8cdcdda0..54beef6c 100644 --- a/include/babeltrace/graph/message-stream-internal.h +++ b/include/babeltrace2/graph/message-stream-internal.h @@ -24,11 +24,11 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include struct bt_message_stream { struct bt_message parent; diff --git a/include/babeltrace/graph/port-const.h b/include/babeltrace2/graph/port-const.h similarity index 98% rename from include/babeltrace/graph/port-const.h rename to include/babeltrace2/graph/port-const.h index fdc0cd69..adb4622c 100644 --- a/include/babeltrace/graph/port-const.h +++ b/include/babeltrace2/graph/port-const.h @@ -27,7 +27,7 @@ #include /* For bt_bool, bt_port, bt_connection, bt_component */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/port-input-const.h b/include/babeltrace2/graph/port-input-const.h similarity index 98% rename from include/babeltrace/graph/port-input-const.h rename to include/babeltrace2/graph/port-input-const.h index 5301769f..781b9d59 100644 --- a/include/babeltrace/graph/port-input-const.h +++ b/include/babeltrace2/graph/port-input-const.h @@ -25,7 +25,7 @@ */ /* For bt_port, bt_port_input, __BT_UPCAST_CONST */ -#include +#include #include diff --git a/include/babeltrace/graph/port-internal.h b/include/babeltrace2/graph/port-internal.h similarity index 98% rename from include/babeltrace/graph/port-internal.h rename to include/babeltrace2/graph/port-internal.h index 7b0d819c..c1be31ad 100644 --- a/include/babeltrace/graph/port-internal.h +++ b/include/babeltrace2/graph/port-internal.h @@ -24,7 +24,7 @@ * SOFTWARE. */ -#include +#include struct bt_port { struct bt_object base; diff --git a/include/babeltrace/graph/port-output-const.h b/include/babeltrace2/graph/port-output-const.h similarity index 98% rename from include/babeltrace/graph/port-output-const.h rename to include/babeltrace2/graph/port-output-const.h index 0afa640f..9de1711c 100644 --- a/include/babeltrace/graph/port-output-const.h +++ b/include/babeltrace2/graph/port-output-const.h @@ -25,7 +25,7 @@ */ /* For bt_port, bt_port_output, __BT_UPCAST_CONST */ -#include +#include #include diff --git a/include/babeltrace/graph/port-output-message-iterator.h b/include/babeltrace2/graph/port-output-message-iterator.h similarity index 97% rename from include/babeltrace/graph/port-output-message-iterator.h rename to include/babeltrace2/graph/port-output-message-iterator.h index f7543781..ebbd2e50 100644 --- a/include/babeltrace/graph/port-output-message-iterator.h +++ b/include/babeltrace2/graph/port-output-message-iterator.h @@ -26,14 +26,14 @@ #include /* For bt_message_iterator_status */ -#include +#include /* * For bt_port, bt_message, bt_message_iterator, * bt_port_output_message_iterator, bt_graph, bt_port_output, * bt_message_array_const, bt_bool, __BT_UPCAST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/query-executor-const.h b/include/babeltrace2/graph/query-executor-const.h similarity index 98% rename from include/babeltrace/graph/query-executor-const.h rename to include/babeltrace2/graph/query-executor-const.h index faec5f8c..0e0413e5 100644 --- a/include/babeltrace/graph/query-executor-const.h +++ b/include/babeltrace2/graph/query-executor-const.h @@ -24,7 +24,7 @@ */ /* For bt_bool, bt_query_executor */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/query-executor-internal.h b/include/babeltrace2/graph/query-executor-internal.h similarity index 94% rename from include/babeltrace/graph/query-executor-internal.h rename to include/babeltrace2/graph/query-executor-internal.h index 7ce90e39..2bf9367b 100644 --- a/include/babeltrace/graph/query-executor-internal.h +++ b/include/babeltrace2/graph/query-executor-internal.h @@ -23,10 +23,10 @@ * SOFTWARE. */ -#include -#include -#include -#include +#include +#include +#include +#include struct bt_query_executor { struct bt_object base; diff --git a/include/babeltrace/graph/query-executor.h b/include/babeltrace2/graph/query-executor.h similarity index 95% rename from include/babeltrace/graph/query-executor.h rename to include/babeltrace2/graph/query-executor.h index 336de60e..bc5e5b86 100644 --- a/include/babeltrace/graph/query-executor.h +++ b/include/babeltrace2/graph/query-executor.h @@ -24,10 +24,10 @@ */ /* For bt_query_executor_status */ -#include +#include /* For bt_query_executor, bt_component_class, bt_value */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/self-component-class-filter.h b/include/babeltrace2/graph/self-component-class-filter.h similarity index 98% rename from include/babeltrace/graph/self-component-class-filter.h rename to include/babeltrace2/graph/self-component-class-filter.h index 1ff7b391..5ac7cc6a 100644 --- a/include/babeltrace/graph/self-component-class-filter.h +++ b/include/babeltrace2/graph/self-component-class-filter.h @@ -28,7 +28,7 @@ * For bt_component_class_filter, bt_self_component_class_filter, * __BT_UPCAST_CONST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/self-component-class-sink.h b/include/babeltrace2/graph/self-component-class-sink.h similarity index 98% rename from include/babeltrace/graph/self-component-class-sink.h rename to include/babeltrace2/graph/self-component-class-sink.h index 2661e830..e96827f7 100644 --- a/include/babeltrace/graph/self-component-class-sink.h +++ b/include/babeltrace2/graph/self-component-class-sink.h @@ -28,7 +28,7 @@ * For bt_component_class_sink, bt_self_component_class_sink, * __BT_UPCAST_CONST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/self-component-class-source.h b/include/babeltrace2/graph/self-component-class-source.h similarity index 98% rename from include/babeltrace/graph/self-component-class-source.h rename to include/babeltrace2/graph/self-component-class-source.h index f78b4f78..4421b4f9 100644 --- a/include/babeltrace/graph/self-component-class-source.h +++ b/include/babeltrace2/graph/self-component-class-source.h @@ -28,7 +28,7 @@ * For bt_component_class_source, bt_self_component_class_source, * __BT_UPCAST_CONST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/self-component-filter.h b/include/babeltrace2/graph/self-component-filter.h similarity index 97% rename from include/babeltrace/graph/self-component-filter.h rename to include/babeltrace2/graph/self-component-filter.h index 3fec35cf..1f25d8a1 100644 --- a/include/babeltrace/graph/self-component-filter.h +++ b/include/babeltrace2/graph/self-component-filter.h @@ -27,14 +27,14 @@ #include /* For bt_self_component_status */ -#include +#include /* * For bt_component_filter, bt_self_component, bt_self_component_filter, * bt_self_component_port_input, bt_self_component_port_output, * __BT_UPCAST, __BT_UPCAST_CONST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/self-component-port-input-message-iterator.h b/include/babeltrace2/graph/self-component-port-input-message-iterator.h similarity index 97% rename from include/babeltrace/graph/self-component-port-input-message-iterator.h rename to include/babeltrace2/graph/self-component-port-input-message-iterator.h index 1efefe13..dbdf7110 100644 --- a/include/babeltrace/graph/self-component-port-input-message-iterator.h +++ b/include/babeltrace2/graph/self-component-port-input-message-iterator.h @@ -26,7 +26,7 @@ #include /* For bt_message_iterator_status */ -#include +#include /* * For bt_component, bt_message_iterator, @@ -34,7 +34,7 @@ * bt_self_component_port_input, bt_message_array_const, bt_bool, * __BT_UPCAST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/self-component-port-input.h b/include/babeltrace2/graph/self-component-port-input.h similarity index 98% rename from include/babeltrace/graph/self-component-port-input.h rename to include/babeltrace2/graph/self-component-port-input.h index 150499a2..d34b9458 100644 --- a/include/babeltrace/graph/self-component-port-input.h +++ b/include/babeltrace2/graph/self-component-port-input.h @@ -27,7 +27,7 @@ * For bt_port_input, bt_self_component_port, * bt_self_component_port_input, __BT_UPCAST, __BT_UPCAST_CONST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/self-component-port-output.h b/include/babeltrace2/graph/self-component-port-output.h similarity index 98% rename from include/babeltrace/graph/self-component-port-output.h rename to include/babeltrace2/graph/self-component-port-output.h index fee38aa8..da54390c 100644 --- a/include/babeltrace/graph/self-component-port-output.h +++ b/include/babeltrace2/graph/self-component-port-output.h @@ -27,7 +27,7 @@ * For bt_port_output, bt_self_component_port, * bt_self_component_port_output, __BT_UPCAST, __BT_UPCAST_CONST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/self-component-port.h b/include/babeltrace2/graph/self-component-port.h similarity index 98% rename from include/babeltrace/graph/self-component-port.h rename to include/babeltrace2/graph/self-component-port.h index c524cac3..c7f5be9b 100644 --- a/include/babeltrace/graph/self-component-port.h +++ b/include/babeltrace2/graph/self-component-port.h @@ -27,7 +27,7 @@ * For bt_port, bt_self_component_port, bt_self_component, * bt_connection, __BT_UPCAST_CONST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/self-component-sink.h b/include/babeltrace2/graph/self-component-sink.h similarity index 96% rename from include/babeltrace/graph/self-component-sink.h rename to include/babeltrace2/graph/self-component-sink.h index 04b8d206..f3fe5b5a 100644 --- a/include/babeltrace/graph/self-component-sink.h +++ b/include/babeltrace2/graph/self-component-sink.h @@ -26,13 +26,13 @@ #include /* For bt_self_component_status */ -#include +#include /* * For bt_component_sink, bt_self_component, bt_self_component_sink, * bt_self_component_port_input, __BT_UPCAST, __BT_UPCAST_CONST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/self-component-source.h b/include/babeltrace2/graph/self-component-source.h similarity index 96% rename from include/babeltrace/graph/self-component-source.h rename to include/babeltrace2/graph/self-component-source.h index 5fdee3f3..0e82cf56 100644 --- a/include/babeltrace/graph/self-component-source.h +++ b/include/babeltrace2/graph/self-component-source.h @@ -26,13 +26,13 @@ #include /* For bt_self_component_status */ -#include +#include /* * For bt_component_source, bt_self_component, bt_self_component_source, * bt_self_component_port_output, __BT_UPCAST, __BT_UPCAST_CONST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/self-component.h b/include/babeltrace2/graph/self-component.h similarity index 98% rename from include/babeltrace/graph/self-component.h rename to include/babeltrace2/graph/self-component.h index 0be09442..fe4e4df5 100644 --- a/include/babeltrace/graph/self-component.h +++ b/include/babeltrace2/graph/self-component.h @@ -24,7 +24,7 @@ */ /* For bt_component, bt_self_component, __BT_UPCAST */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/graph/self-message-iterator.h b/include/babeltrace2/graph/self-message-iterator.h similarity index 96% rename from include/babeltrace/graph/self-message-iterator.h rename to include/babeltrace2/graph/self-message-iterator.h index 555a7538..0ff3c0d3 100644 --- a/include/babeltrace/graph/self-message-iterator.h +++ b/include/babeltrace2/graph/self-message-iterator.h @@ -24,10 +24,10 @@ */ /* For BT_MESSAGE_ITERATOR_STATUS_* */ -#include +#include /* For bt_self_component, bt_self_message_iterator, bt_self_port_output */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/lib-logging-internal.h b/include/babeltrace2/lib-logging-internal.h similarity index 98% rename from include/babeltrace/lib-logging-internal.h rename to include/babeltrace2/lib-logging-internal.h index ae7fb9e6..3b12756d 100644 --- a/include/babeltrace/lib-logging-internal.h +++ b/include/babeltrace2/lib-logging-internal.h @@ -23,7 +23,7 @@ * SOFTWARE. */ -#include +#include #include #ifndef BT_LOG_TAG @@ -32,7 +32,7 @@ #define BT_LOG_OUTPUT_LEVEL bt_lib_log_level -#include +#include extern int bt_lib_log_level; diff --git a/include/babeltrace/list-internal.h b/include/babeltrace2/list-internal.h similarity index 100% rename from include/babeltrace/list-internal.h rename to include/babeltrace2/list-internal.h diff --git a/include/babeltrace/logging-internal.h b/include/babeltrace2/logging-internal.h similarity index 98% rename from include/babeltrace/logging-internal.h rename to include/babeltrace2/logging-internal.h index ee93660f..7aff10b2 100644 --- a/include/babeltrace/logging-internal.h +++ b/include/babeltrace2/logging-internal.h @@ -11,15 +11,15 @@ #include #include -#include -#include +#include +#include /* To detect incompatible changes you can define BT_LOG_VERSION_REQUIRED to be * the current value of BT_LOG_VERSION before including this file (or via * compiler command line): * * #define BT_LOG_VERSION_REQUIRED 4 - * #include + * #include * * Compilation will fail when included file has different version. */ @@ -77,7 +77,7 @@ * before including bt_log.h: * * #define BT_LOG_LEVEL BT_LOG_VERBOSE - * #include + * #include * * If both BT_LOG_DEF_LEVEL and BT_LOG_LEVEL are undefined, then BT_LOG_INFO * will be used for release builds (NDEBUG is defined) and BT_LOG_DEBUG @@ -122,7 +122,7 @@ * Example: * * #define BT_LOG_OUTPUT_LEVEL g_module_log_level - * #include + * #include * static int g_module_log_level = BT_LOG_INFO; * static void foo() { * BT_LOGI("Will check g_module_log_level for output log level"); @@ -140,7 +140,7 @@ * must be the first field in this structure: * * #define BT_LOG_OUTPUT_LEVEL (g_config.log_level) - * #include + * #include * struct config { * int log_level; * unsigned other_field; @@ -189,7 +189,7 @@ * before including bt_log.h: * * #define BT_LOG_TAG "MAIN" - * #include + * #include * * If both BT_LOG_DEF_TAG and BT_LOG_TAG are undefined no tag will be added to * the log message (tag prefix still could be added though). @@ -238,7 +238,7 @@ * before including bt_log.h: * * #define BT_LOG_SRCLOC BT_LOG_SRCLOC_NONE - * #include + * #include * * If both BT_LOG_DEF_SRCLOC and BT_LOG_SRCLOC are undefined, then * BT_LOG_SRCLOC_NONE will be used for release builds (NDEBUG is defined) and @@ -286,7 +286,7 @@ * very careful not to push such temporary changes to source control): * * #define BT_LOG_CENSORING BT_LOG_UNCENSORED - * #include + * #include * * If both BT_LOG_DEF_CENSORING and BT_LOG_CENSORING are undefined, then * BT_LOG_CENSORED will be used for release builds (NDEBUG is defined) and @@ -335,7 +335,7 @@ * * For example, in log_config.c: * - * #include + * #include * BT_LOG_DEFINE_TAG_PREFIX = "MyApp"; * BT_LOG_DEFINE_GLOBAL_FORMAT = {CUSTOM_MEM_WIDTH}; * BT_LOG_DEFINE_GLOBAL_OUTPUT = {BT_LOG_PUT_STD, custom_output_callback, 0}; @@ -407,7 +407,7 @@ * * // KittyHttpLogging.h * #define BT_LOG_LIBRARY_PREFIX KittyHttp_ - * #include + * #include * * Regardless of the method chosen, the end result is that bt_log symbols will * be prefixed with "KittyHttp_", so if a user of KittyHttp (say DogeBrowser) diff --git a/include/babeltrace/logging.h b/include/babeltrace2/logging.h similarity index 99% rename from include/babeltrace/logging.h rename to include/babeltrace2/logging.h index f1370577..b6b89287 100644 --- a/include/babeltrace/logging.h +++ b/include/babeltrace2/logging.h @@ -37,7 +37,7 @@ extern "C" { @brief Logging. @code -#include +#include @endcode The functions in this module control the Babeltrace library's logging diff --git a/include/babeltrace/mmap-align-internal.h b/include/babeltrace2/mmap-align-internal.h similarity index 96% rename from include/babeltrace/mmap-align-internal.h rename to include/babeltrace2/mmap-align-internal.h index bef63787..1f99ca6c 100644 --- a/include/babeltrace/mmap-align-internal.h +++ b/include/babeltrace2/mmap-align-internal.h @@ -23,11 +23,11 @@ * SOFTWARE. */ -#include +#include #include #include -#include -#include +#include +#include /* * This header implements a wrapper over mmap (mmap_align) that memory diff --git a/include/babeltrace/object-internal.h b/include/babeltrace2/object-internal.h similarity index 99% rename from include/babeltrace/object-internal.h rename to include/babeltrace2/object-internal.h index 00f48ef6..9573fb27 100644 --- a/include/babeltrace/object-internal.h +++ b/include/babeltrace2/object-internal.h @@ -24,8 +24,8 @@ * SOFTWARE. */ -#include -#include +#include +#include #include struct bt_object; diff --git a/include/babeltrace/object-pool-internal.h b/include/babeltrace2/object-pool-internal.h similarity index 99% rename from include/babeltrace/object-pool-internal.h rename to include/babeltrace2/object-pool-internal.h index 4cc5142c..5a99f962 100644 --- a/include/babeltrace/object-pool-internal.h +++ b/include/babeltrace2/object-pool-internal.h @@ -49,7 +49,7 @@ */ #include -#include +#include typedef void *(*bt_object_pool_new_object_func)(void *data); typedef void *(*bt_object_pool_destroy_object_func)(void *obj, void *data); diff --git a/include/babeltrace/plugin/plugin-const.h b/include/babeltrace2/plugin/plugin-const.h similarity index 98% rename from include/babeltrace/plugin/plugin-const.h rename to include/babeltrace2/plugin/plugin-const.h index 0f33fb31..e9d3ee34 100644 --- a/include/babeltrace/plugin/plugin-const.h +++ b/include/babeltrace2/plugin/plugin-const.h @@ -34,10 +34,10 @@ * bt_component_class_source, bt_component_class_filter, * bt_component_class_sink */ -#include +#include /* For bt_property_availability */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/plugin/plugin-dev.h b/include/babeltrace2/plugin/plugin-dev.h similarity index 99% rename from include/babeltrace/plugin/plugin-dev.h rename to include/babeltrace2/plugin/plugin-dev.h index 66b79ded..5f7d2826 100644 --- a/include/babeltrace/plugin/plugin-dev.h +++ b/include/babeltrace2/plugin/plugin-dev.h @@ -30,15 +30,15 @@ #include /* For enum bt_plugin_status */ -#include +#include /* For bt_component_class_type */ -#include +#include /* For component class method type definitions */ -#include -#include -#include +#include +#include +#include /* * _BT_HIDDEN: set the hidden attribute for internal functions diff --git a/include/babeltrace/plugin/plugin-internal.h b/include/babeltrace2/plugin/plugin-internal.h similarity index 96% rename from include/babeltrace/plugin/plugin-internal.h rename to include/babeltrace2/plugin/plugin-internal.h index 781c4ef3..f2a78fe4 100644 --- a/include/babeltrace/plugin/plugin-internal.h +++ b/include/babeltrace2/plugin/plugin-internal.h @@ -24,15 +24,15 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include enum bt_plugin_type { diff --git a/include/babeltrace/plugin/plugin-set-const.h b/include/babeltrace2/plugin/plugin-set-const.h similarity index 98% rename from include/babeltrace/plugin/plugin-set-const.h rename to include/babeltrace2/plugin/plugin-set-const.h index 772c7cbb..3e1caa06 100644 --- a/include/babeltrace/plugin/plugin-set-const.h +++ b/include/babeltrace2/plugin/plugin-set-const.h @@ -27,7 +27,7 @@ #include /* For bt_plugin, bt_plugin_set */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/plugin/plugin-so-internal.h b/include/babeltrace2/plugin/plugin-so-internal.h similarity index 98% rename from include/babeltrace/plugin/plugin-so-internal.h rename to include/babeltrace2/plugin/plugin-so-internal.h index fb41e659..094b87ad 100644 --- a/include/babeltrace/plugin/plugin-so-internal.h +++ b/include/babeltrace2/plugin/plugin-so-internal.h @@ -26,7 +26,7 @@ #include #include -#include +#include struct bt_plugin; struct bt_component_class; diff --git a/include/babeltrace/plugin/python-plugin-provider-internal.h b/include/babeltrace2/plugin/python-plugin-provider-internal.h similarity index 96% rename from include/babeltrace/plugin/python-plugin-provider-internal.h rename to include/babeltrace2/plugin/python-plugin-provider-internal.h index 68201ee6..1d7aa2ce 100644 --- a/include/babeltrace/plugin/python-plugin-provider-internal.h +++ b/include/babeltrace2/plugin/python-plugin-provider-internal.h @@ -23,7 +23,7 @@ * SOFTWARE. */ -#include +#include extern struct bt_plugin_set *bt_plugin_python_create_all_from_file(const char *path); diff --git a/include/babeltrace/prio-heap-internal.h b/include/babeltrace2/prio-heap-internal.h similarity index 98% rename from include/babeltrace/prio-heap-internal.h rename to include/babeltrace2/prio-heap-internal.h index 001e01d6..e6c6a1a3 100644 --- a/include/babeltrace/prio-heap-internal.h +++ b/include/babeltrace2/prio-heap-internal.h @@ -27,7 +27,7 @@ */ #include -#include +#include struct ptr_heap { size_t len, alloc_len; diff --git a/include/babeltrace/property-internal.h b/include/babeltrace2/property-internal.h similarity index 94% rename from include/babeltrace/property-internal.h rename to include/babeltrace2/property-internal.h index febfc472..575bf6ee 100644 --- a/include/babeltrace/property-internal.h +++ b/include/babeltrace2/property-internal.h @@ -23,9 +23,9 @@ * SOFTWARE. */ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/include/babeltrace/property.h b/include/babeltrace2/property.h similarity index 100% rename from include/babeltrace/property.h rename to include/babeltrace2/property.h diff --git a/include/babeltrace/trace-ir/attributes-internal.h b/include/babeltrace2/trace-ir/attributes-internal.h similarity index 96% rename from include/babeltrace/trace-ir/attributes-internal.h rename to include/babeltrace2/trace-ir/attributes-internal.h index 3df05a29..1784b35f 100644 --- a/include/babeltrace/trace-ir/attributes-internal.h +++ b/include/babeltrace2/trace-ir/attributes-internal.h @@ -29,8 +29,8 @@ extern "C" { #endif #include -#include -#include +#include +#include BT_HIDDEN struct bt_value *bt_attributes_create(void); diff --git a/include/babeltrace/trace-ir/clock-class-const.h b/include/babeltrace2/trace-ir/clock-class-const.h similarity index 98% rename from include/babeltrace/trace-ir/clock-class-const.h rename to include/babeltrace2/trace-ir/clock-class-const.h index ab9cd54a..a06241c2 100644 --- a/include/babeltrace/trace-ir/clock-class-const.h +++ b/include/babeltrace2/trace-ir/clock-class-const.h @@ -30,7 +30,7 @@ #include /* For bt_bool, bt_uuid, bt_clock_class */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/trace-ir/clock-class-internal.h b/include/babeltrace2/trace-ir/clock-class-internal.h similarity index 89% rename from include/babeltrace/trace-ir/clock-class-internal.h rename to include/babeltrace2/trace-ir/clock-class-internal.h index 48ab713c..7b748305 100644 --- a/include/babeltrace/trace-ir/clock-class-internal.h +++ b/include/babeltrace2/trace-ir/clock-class-internal.h @@ -24,15 +24,15 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/include/babeltrace/trace-ir/clock-class.h b/include/babeltrace2/trace-ir/clock-class.h similarity index 96% rename from include/babeltrace/trace-ir/clock-class.h rename to include/babeltrace2/trace-ir/clock-class.h index ced017f3..719d7a3e 100644 --- a/include/babeltrace/trace-ir/clock-class.h +++ b/include/babeltrace2/trace-ir/clock-class.h @@ -30,10 +30,10 @@ #include /* For bt_bool, bt_uuid, bt_clock_class, bt_trace_class */ -#include +#include /* For bt_clock_class_status */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/trace-ir/clock-snapshot-const.h b/include/babeltrace2/trace-ir/clock-snapshot-const.h similarity index 98% rename from include/babeltrace/trace-ir/clock-snapshot-const.h rename to include/babeltrace2/trace-ir/clock-snapshot-const.h index 062fe680..6ac6576a 100644 --- a/include/babeltrace/trace-ir/clock-snapshot-const.h +++ b/include/babeltrace2/trace-ir/clock-snapshot-const.h @@ -30,7 +30,7 @@ #include /* For bt_clock_class, bt_clock_snapshot */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/trace-ir/clock-snapshot-internal.h b/include/babeltrace2/trace-ir/clock-snapshot-internal.h similarity index 93% rename from include/babeltrace/trace-ir/clock-snapshot-internal.h rename to include/babeltrace2/trace-ir/clock-snapshot-internal.h index 364fe3cf..049d7fdd 100644 --- a/include/babeltrace/trace-ir/clock-snapshot-internal.h +++ b/include/babeltrace2/trace-ir/clock-snapshot-internal.h @@ -23,10 +23,10 @@ * SOFTWARE. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/include/babeltrace/trace-ir/clock-snapshot-set-internal.h b/include/babeltrace2/trace-ir/clock-snapshot-set-internal.h similarity index 96% rename from include/babeltrace/trace-ir/clock-snapshot-set-internal.h rename to include/babeltrace2/trace-ir/clock-snapshot-set-internal.h index 2adb52c1..59e51b82 100644 --- a/include/babeltrace/trace-ir/clock-snapshot-set-internal.h +++ b/include/babeltrace2/trace-ir/clock-snapshot-set-internal.h @@ -25,9 +25,9 @@ #include #include -#include -#include -#include +#include +#include +#include struct bt_clock_snapshot_set { /* Unique objects owned by this */ diff --git a/include/babeltrace/trace-ir/event-class-const.h b/include/babeltrace2/trace-ir/event-class-const.h similarity index 98% rename from include/babeltrace/trace-ir/event-class-const.h rename to include/babeltrace2/trace-ir/event-class-const.h index 66f6a577..cde2df9b 100644 --- a/include/babeltrace/trace-ir/event-class-const.h +++ b/include/babeltrace2/trace-ir/event-class-const.h @@ -28,10 +28,10 @@ */ /* For bt_property_availability */ -#include +#include /* For bt_event_class, bt_field_class, bt_stream_class */ -#include +#include #include #include diff --git a/include/babeltrace/trace-ir/event-class-internal.h b/include/babeltrace2/trace-ir/event-class-internal.h similarity index 80% rename from include/babeltrace/trace-ir/event-class-internal.h rename to include/babeltrace2/trace-ir/event-class-internal.h index 3367058c..5d673a93 100644 --- a/include/babeltrace/trace-ir/event-class-internal.h +++ b/include/babeltrace2/trace-ir/event-class-internal.h @@ -24,19 +24,19 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/include/babeltrace/trace-ir/event-class.h b/include/babeltrace2/trace-ir/event-class.h similarity index 97% rename from include/babeltrace/trace-ir/event-class.h rename to include/babeltrace2/trace-ir/event-class.h index 50cefeff..b6d712ee 100644 --- a/include/babeltrace/trace-ir/event-class.h +++ b/include/babeltrace2/trace-ir/event-class.h @@ -28,10 +28,10 @@ */ /* For bt_event_class_status, bt_event_class_log_level */ -#include +#include /* For bt_event_class, bt_stream_class */ -#include +#include #include diff --git a/include/babeltrace/trace-ir/event-const.h b/include/babeltrace2/trace-ir/event-const.h similarity index 98% rename from include/babeltrace/trace-ir/event-const.h rename to include/babeltrace2/trace-ir/event-const.h index 00dff658..15623bd4 100644 --- a/include/babeltrace/trace-ir/event-const.h +++ b/include/babeltrace2/trace-ir/event-const.h @@ -28,7 +28,7 @@ */ /* For bt_event, bt_event_class, bt_field, bt_packet */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/trace-ir/event-internal.h b/include/babeltrace2/trace-ir/event-internal.h similarity index 88% rename from include/babeltrace/trace-ir/event-internal.h rename to include/babeltrace2/trace-ir/event-internal.h index 71356bc3..46533e86 100644 --- a/include/babeltrace/trace-ir/event-internal.h +++ b/include/babeltrace2/trace-ir/event-internal.h @@ -26,23 +26,23 @@ /* Protection: this file uses BT_LIB_LOG*() macros directly */ #ifndef BABELTRACE_LIB_LOGGING_INTERNAL_H -# error Please define include before including this file. +# error Please define include before including this file. #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #define BT_ASSERT_PRE_EVENT_HOT(_event) \ diff --git a/include/babeltrace/trace-ir/event.h b/include/babeltrace2/trace-ir/event.h similarity index 96% rename from include/babeltrace/trace-ir/event.h rename to include/babeltrace2/trace-ir/event.h index e7c797ca..3fb39396 100644 --- a/include/babeltrace/trace-ir/event.h +++ b/include/babeltrace2/trace-ir/event.h @@ -28,10 +28,10 @@ */ /* For bt_event, bt_event_class, bt_field, bt_packet */ -#include +#include /* For bt_event_status */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/trace-ir/field-class-const.h b/include/babeltrace2/trace-ir/field-class-const.h similarity index 99% rename from include/babeltrace/trace-ir/field-class-const.h rename to include/babeltrace2/trace-ir/field-class-const.h index 9f2f960b..b07ee4b6 100644 --- a/include/babeltrace/trace-ir/field-class-const.h +++ b/include/babeltrace2/trace-ir/field-class-const.h @@ -34,7 +34,7 @@ * bt_field_class_signed_enumeration_mapping, * bt_field_class_enumeration_mapping_label_array, __BT_UPCAST_CONST */ -#include +#include #include #include diff --git a/include/babeltrace/trace-ir/field-class-internal.h b/include/babeltrace2/trace-ir/field-class-internal.h similarity index 97% rename from include/babeltrace/trace-ir/field-class-internal.h rename to include/babeltrace2/trace-ir/field-class-internal.h index 66df94c3..b6ba7291 100644 --- a/include/babeltrace/trace-ir/field-class-internal.h +++ b/include/babeltrace2/trace-ir/field-class-internal.h @@ -24,12 +24,12 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/include/babeltrace/trace-ir/field-class.h b/include/babeltrace2/trace-ir/field-class.h similarity index 98% rename from include/babeltrace/trace-ir/field-class.h rename to include/babeltrace2/trace-ir/field-class.h index 985eecd9..8da8acde 100644 --- a/include/babeltrace/trace-ir/field-class.h +++ b/include/babeltrace2/trace-ir/field-class.h @@ -28,13 +28,13 @@ */ /* For bt_bool, bt_field_class, bt_trace_class */ -#include +#include /* * For bt_field_class_status, * bt_field_class_integer_preferred_display_base */ -#include +#include #include #include diff --git a/include/babeltrace/trace-ir/field-const.h b/include/babeltrace2/trace-ir/field-const.h similarity index 97% rename from include/babeltrace/trace-ir/field-const.h rename to include/babeltrace2/trace-ir/field-const.h index 880cde97..7c5b46d0 100644 --- a/include/babeltrace/trace-ir/field-const.h +++ b/include/babeltrace2/trace-ir/field-const.h @@ -30,10 +30,10 @@ #include /* For bt_field_class_type */ -#include +#include /* For bt_field, bt_field_class */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/trace-ir/field-internal.h b/include/babeltrace2/trace-ir/field-internal.h similarity index 94% rename from include/babeltrace/trace-ir/field-internal.h rename to include/babeltrace2/trace-ir/field-internal.h index 96fc92f3..3da46b5f 100644 --- a/include/babeltrace/trace-ir/field-internal.h +++ b/include/babeltrace2/trace-ir/field-internal.h @@ -24,13 +24,13 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/include/babeltrace/trace-ir/field-path-const.h b/include/babeltrace2/trace-ir/field-path-const.h similarity index 98% rename from include/babeltrace/trace-ir/field-path-const.h rename to include/babeltrace2/trace-ir/field-path-const.h index 441aa801..188ca316 100644 --- a/include/babeltrace/trace-ir/field-path-const.h +++ b/include/babeltrace2/trace-ir/field-path-const.h @@ -29,7 +29,7 @@ #include /* For bt_field_path, bt_field_path_item */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/trace-ir/field-path-internal.h b/include/babeltrace2/trace-ir/field-path-internal.h similarity index 95% rename from include/babeltrace/trace-ir/field-path-internal.h rename to include/babeltrace2/trace-ir/field-path-internal.h index ffb8ad06..ef98835a 100644 --- a/include/babeltrace/trace-ir/field-path-internal.h +++ b/include/babeltrace2/trace-ir/field-path-internal.h @@ -26,9 +26,9 @@ * http://www.efficios.com/ctf */ -#include -#include -#include +#include +#include +#include #include struct bt_field_path_item { diff --git a/include/babeltrace/trace-ir/field-wrapper-internal.h b/include/babeltrace2/trace-ir/field-wrapper-internal.h similarity index 92% rename from include/babeltrace/trace-ir/field-wrapper-internal.h rename to include/babeltrace2/trace-ir/field-wrapper-internal.h index d1a7a9d8..ed16c3fd 100644 --- a/include/babeltrace/trace-ir/field-wrapper-internal.h +++ b/include/babeltrace2/trace-ir/field-wrapper-internal.h @@ -23,9 +23,9 @@ * SOFTWARE. */ -#include -#include -#include +#include +#include +#include struct bt_field_wrapper { struct bt_object base; diff --git a/include/babeltrace/trace-ir/field.h b/include/babeltrace2/trace-ir/field.h similarity index 97% rename from include/babeltrace/trace-ir/field.h rename to include/babeltrace2/trace-ir/field.h index 274794eb..d336faf3 100644 --- a/include/babeltrace/trace-ir/field.h +++ b/include/babeltrace2/trace-ir/field.h @@ -30,10 +30,10 @@ #include /* For bt_field, bt_field_class */ -#include +#include /* For bt_field_status */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/trace-ir/packet-const.h b/include/babeltrace2/trace-ir/packet-const.h similarity index 97% rename from include/babeltrace/trace-ir/packet-const.h rename to include/babeltrace2/trace-ir/packet-const.h index 82bc2008..2aa39eb6 100644 --- a/include/babeltrace/trace-ir/packet-const.h +++ b/include/babeltrace2/trace-ir/packet-const.h @@ -29,12 +29,12 @@ #include /* For bt_property_availability */ -#include +#include /* * For bt_packet, bt_packet_context_field, bt_stream */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/trace-ir/packet-context-field.h b/include/babeltrace2/trace-ir/packet-context-field.h similarity index 98% rename from include/babeltrace/trace-ir/packet-context-field.h rename to include/babeltrace2/trace-ir/packet-context-field.h index 4fcde26f..60caf579 100644 --- a/include/babeltrace/trace-ir/packet-context-field.h +++ b/include/babeltrace2/trace-ir/packet-context-field.h @@ -27,7 +27,7 @@ */ /* For bt_stream_class, bt_packet_context_field, bt_field */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/trace-ir/packet-internal.h b/include/babeltrace2/trace-ir/packet-internal.h similarity index 82% rename from include/babeltrace/trace-ir/packet-internal.h rename to include/babeltrace2/trace-ir/packet-internal.h index 23ae2f43..677c9fb0 100644 --- a/include/babeltrace/trace-ir/packet-internal.h +++ b/include/babeltrace2/trace-ir/packet-internal.h @@ -24,15 +24,15 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include struct bt_packet { struct bt_object base; diff --git a/include/babeltrace/trace-ir/packet.h b/include/babeltrace2/trace-ir/packet.h similarity index 95% rename from include/babeltrace/trace-ir/packet.h rename to include/babeltrace2/trace-ir/packet.h index d9b9d32c..17c4e377 100644 --- a/include/babeltrace/trace-ir/packet.h +++ b/include/babeltrace2/trace-ir/packet.h @@ -27,10 +27,10 @@ */ /* For bt_packet, bt_packet_context_field, bt_stream */ -#include +#include /* For bt_packet_status */ -#include +#include #include diff --git a/include/babeltrace/trace-ir/resolve-field-path-internal.h b/include/babeltrace2/trace-ir/resolve-field-path-internal.h similarity index 92% rename from include/babeltrace/trace-ir/resolve-field-path-internal.h rename to include/babeltrace2/trace-ir/resolve-field-path-internal.h index 9a98b316..2b6052fa 100644 --- a/include/babeltrace/trace-ir/resolve-field-path-internal.h +++ b/include/babeltrace2/trace-ir/resolve-field-path-internal.h @@ -26,9 +26,9 @@ * http://www.efficios.com/ctf */ -#include -#include -#include +#include +#include +#include #include struct bt_resolve_field_path_context { diff --git a/include/babeltrace/trace-ir/stream-class-const.h b/include/babeltrace2/trace-ir/stream-class-const.h similarity index 99% rename from include/babeltrace/trace-ir/stream-class-const.h rename to include/babeltrace2/trace-ir/stream-class-const.h index 84a4ba77..662eb245 100644 --- a/include/babeltrace/trace-ir/stream-class-const.h +++ b/include/babeltrace2/trace-ir/stream-class-const.h @@ -33,7 +33,7 @@ * For bt_bool, bt_trace_class, bt_stream_class, bt_event_class, * bt_stream_class */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/trace-ir/stream-class-internal.h b/include/babeltrace2/trace-ir/stream-class-internal.h similarity index 88% rename from include/babeltrace/trace-ir/stream-class-internal.h rename to include/babeltrace2/trace-ir/stream-class-internal.h index 2f806ffc..f573c014 100644 --- a/include/babeltrace/trace-ir/stream-class-internal.h +++ b/include/babeltrace2/trace-ir/stream-class-internal.h @@ -24,14 +24,14 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/include/babeltrace/trace-ir/stream-class.h b/include/babeltrace2/trace-ir/stream-class.h similarity index 97% rename from include/babeltrace/trace-ir/stream-class.h rename to include/babeltrace2/trace-ir/stream-class.h index ca130a0c..f6a950f8 100644 --- a/include/babeltrace/trace-ir/stream-class.h +++ b/include/babeltrace2/trace-ir/stream-class.h @@ -33,10 +33,10 @@ * For bt_bool, bt_trace_class, bt_stream_class, bt_event_class, * bt_clock_class */ -#include +#include /* For bt_stream_class_status */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/trace-ir/stream-const.h b/include/babeltrace2/trace-ir/stream-const.h similarity index 98% rename from include/babeltrace/trace-ir/stream-const.h rename to include/babeltrace2/trace-ir/stream-const.h index 875b9ddf..9607ef41 100644 --- a/include/babeltrace/trace-ir/stream-const.h +++ b/include/babeltrace2/trace-ir/stream-const.h @@ -28,7 +28,7 @@ */ /* For bt_trace, bt_stream, bt_stream_class */ -#include +#include #include diff --git a/include/babeltrace/trace-ir/stream-internal.h b/include/babeltrace2/trace-ir/stream-internal.h similarity index 90% rename from include/babeltrace/trace-ir/stream-internal.h rename to include/babeltrace2/trace-ir/stream-internal.h index bad49938..820a5a24 100644 --- a/include/babeltrace/trace-ir/stream-internal.h +++ b/include/babeltrace2/trace-ir/stream-internal.h @@ -24,11 +24,11 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include struct bt_stream_class; diff --git a/include/babeltrace/trace-ir/stream.h b/include/babeltrace2/trace-ir/stream.h similarity index 96% rename from include/babeltrace/trace-ir/stream.h rename to include/babeltrace2/trace-ir/stream.h index 71d21714..dbf9eff7 100644 --- a/include/babeltrace/trace-ir/stream.h +++ b/include/babeltrace2/trace-ir/stream.h @@ -28,10 +28,10 @@ */ /* For bt_trace, bt_stream, bt_stream_class */ -#include +#include /* For bt_stream_status */ -#include +#include #include diff --git a/include/babeltrace/trace-ir/trace-class-const.h b/include/babeltrace2/trace-ir/trace-class-const.h similarity index 99% rename from include/babeltrace/trace-ir/trace-class-const.h rename to include/babeltrace2/trace-ir/trace-class-const.h index 839463de..9cabb87c 100644 --- a/include/babeltrace/trace-ir/trace-class-const.h +++ b/include/babeltrace2/trace-ir/trace-class-const.h @@ -31,7 +31,7 @@ * For bt_bool, bt_uuid, bt_trace_class, bt_stream_class, * bt_field_class, bt_value */ -#include +#include #include diff --git a/include/babeltrace/trace-ir/trace-class-internal.h b/include/babeltrace2/trace-ir/trace-class-internal.h similarity index 77% rename from include/babeltrace/trace-ir/trace-class-internal.h rename to include/babeltrace2/trace-ir/trace-class-internal.h index 5afd3920..50bb1a8d 100644 --- a/include/babeltrace/trace-ir/trace-class-internal.h +++ b/include/babeltrace2/trace-ir/trace-class-internal.h @@ -24,21 +24,21 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include struct bt_trace_class { struct bt_object base; diff --git a/include/babeltrace/trace-ir/trace-class.h b/include/babeltrace2/trace-ir/trace-class.h similarity index 96% rename from include/babeltrace/trace-ir/trace-class.h rename to include/babeltrace2/trace-ir/trace-class.h index 51968f4e..ba1372f1 100644 --- a/include/babeltrace/trace-ir/trace-class.h +++ b/include/babeltrace2/trace-ir/trace-class.h @@ -31,10 +31,10 @@ * For bt_bool, bt_uuid, bt_trace_class, bt_stream_class, * bt_field_class, bt_self_component */ -#include +#include /* For bt_trace_class_status */ -#include +#include #include diff --git a/include/babeltrace/trace-ir/trace-const.h b/include/babeltrace2/trace-ir/trace-const.h similarity index 98% rename from include/babeltrace/trace-ir/trace-const.h rename to include/babeltrace2/trace-ir/trace-const.h index 15031029..98e7b526 100644 --- a/include/babeltrace/trace-ir/trace-const.h +++ b/include/babeltrace2/trace-ir/trace-const.h @@ -31,7 +31,7 @@ * For bt_bool, bt_uuid, bt_trace, bt_stream, bt_stream_class, * bt_field_class, bt_value */ -#include +#include #include diff --git a/include/babeltrace/trace-ir/trace-internal.h b/include/babeltrace2/trace-ir/trace-internal.h similarity index 78% rename from include/babeltrace/trace-ir/trace-internal.h rename to include/babeltrace2/trace-ir/trace-internal.h index 16076673..2476aa45 100644 --- a/include/babeltrace/trace-ir/trace-internal.h +++ b/include/babeltrace2/trace-ir/trace-internal.h @@ -24,22 +24,22 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include struct bt_trace { struct bt_object base; diff --git a/include/babeltrace/trace-ir/trace.h b/include/babeltrace2/trace-ir/trace.h similarity index 96% rename from include/babeltrace/trace-ir/trace.h rename to include/babeltrace2/trace-ir/trace.h index 36565dfc..57128670 100644 --- a/include/babeltrace/trace-ir/trace.h +++ b/include/babeltrace2/trace-ir/trace.h @@ -28,10 +28,10 @@ */ /* For bt_bool, bt_trace, bt_trace_class, bt_stream */ -#include +#include /* For bt_trace_status */ -#include +#include #include diff --git a/include/babeltrace/trace-ir/utils-internal.h b/include/babeltrace2/trace-ir/utils-internal.h similarity index 97% rename from include/babeltrace/trace-ir/utils-internal.h rename to include/babeltrace2/trace-ir/utils-internal.h index 2356d6ab..18014d6a 100644 --- a/include/babeltrace/trace-ir/utils-internal.h +++ b/include/babeltrace2/trace-ir/utils-internal.h @@ -23,9 +23,9 @@ * SOFTWARE. */ -#include -#include -#include +#include +#include +#include #include struct search_query { diff --git a/include/babeltrace/types.h b/include/babeltrace2/types.h similarity index 99% rename from include/babeltrace/types.h rename to include/babeltrace2/types.h index 12b35f60..3ebf5370 100644 --- a/include/babeltrace/types.h +++ b/include/babeltrace2/types.h @@ -44,7 +44,7 @@ extern "C" { @brief Babeltrace C types. @code -#include +#include @endcode This header contains custom type definitions used across the library. diff --git a/include/babeltrace/util.h b/include/babeltrace2/util.h similarity index 100% rename from include/babeltrace/util.h rename to include/babeltrace2/util.h diff --git a/include/babeltrace/value-const.h b/include/babeltrace2/value-const.h similarity index 99% rename from include/babeltrace/value-const.h rename to include/babeltrace2/value-const.h index 63368085..5142abfd 100644 --- a/include/babeltrace/value-const.h +++ b/include/babeltrace2/value-const.h @@ -27,7 +27,7 @@ #include /* For bt_bool, bt_value */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/value-internal.h b/include/babeltrace2/value-internal.h similarity index 93% rename from include/babeltrace/value-internal.h rename to include/babeltrace2/value-internal.h index 0e50e2de..abd607ab 100644 --- a/include/babeltrace/value-internal.h +++ b/include/babeltrace2/value-internal.h @@ -23,10 +23,10 @@ * SOFTWARE. */ -#include -#include -#include -#include +#include +#include +#include +#include #include struct bt_value { diff --git a/include/babeltrace/value.h b/include/babeltrace2/value.h similarity index 98% rename from include/babeltrace/value.h rename to include/babeltrace2/value.h index 0425b6b4..c2481745 100644 --- a/include/babeltrace/value.h +++ b/include/babeltrace2/value.h @@ -27,10 +27,10 @@ #include /* For bt_bool, bt_value */ -#include +#include /* For bt_value_status, bt_value_type */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/version.h b/include/babeltrace2/version.h similarity index 100% rename from include/babeltrace/version.h rename to include/babeltrace2/version.h diff --git a/lib/babeltrace2.c b/lib/babeltrace2.c index 1623b6ea..4a74214a 100644 --- a/lib/babeltrace2.c +++ b/lib/babeltrace2.c @@ -22,8 +22,8 @@ * SOFTWARE. */ -#include -#include +#include +#include #include int bt_version_get_major(void) diff --git a/lib/ctf-writer/attributes.c b/lib/ctf-writer/attributes.c index 49b84993..a594015f 100644 --- a/lib/ctf-writer/attributes.c +++ b/lib/ctf-writer/attributes.c @@ -26,15 +26,15 @@ */ #define BT_LOG_TAG "CTF-WRITER-ATTRS" -#include - -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include #include #define BT_CTF_ATTR_NAME_INDEX 0 diff --git a/lib/ctf-writer/clock-class.c b/lib/ctf-writer/clock-class.c index bc8961c1..9e3807c0 100644 --- a/lib/ctf-writer/clock-class.c +++ b/lib/ctf-writer/clock-class.c @@ -27,19 +27,19 @@ */ #define BT_LOG_TAG "CTF-WRITER-CLOCK-CLASS" -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include static void bt_ctf_clock_class_destroy(struct bt_ctf_object *obj); diff --git a/lib/ctf-writer/clock.c b/lib/ctf-writer/clock.c index acca0d89..f270ce3d 100644 --- a/lib/ctf-writer/clock.c +++ b/lib/ctf-writer/clock.c @@ -28,17 +28,17 @@ */ #define BT_LOG_TAG "CTF-WRITER-CLOCK" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include #include static diff --git a/lib/ctf-writer/event-class.c b/lib/ctf-writer/event-class.c index 47bcd2ab..f918b86d 100644 --- a/lib/ctf-writer/event-class.c +++ b/lib/ctf-writer/event-class.c @@ -22,29 +22,29 @@ */ #define BT_LOG_TAG "CTF-WRITER-EVENT-CLASS" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/ctf-writer/event.c b/lib/ctf-writer/event.c index a6c1213c..62df18b2 100644 --- a/lib/ctf-writer/event.c +++ b/lib/ctf-writer/event.c @@ -22,29 +22,29 @@ */ #define BT_LOG_TAG "CTF-WRITER-EVENT" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include static diff --git a/lib/ctf-writer/field-path.c b/lib/ctf-writer/field-path.c index ce3f2bee..eb6c0353 100644 --- a/lib/ctf-writer/field-path.c +++ b/lib/ctf-writer/field-path.c @@ -26,12 +26,12 @@ */ #define BT_LOG_TAG "CTF-WRITER-FIELD-PATH" -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/lib/ctf-writer/field-types.c b/lib/ctf-writer/field-types.c index f337d248..64cdcd17 100644 --- a/lib/ctf-writer/field-types.c +++ b/lib/ctf-writer/field-types.c @@ -23,23 +23,23 @@ */ #define BT_LOG_TAG "CTF-WRITER-FIELD-TYPES" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/ctf-writer/field-wrapper.c b/lib/ctf-writer/field-wrapper.c index 70ada901..f5629fcd 100644 --- a/lib/ctf-writer/field-wrapper.c +++ b/lib/ctf-writer/field-wrapper.c @@ -21,12 +21,12 @@ */ #define BT_LOG_TAG "CTF-WRITER-FIELD-WRAPPER" -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include BT_HIDDEN diff --git a/lib/ctf-writer/fields.c b/lib/ctf-writer/fields.c index 11021a38..a0f00a9b 100644 --- a/lib/ctf-writer/fields.c +++ b/lib/ctf-writer/fields.c @@ -23,19 +23,19 @@ */ #define BT_LOG_TAG "CTF-WRITER-FIELDS" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/ctf-writer/functor.c b/lib/ctf-writer/functor.c index d1dffc2c..e8ad20f8 100644 --- a/lib/ctf-writer/functor.c +++ b/lib/ctf-writer/functor.c @@ -27,8 +27,8 @@ */ #include -#include -#include +#include +#include BT_HIDDEN void value_exists(gpointer element, gpointer search_query) diff --git a/lib/ctf-writer/object-pool.c b/lib/ctf-writer/object-pool.c index 6cbc1944..e62356be 100644 --- a/lib/ctf-writer/object-pool.c +++ b/lib/ctf-writer/object-pool.c @@ -22,11 +22,11 @@ */ #define BT_LOG_TAG "OBJECT-POOL" -#include +#include #include -#include -#include +#include +#include int bt_ctf_object_pool_initialize(struct bt_ctf_object_pool *pool, bt_ctf_object_pool_new_object_func new_object_func, diff --git a/lib/ctf-writer/object.c b/lib/ctf-writer/object.c index 0ed50dea..b6185121 100644 --- a/lib/ctf-writer/object.c +++ b/lib/ctf-writer/object.c @@ -20,7 +20,7 @@ * SOFTWARE. */ -#include +#include void *bt_ctf_object_get_ref(void *obj) { diff --git a/lib/ctf-writer/resolve.c b/lib/ctf-writer/resolve.c index 5ef89739..bbb81ac6 100644 --- a/lib/ctf-writer/resolve.c +++ b/lib/ctf-writer/resolve.c @@ -29,18 +29,18 @@ */ #define BT_LOG_TAG "CTF-WRITER-RESOLVE" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/ctf-writer/stream-class.c b/lib/ctf-writer/stream-class.c index baf96aee..bcb79f51 100644 --- a/lib/ctf-writer/stream-class.c +++ b/lib/ctf-writer/stream-class.c @@ -22,28 +22,28 @@ */ #define BT_LOG_TAG "CTF-WRITER-STREAM-CLASS" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/ctf-writer/stream.c b/lib/ctf-writer/stream.c index 8912b011..4f0eee03 100644 --- a/lib/ctf-writer/stream.c +++ b/lib/ctf-writer/stream.c @@ -22,25 +22,25 @@ */ #define BT_LOG_TAG "CTF-WRITER-STREAM" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/ctf-writer/trace.c b/lib/ctf-writer/trace.c index 5957c1e8..e9db29a3 100644 --- a/lib/ctf-writer/trace.c +++ b/lib/ctf-writer/trace.c @@ -22,31 +22,31 @@ */ #define BT_LOG_TAG "CTF-WRITER-TRACE" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/ctf-writer/utils.c b/lib/ctf-writer/utils.c index 369edb9e..fbf515b0 100644 --- a/lib/ctf-writer/utils.c +++ b/lib/ctf-writer/utils.c @@ -27,13 +27,13 @@ */ #define BT_LOG_TAG "CTF-WRITER-UTILS" -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include diff --git a/lib/ctf-writer/validation.c b/lib/ctf-writer/validation.c index 217ff028..97a279aa 100644 --- a/lib/ctf-writer/validation.c +++ b/lib/ctf-writer/validation.c @@ -25,19 +25,19 @@ */ #define BT_LOG_TAG "CTF-WRITER-VALIDATION" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* * This function resolves and validates the field types of an event diff --git a/lib/ctf-writer/values.c b/lib/ctf-writer/values.c index dc84b769..7c45dafa 100644 --- a/lib/ctf-writer/values.c +++ b/lib/ctf-writer/values.c @@ -22,22 +22,22 @@ */ #define BT_LOG_TAG "CTF-WRITER-VALUES" -#include +#include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define BT_CTF_VALUE_FROM_CONCRETE(_concrete) ((struct bt_ctf_value *) (_concrete)) #define BT_CTF_VALUE_TO_BOOL(_base) ((struct bt_ctf_value_bool *) (_base)) diff --git a/lib/ctf-writer/visitor.c b/lib/ctf-writer/visitor.c index 76b65a0c..707cc7a8 100644 --- a/lib/ctf-writer/visitor.c +++ b/lib/ctf-writer/visitor.c @@ -26,8 +26,8 @@ * SOFTWARE. */ -#include -#include +#include +#include BT_HIDDEN int bt_ctf_visitor_helper(struct bt_ctf_visitor_object *root, diff --git a/lib/ctf-writer/writer.c b/lib/ctf-writer/writer.c index a69b1d69..e0215d33 100644 --- a/lib/ctf-writer/writer.c +++ b/lib/ctf-writer/writer.c @@ -27,21 +27,21 @@ */ #define BT_LOG_TAG "CTF-WRITER" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/graph/component-class-sink-colander.c b/lib/graph/component-class-sink-colander.c index 7f3cfeca..6a9d287e 100644 --- a/lib/graph/component-class-sink-colander.c +++ b/lib/graph/component-class-sink-colander.c @@ -21,17 +21,17 @@ */ #define BT_LOG_TAG "COLANDER" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include #include static diff --git a/lib/graph/component-class.c b/lib/graph/component-class.c index 314cc04e..4cfc3dc7 100644 --- a/lib/graph/component-class.c +++ b/lib/graph/component-class.c @@ -22,21 +22,21 @@ */ #define BT_LOG_TAG "COMP-CLASS" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #define BT_ASSERT_PRE_COMP_CLS_HOT(_cc) \ diff --git a/lib/graph/component-filter.c b/lib/graph/component-filter.c index b59543b8..8c79b638 100644 --- a/lib/graph/component-filter.c +++ b/lib/graph/component-filter.c @@ -22,18 +22,18 @@ */ #define BT_LOG_TAG "COMP-FILTER" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include BT_HIDDEN void bt_component_filter_destroy(struct bt_component *component) diff --git a/lib/graph/component-sink.c b/lib/graph/component-sink.c index 76a04152..1887fbfd 100644 --- a/lib/graph/component-sink.c +++ b/lib/graph/component-sink.c @@ -22,17 +22,17 @@ */ #define BT_LOG_TAG "COMP-SINK" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include BT_HIDDEN void bt_component_sink_destroy(struct bt_component *component) diff --git a/lib/graph/component-source.c b/lib/graph/component-source.c index 585f9b72..73740cda 100644 --- a/lib/graph/component-source.c +++ b/lib/graph/component-source.c @@ -22,19 +22,19 @@ */ #define BT_LOG_TAG "COMP-SOURCE" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include BT_HIDDEN void bt_component_source_destroy(struct bt_component *component) diff --git a/lib/graph/component.c b/lib/graph/component.c index 641ee78b..6494f648 100644 --- a/lib/graph/component.c +++ b/lib/graph/component.c @@ -22,29 +22,29 @@ */ #define BT_LOG_TAG "COMP" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/lib/graph/connection.c b/lib/graph/connection.c index 7324b40a..00b3a2a7 100644 --- a/lib/graph/connection.c +++ b/lib/graph/connection.c @@ -22,18 +22,18 @@ */ #define BT_LOG_TAG "CONNECTION" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/lib/graph/graph.c b/lib/graph/graph.c index 7555a543..f7b02a10 100644 --- a/lib/graph/graph.c +++ b/lib/graph/graph.c @@ -22,28 +22,28 @@ */ #define BT_LOG_TAG "GRAPH" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/lib/graph/iterator.c b/lib/graph/iterator.c index cbcaeb06..aec91f11 100644 --- a/lib/graph/iterator.c +++ b/lib/graph/iterator.c @@ -22,50 +22,50 @@ */ #define BT_LOG_TAG "MSG-ITER" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/graph/message/discarded-items.c b/lib/graph/message/discarded-items.c index 9a8b0a1d..5f7108f8 100644 --- a/lib/graph/message/discarded-items.c +++ b/lib/graph/message/discarded-items.c @@ -21,22 +21,22 @@ */ #define BT_LOG_TAG "MSG-DISCARDED-ITEMS" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static void destroy_discarded_items_message(struct bt_object *obj) diff --git a/lib/graph/message/event.c b/lib/graph/message/event.c index d8e2b8ce..7544e33d 100644 --- a/lib/graph/message/event.c +++ b/lib/graph/message/event.c @@ -22,23 +22,23 @@ */ #define BT_LOG_TAG "MSG-EVENT" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/lib/graph/message/message-iterator-inactivity.c b/lib/graph/message/message-iterator-inactivity.c index 0d1a2aba..4cb0a8e0 100644 --- a/lib/graph/message/message-iterator-inactivity.c +++ b/lib/graph/message/message-iterator-inactivity.c @@ -21,17 +21,17 @@ */ #define BT_LOG_TAG "MSG-MESSAGE-ITERATOR-INACTIVITY" -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static void bt_message_message_iterator_inactivity_destroy(struct bt_object *obj) diff --git a/lib/graph/message/message.c b/lib/graph/message/message.c index 2d30d04a..7cdd3d37 100644 --- a/lib/graph/message/message.c +++ b/lib/graph/message/message.c @@ -22,13 +22,13 @@ */ #define BT_LOG_TAG "MSG" -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include BT_HIDDEN void bt_message_init(struct bt_message *message, diff --git a/lib/graph/message/packet.c b/lib/graph/message/packet.c index 070a56c5..abaa7c7f 100644 --- a/lib/graph/message/packet.c +++ b/lib/graph/message/packet.c @@ -22,24 +22,24 @@ */ #define BT_LOG_TAG "MSG-PACKET" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include static inline diff --git a/lib/graph/message/stream-activity.c b/lib/graph/message/stream-activity.c index dbf88645..7ecbd461 100644 --- a/lib/graph/message/stream-activity.c +++ b/lib/graph/message/stream-activity.c @@ -21,21 +21,21 @@ */ #define BT_LOG_TAG "MSG-STREAM-ACTIVITY" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static void destroy_stream_activity_message(struct bt_object *obj) diff --git a/lib/graph/message/stream.c b/lib/graph/message/stream.c index ec6cd8cb..935942a7 100644 --- a/lib/graph/message/stream.c +++ b/lib/graph/message/stream.c @@ -22,20 +22,20 @@ */ #define BT_LOG_TAG "MSG-STREAM" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include static diff --git a/lib/graph/port.c b/lib/graph/port.c index c237f62f..f119d60b 100644 --- a/lib/graph/port.c +++ b/lib/graph/port.c @@ -22,21 +22,21 @@ */ #define BT_LOG_TAG "PORT" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static void destroy_port(struct bt_object *obj) diff --git a/lib/graph/query-executor.c b/lib/graph/query-executor.c index d4397a82..5c8e33e1 100644 --- a/lib/graph/query-executor.c +++ b/lib/graph/query-executor.c @@ -21,19 +21,19 @@ */ #define BT_LOG_TAG "QUERY-EXECUTOR" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static void bt_query_executor_destroy(struct bt_object *obj) diff --git a/lib/lib-logging.c b/lib/lib-logging.c index a516cb84..8b16a011 100644 --- a/lib/lib-logging.c +++ b/lib/lib-logging.c @@ -30,48 +30,48 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define LIB_LOGGING_BUF_SIZE (4096 * 4) diff --git a/lib/logging.c b/lib/logging.c index 871c0629..7ebb52c0 100644 --- a/lib/logging.c +++ b/lib/logging.c @@ -21,11 +21,11 @@ */ #include -#include -#include +#include +#include #define BT_LOG_TAG "LIB" -#include +#include #ifdef BT_DEV_MODE /* diff --git a/lib/object-pool.c b/lib/object-pool.c index 3b88650a..8cdf98c7 100644 --- a/lib/object-pool.c +++ b/lib/object-pool.c @@ -21,12 +21,12 @@ */ #define BT_LOG_TAG "OBJECT-POOL" -#include +#include #include -#include -#include -#include +#include +#include +#include int bt_object_pool_initialize(struct bt_object_pool *pool, bt_object_pool_new_object_func new_object_func, diff --git a/lib/plugin/plugin-so.c b/lib/plugin/plugin-so.c index ac701ec2..ec69646f 100644 --- a/lib/plugin/plugin-so.c +++ b/lib/plugin/plugin-so.c @@ -24,22 +24,22 @@ */ #define BT_LOG_TAG "PLUGIN-SO" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/plugin/plugin.c b/lib/plugin/plugin.c index 9f0bc2ac..f2f3b7ca 100644 --- a/lib/plugin/plugin.c +++ b/lib/plugin/plugin.c @@ -24,19 +24,19 @@ */ #define BT_LOG_TAG "PLUGIN" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -53,7 +53,7 @@ #define APPEND_ALL_FROM_DIR_NFDOPEN_MAX 8 #ifdef BT_BUILT_IN_PYTHON_PLUGIN_SUPPORT -#include +#include static struct bt_plugin_set *(*bt_plugin_python_create_all_from_file_sym)(const char *path) = diff --git a/lib/prio_heap/prio_heap.c b/lib/prio_heap/prio_heap.c index e6e47113..97a69ac4 100644 --- a/lib/prio_heap/prio_heap.c +++ b/lib/prio_heap/prio_heap.c @@ -23,9 +23,9 @@ * SOFTWARE. */ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/lib/trace-ir/attributes.c b/lib/trace-ir/attributes.c index 8c1a0823..8e85af5c 100644 --- a/lib/trace-ir/attributes.c +++ b/lib/trace-ir/attributes.c @@ -22,18 +22,18 @@ */ #define BT_LOG_TAG "ATTRS" -#include - -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #define BT_ATTR_NAME_INDEX 0 #define BT_ATTR_VALUE_INDEX 1 diff --git a/lib/trace-ir/clock-class.c b/lib/trace-ir/clock-class.c index 3c64ccd7..515cdb4f 100644 --- a/lib/trace-ir/clock-class.c +++ b/lib/trace-ir/clock-class.c @@ -22,21 +22,21 @@ */ #define BT_LOG_TAG "CLOCK-CLASS" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include #define BT_ASSERT_PRE_CLOCK_CLASS_HOT(_cc) \ BT_ASSERT_PRE_HOT((_cc), "Clock class", ": %!+K", (_cc)) diff --git a/lib/trace-ir/clock-snapshot.c b/lib/trace-ir/clock-snapshot.c index def5e7bc..050f82ac 100644 --- a/lib/trace-ir/clock-snapshot.c +++ b/lib/trace-ir/clock-snapshot.c @@ -21,19 +21,19 @@ */ #define BT_LOG_TAG "CLOCK-SNAPSHOT" -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include +#include BT_HIDDEN void bt_clock_snapshot_destroy(struct bt_clock_snapshot *clock_snapshot) diff --git a/lib/trace-ir/event-class.c b/lib/trace-ir/event-class.c index 0dc3f672..db3911a0 100644 --- a/lib/trace-ir/event-class.c +++ b/lib/trace-ir/event-class.c @@ -22,28 +22,28 @@ */ #define BT_LOG_TAG "EVENT-CLASS" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/lib/trace-ir/event.c b/lib/trace-ir/event.c index ec2a7e24..5f094856 100644 --- a/lib/trace-ir/event.c +++ b/lib/trace-ir/event.c @@ -22,27 +22,27 @@ */ #define BT_LOG_TAG "EVENT" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include BT_HIDDEN diff --git a/lib/trace-ir/field-class.c b/lib/trace-ir/field-class.c index b228fc0a..c1f18058 100644 --- a/lib/trace-ir/field-class.c +++ b/lib/trace-ir/field-class.c @@ -22,24 +22,24 @@ */ #define BT_LOG_TAG "FIELD-CLASSES" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/trace-ir/field-path.c b/lib/trace-ir/field-path.c index cf7594b2..23b65a75 100644 --- a/lib/trace-ir/field-path.c +++ b/lib/trace-ir/field-path.c @@ -22,17 +22,17 @@ */ #define BT_LOG_TAG "FIELD-PATH" -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include -#include +#include #include static diff --git a/lib/trace-ir/field-wrapper.c b/lib/trace-ir/field-wrapper.c index 6d02b757..8d0fdc79 100644 --- a/lib/trace-ir/field-wrapper.c +++ b/lib/trace-ir/field-wrapper.c @@ -21,12 +21,12 @@ */ #define BT_LOG_TAG "FIELD-WRAPPER" -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include BT_HIDDEN diff --git a/lib/trace-ir/field.c b/lib/trace-ir/field.c index d8ccc8a1..4cf15425 100644 --- a/lib/trace-ir/field.c +++ b/lib/trace-ir/field.c @@ -22,18 +22,18 @@ */ #define BT_LOG_TAG "FIELDS" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include static diff --git a/lib/trace-ir/packet-context-field.c b/lib/trace-ir/packet-context-field.c index 2df09f08..dbebab8e 100644 --- a/lib/trace-ir/packet-context-field.c +++ b/lib/trace-ir/packet-context-field.c @@ -21,13 +21,13 @@ */ #define BT_LOG_TAG "PACKET-CONTEXT-FIELD" -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include struct bt_field *bt_packet_context_field_borrow_field( diff --git a/lib/trace-ir/packet.c b/lib/trace-ir/packet.c index e7ef757b..e005ceaa 100644 --- a/lib/trace-ir/packet.c +++ b/lib/trace-ir/packet.c @@ -21,22 +21,22 @@ */ #define BT_LOG_TAG "PACKET" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #define BT_ASSERT_PRE_PACKET_HOT(_packet) \ diff --git a/lib/trace-ir/resolve-field-path.c b/lib/trace-ir/resolve-field-path.c index 463b50c3..1f7b5cd2 100644 --- a/lib/trace-ir/resolve-field-path.c +++ b/lib/trace-ir/resolve-field-path.c @@ -21,14 +21,14 @@ */ #define BT_LOG_TAG "RESOLVE-FIELD-PATH" -#include - -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/trace-ir/stream-class.c b/lib/trace-ir/stream-class.c index ebe3a1cc..1f6732d8 100644 --- a/lib/trace-ir/stream-class.c +++ b/lib/trace-ir/stream-class.c @@ -22,24 +22,24 @@ */ #define BT_LOG_TAG "STREAM-CLASS" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/trace-ir/stream.c b/lib/trace-ir/stream.c index 5ae914ca..3af38f32 100644 --- a/lib/trace-ir/stream.c +++ b/lib/trace-ir/stream.c @@ -22,21 +22,21 @@ */ #define BT_LOG_TAG "STREAM" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/lib/trace-ir/trace-class.c b/lib/trace-ir/trace-class.c index 591df481..51cc6691 100644 --- a/lib/trace-ir/trace-class.c +++ b/lib/trace-ir/trace-class.c @@ -22,33 +22,33 @@ */ #define BT_LOG_TAG "TRACE" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/trace-ir/trace.c b/lib/trace-ir/trace.c index 9c99a576..da8d7d75 100644 --- a/lib/trace-ir/trace.c +++ b/lib/trace-ir/trace.c @@ -22,34 +22,34 @@ */ #define BT_LOG_TAG "TRACE" -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/trace-ir/utils.c b/lib/trace-ir/utils.c index 508c5790..355cb77d 100644 --- a/lib/trace-ir/utils.c +++ b/lib/trace-ir/utils.c @@ -22,10 +22,10 @@ */ #define BT_LOG_TAG "TRACE-IR-UTILS" -#include +#include #include #include -#include -#include -#include +#include +#include +#include diff --git a/lib/util.c b/lib/util.c index c8e9f307..82456dc8 100644 --- a/lib/util.c +++ b/lib/util.c @@ -21,15 +21,15 @@ */ #define BT_LOG_TAG "UTIL" -#include +#include -#include +#include #include #include #include #include -#include -#include +#include +#include bt_util_status bt_util_clock_cycles_to_ns_from_origin(uint64_t cycles, uint64_t frequency, int64_t offset_seconds, diff --git a/lib/value.c b/lib/value.c index bf07dc8c..6ec7497d 100644 --- a/lib/value.c +++ b/lib/value.c @@ -21,21 +21,21 @@ */ #define BT_LOG_TAG "VALUES" -#include +#include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define BT_VALUE_TO_BOOL(_base) ((struct bt_value_bool *) (_base)) #define BT_VALUE_TO_INTEGER(_base) ((struct bt_value_integer *) (_base)) diff --git a/logging/log.c b/logging/log.c index 8d166a30..a7946ca6 100644 --- a/logging/log.c +++ b/logging/log.c @@ -4,8 +4,8 @@ * See LICENSE. */ -#include -#include +#include +#include #include #include @@ -289,7 +289,7 @@ extern unsigned long pthread_getsequence_np(pthread_t *); #undef __STRICT_ANSI__ #endif #endif -#include +#include #include #include #include @@ -300,8 +300,8 @@ extern unsigned long pthread_getsequence_np(pthread_t *); #define BT_LOG_OUTPUT_LEVEL dummy -#include -#include +#include +#include #if defined(_WIN32) || defined(_WIN64) #include diff --git a/plugins/ctf/common/bfcr/bfcr.c b/plugins/ctf/common/bfcr/bfcr.c index 2d5478b6..91d6788a 100644 --- a/plugins/ctf/common/bfcr/bfcr.c +++ b/plugins/ctf/common/bfcr/bfcr.c @@ -32,12 +32,12 @@ #include #include #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include "bfcr.h" diff --git a/plugins/ctf/common/bfcr/bfcr.h b/plugins/ctf/common/bfcr/bfcr.h index 466db579..66a7ef71 100644 --- a/plugins/ctf/common/bfcr/bfcr.h +++ b/plugins/ctf/common/bfcr/bfcr.h @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include "../metadata/ctf-meta.h" diff --git a/plugins/ctf/common/bfcr/logging.c b/plugins/ctf/common/bfcr/logging.c index 5d08077a..2dd5a5b1 100644 --- a/plugins/ctf/common/bfcr/logging.c +++ b/plugins/ctf/common/bfcr/logging.c @@ -21,6 +21,6 @@ */ #define BT_LOG_OUTPUT_LEVEL bfcr_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(bfcr_log_level, "BABELTRACE_PLUGIN_CTF_BFCR_LOG_LEVEL"); diff --git a/plugins/ctf/common/bfcr/logging.h b/plugins/ctf/common/bfcr/logging.h index 0c965dab..cd6fb683 100644 --- a/plugins/ctf/common/bfcr/logging.h +++ b/plugins/ctf/common/bfcr/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bfcr_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(bfcr_log_level); diff --git a/plugins/ctf/common/metadata/ast.h b/plugins/ctf/common/metadata/ast.h index b7a097c8..b2eec360 100644 --- a/plugins/ctf/common/metadata/ast.h +++ b/plugins/ctf/common/metadata/ast.h @@ -20,9 +20,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "decoder.h" #include "ctf-meta.h" diff --git a/plugins/ctf/common/metadata/ctf-meta-resolve.c b/plugins/ctf/common/metadata/ctf-meta-resolve.c index 03637f96..2d54d0fb 100644 --- a/plugins/ctf/common/metadata/ctf-meta-resolve.c +++ b/plugins/ctf/common/metadata/ctf-meta-resolve.c @@ -16,10 +16,10 @@ #define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-RESOLVE" #include "logging.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/common/metadata/ctf-meta-translate.c b/plugins/ctf/common/metadata/ctf-meta-translate.c index 5c2623a4..ca3069ae 100644 --- a/plugins/ctf/common/metadata/ctf-meta-translate.c +++ b/plugins/ctf/common/metadata/ctf-meta-translate.c @@ -15,9 +15,9 @@ #define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-TRANSLATE" #include "logging.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c b/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c index 398d977b..057e0b4e 100644 --- a/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c +++ b/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.c @@ -15,9 +15,9 @@ #define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-UPDATE-DEF-CC" #include "logging.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/common/metadata/ctf-meta-update-in-ir.c b/plugins/ctf/common/metadata/ctf-meta-update-in-ir.c index 5048c53a..806a9197 100644 --- a/plugins/ctf/common/metadata/ctf-meta-update-in-ir.c +++ b/plugins/ctf/common/metadata/ctf-meta-update-in-ir.c @@ -15,10 +15,10 @@ #define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-UPDATE-IN-IR" #include "logging.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/common/metadata/ctf-meta-update-meanings.c b/plugins/ctf/common/metadata/ctf-meta-update-meanings.c index 305523e3..1e78c3af 100644 --- a/plugins/ctf/common/metadata/ctf-meta-update-meanings.c +++ b/plugins/ctf/common/metadata/ctf-meta-update-meanings.c @@ -15,9 +15,9 @@ #define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-UPDATE-MEANINGS" #include "logging.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/common/metadata/ctf-meta-update-stream-class-config.c b/plugins/ctf/common/metadata/ctf-meta-update-stream-class-config.c index 4988d0e3..9bd0bc6c 100644 --- a/plugins/ctf/common/metadata/ctf-meta-update-stream-class-config.c +++ b/plugins/ctf/common/metadata/ctf-meta-update-stream-class-config.c @@ -15,9 +15,9 @@ #define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-UPDATE-SC-CONFIG" #include "logging.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.c b/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.c index 9bc7569d..29d231f0 100644 --- a/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.c +++ b/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.c @@ -15,9 +15,9 @@ #define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-UPDATE-TEXT-ARRAY-SEQ" #include "logging.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/common/metadata/ctf-meta-update-value-storing-indexes.c b/plugins/ctf/common/metadata/ctf-meta-update-value-storing-indexes.c index e75bc8ec..05abb49c 100644 --- a/plugins/ctf/common/metadata/ctf-meta-update-value-storing-indexes.c +++ b/plugins/ctf/common/metadata/ctf-meta-update-value-storing-indexes.c @@ -15,9 +15,9 @@ #define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-UPDATE-VALUE-STORING-INDEXES" #include "logging.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/common/metadata/ctf-meta-validate.c b/plugins/ctf/common/metadata/ctf-meta-validate.c index a84efa15..6070070c 100644 --- a/plugins/ctf/common/metadata/ctf-meta-validate.c +++ b/plugins/ctf/common/metadata/ctf-meta-validate.c @@ -15,9 +15,9 @@ #define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-VALIDATE" #include "logging.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/common/metadata/ctf-meta-visitors.h b/plugins/ctf/common/metadata/ctf-meta-visitors.h index 2856e671..91ad9292 100644 --- a/plugins/ctf/common/metadata/ctf-meta-visitors.h +++ b/plugins/ctf/common/metadata/ctf-meta-visitors.h @@ -15,8 +15,8 @@ * all copies or substantial portions of the Software. */ -#include -#include +#include +#include #include "ctf-meta.h" diff --git a/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c b/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c index 3abc7c9b..78bb4588 100644 --- a/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c +++ b/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.c @@ -15,9 +15,9 @@ #define BT_LOG_TAG "PLUGIN-CTF-METADATA-META-WARN-MEANINGLESS-HEADER-FIELDS" #include "logging.h" -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/common/metadata/ctf-meta.h b/plugins/ctf/common/metadata/ctf-meta.h index 3b338c05..3e789631 100644 --- a/plugins/ctf/common/metadata/ctf-meta.h +++ b/plugins/ctf/common/metadata/ctf-meta.h @@ -15,9 +15,9 @@ * all copies or substantial portions of the Software. */ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/common/metadata/decoder.c b/plugins/ctf/common/metadata/decoder.c index 77a68582..c39e79e3 100644 --- a/plugins/ctf/common/metadata/decoder.c +++ b/plugins/ctf/common/metadata/decoder.c @@ -20,10 +20,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/plugins/ctf/common/metadata/decoder.h b/plugins/ctf/common/metadata/decoder.h index fac2f1d7..b0f179be 100644 --- a/plugins/ctf/common/metadata/decoder.h +++ b/plugins/ctf/common/metadata/decoder.h @@ -18,7 +18,7 @@ #include #include -#include +#include /* A CTF metadata decoder object */ struct ctf_metadata_decoder; diff --git a/plugins/ctf/common/metadata/logging.c b/plugins/ctf/common/metadata/logging.c index 3d12e291..c5140a3b 100644 --- a/plugins/ctf/common/metadata/logging.c +++ b/plugins/ctf/common/metadata/logging.c @@ -21,6 +21,6 @@ */ #define BT_LOG_OUTPUT_LEVEL metadata_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(metadata_log_level, "BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL"); diff --git a/plugins/ctf/common/metadata/logging.h b/plugins/ctf/common/metadata/logging.h index 8c04b1ca..236cbc23 100644 --- a/plugins/ctf/common/metadata/logging.h +++ b/plugins/ctf/common/metadata/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL metadata_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(metadata_log_level); diff --git a/plugins/ctf/common/metadata/objstack.c b/plugins/ctf/common/metadata/objstack.c index 0ff64b5b..2f703800 100644 --- a/plugins/ctf/common/metadata/objstack.c +++ b/plugins/ctf/common/metadata/objstack.c @@ -28,9 +28,9 @@ #include "logging.h" #include -#include -#include -#include +#include +#include +#include #define OBJSTACK_ALIGN 8 /* Object stack alignment */ #define OBJSTACK_INIT_LEN 128 diff --git a/plugins/ctf/common/metadata/parser.y b/plugins/ctf/common/metadata/parser.y index 504b2b28..4e666dbb 100644 --- a/plugins/ctf/common/metadata/parser.y +++ b/plugins/ctf/common/metadata/parser.y @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include #include "scanner.h" #include "parser.h" #include "ast.h" diff --git a/plugins/ctf/common/metadata/visitor-generate-ir.c b/plugins/ctf/common/metadata/visitor-generate-ir.c index c926ad19..90074233 100644 --- a/plugins/ctf/common/metadata/visitor-generate-ir.c +++ b/plugins/ctf/common/metadata/visitor-generate-ir.c @@ -36,14 +36,14 @@ #include #include #include -#include +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "scanner.h" #include "parser.h" diff --git a/plugins/ctf/common/metadata/visitor-parent-links.c b/plugins/ctf/common/metadata/visitor-parent-links.c index 2ee9579d..c163dc12 100644 --- a/plugins/ctf/common/metadata/visitor-parent-links.c +++ b/plugins/ctf/common/metadata/visitor-parent-links.c @@ -31,12 +31,12 @@ #include #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include "scanner.h" #include "parser.h" #include "ast.h" diff --git a/plugins/ctf/common/metadata/visitor-semantic-validator.c b/plugins/ctf/common/metadata/visitor-semantic-validator.c index 96e25f08..0149d615 100644 --- a/plugins/ctf/common/metadata/visitor-semantic-validator.c +++ b/plugins/ctf/common/metadata/visitor-semantic-validator.c @@ -31,11 +31,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include "scanner.h" #include "parser.h" #include "ast.h" diff --git a/plugins/ctf/common/msg-iter/logging.c b/plugins/ctf/common/msg-iter/logging.c index 31005ba6..3b9b2850 100644 --- a/plugins/ctf/common/msg-iter/logging.c +++ b/plugins/ctf/common/msg-iter/logging.c @@ -21,7 +21,7 @@ */ #define BT_LOG_OUTPUT_LEVEL ctf_msg_iter_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(ctf_msg_iter_log_level, "BABELTRACE_PLUGIN_CTF_MSG_ITER_LOG_LEVEL"); diff --git a/plugins/ctf/common/msg-iter/logging.h b/plugins/ctf/common/msg-iter/logging.h index bd7614c9..7e41dd98 100644 --- a/plugins/ctf/common/msg-iter/logging.h +++ b/plugins/ctf/common/msg-iter/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL ctf_msg_iter_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(ctf_msg_iter_log_level); diff --git a/plugins/ctf/common/msg-iter/msg-iter.c b/plugins/ctf/common/msg-iter/msg-iter.c index 8a75d5d5..0671d9c3 100644 --- a/plugins/ctf/common/msg-iter/msg-iter.c +++ b/plugins/ctf/common/msg-iter/msg-iter.c @@ -31,10 +31,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include diff --git a/plugins/ctf/common/msg-iter/msg-iter.h b/plugins/ctf/common/msg-iter/msg-iter.h index e2aaa938..c893fda1 100644 --- a/plugins/ctf/common/msg-iter/msg-iter.h +++ b/plugins/ctf/common/msg-iter/msg-iter.h @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include "../metadata/ctf-meta.h" diff --git a/plugins/ctf/common/print.h b/plugins/ctf/common/print.h index 22381dc1..a19dbffa 100644 --- a/plugins/ctf/common/print.h +++ b/plugins/ctf/common/print.h @@ -26,7 +26,7 @@ */ #include -#include +#include #define PERR(fmt, ...) \ do { \ diff --git a/plugins/ctf/common/utils/logging.c b/plugins/ctf/common/utils/logging.c index 6fc5e6ca..9a5e1e50 100644 --- a/plugins/ctf/common/utils/logging.c +++ b/plugins/ctf/common/utils/logging.c @@ -21,6 +21,6 @@ */ #define BT_LOG_OUTPUT_LEVEL utils_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(utils_log_level, "BABELTRACE_PLUGIN_CTF_UTILS_LOG_LEVEL"); diff --git a/plugins/ctf/common/utils/logging.h b/plugins/ctf/common/utils/logging.h index eef0625b..a5f51675 100644 --- a/plugins/ctf/common/utils/logging.h +++ b/plugins/ctf/common/utils/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL utils_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(utils_log_level); diff --git a/plugins/ctf/common/utils/utils.h b/plugins/ctf/common/utils/utils.h index 2d07ad2f..266ae7cf 100644 --- a/plugins/ctf/common/utils/utils.h +++ b/plugins/ctf/common/utils/utils.h @@ -25,7 +25,7 @@ * SOFTWARE. */ -#include -#include +#include +#include #endif /* CTF_UTILS_H */ diff --git a/plugins/ctf/fs-sink/fs-sink-ctf-meta.h b/plugins/ctf/fs-sink/fs-sink-ctf-meta.h index 3bc55855..2070c39a 100644 --- a/plugins/ctf/fs-sink/fs-sink-ctf-meta.h +++ b/plugins/ctf/fs-sink/fs-sink-ctf-meta.h @@ -15,10 +15,10 @@ * all copies or substantial portions of the Software. */ -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/fs-sink/fs-sink-stream.c b/plugins/ctf/fs-sink/fs-sink-stream.c index 26977c2f..edf8dd03 100644 --- a/plugins/ctf/fs-sink/fs-sink-stream.c +++ b/plugins/ctf/fs-sink/fs-sink-stream.c @@ -23,13 +23,13 @@ #define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-STREAM" #include "logging.h" -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include "fs-sink-trace.h" #include "fs-sink-stream.h" diff --git a/plugins/ctf/fs-sink/fs-sink-stream.h b/plugins/ctf/fs-sink/fs-sink-stream.h index ad6fdcfd..959d01a5 100644 --- a/plugins/ctf/fs-sink/fs-sink-stream.h +++ b/plugins/ctf/fs-sink/fs-sink-stream.h @@ -23,9 +23,9 @@ * SOFTWARE. */ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/fs-sink/fs-sink-trace.c b/plugins/ctf/fs-sink/fs-sink-trace.c index c4e8aa18..400b21d7 100644 --- a/plugins/ctf/fs-sink/fs-sink-trace.c +++ b/plugins/ctf/fs-sink/fs-sink-trace.c @@ -23,12 +23,12 @@ #define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-TRACE" #include "logging.h" -#include +#include #include #include #include -#include -#include +#include +#include #include "translate-trace-ir-to-ctf-ir.h" #include "translate-ctf-ir-to-tsdl.h" diff --git a/plugins/ctf/fs-sink/fs-sink-trace.h b/plugins/ctf/fs-sink/fs-sink-trace.h index b95e6b15..e135ffa6 100644 --- a/plugins/ctf/fs-sink/fs-sink-trace.h +++ b/plugins/ctf/fs-sink/fs-sink-trace.h @@ -23,9 +23,9 @@ * SOFTWARE. */ -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/fs-sink/fs-sink.c b/plugins/ctf/fs-sink/fs-sink.c index 9cc43883..021066f0 100644 --- a/plugins/ctf/fs-sink/fs-sink.c +++ b/plugins/ctf/fs-sink/fs-sink.c @@ -23,12 +23,12 @@ #define BT_LOG_TAG "PLUGIN-CTF-FS-SINK" #include "logging.h" -#include +#include #include #include #include -#include -#include +#include +#include #include "fs-sink.h" #include "fs-sink-trace.h" diff --git a/plugins/ctf/fs-sink/fs-sink.h b/plugins/ctf/fs-sink/fs-sink.h index c9b94ae3..278bdbec 100644 --- a/plugins/ctf/fs-sink/fs-sink.h +++ b/plugins/ctf/fs-sink/fs-sink.h @@ -23,8 +23,8 @@ * SOFTWARE. */ -#include -#include +#include +#include #include #include diff --git a/plugins/ctf/fs-sink/logging.c b/plugins/ctf/fs-sink/logging.c index 689bf9df..e53d744b 100644 --- a/plugins/ctf/fs-sink/logging.c +++ b/plugins/ctf/fs-sink/logging.c @@ -21,7 +21,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_plugin_fs_sink_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(bt_plugin_fs_sink_log_level, "BABELTRACE_SINK_CTF_FS_LOG_LEVEL"); diff --git a/plugins/ctf/fs-sink/logging.h b/plugins/ctf/fs-sink/logging.h index c0db376b..3ae63201 100644 --- a/plugins/ctf/fs-sink/logging.h +++ b/plugins/ctf/fs-sink/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_plugin_fs_sink_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(bt_plugin_fs_sink_log_level); diff --git a/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c b/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c index e8522138..57159953 100644 --- a/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c +++ b/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.c @@ -23,14 +23,14 @@ #define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-TRANSLATE-CTF-IR-TO-TSDL" #include "logging.h" -#include -#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include "fs-sink-ctf-meta.h" diff --git a/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c b/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c index 2be99f97..d398f659 100644 --- a/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c +++ b/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.c @@ -23,10 +23,10 @@ #define BT_LOG_TAG "PLUGIN-CTF-FS-SINK-TRANSLATE-TRACE-IR-TO-CTF-IR" #include "logging.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.h b/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.h index 37872377..23cd5d98 100644 --- a/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.h +++ b/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.h @@ -23,8 +23,8 @@ * SOFTWARE. */ -#include -#include +#include +#include #include "fs-sink-ctf-meta.h" diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c index 1f75eaa4..e89f0719 100644 --- a/plugins/ctf/fs-src/data-stream-file.c +++ b/plugins/ctf/fs-src/data-stream-file.c @@ -29,14 +29,14 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "file.h" #include "metadata.h" #include "../common/msg-iter/msg-iter.h" -#include +#include #include "data-stream-file.h" #include diff --git a/plugins/ctf/fs-src/data-stream-file.h b/plugins/ctf/fs-src/data-stream-file.h index 1231be19..feeef675 100644 --- a/plugins/ctf/fs-src/data-stream-file.h +++ b/plugins/ctf/fs-src/data-stream-file.h @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include "../common/msg-iter/msg-iter.h" #include "lttng-index.h" diff --git a/plugins/ctf/fs-src/file.h b/plugins/ctf/fs-src/file.h index d18bd4f7..4e578af3 100644 --- a/plugins/ctf/fs-src/file.h +++ b/plugins/ctf/fs-src/file.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include "fs.h" BT_HIDDEN diff --git a/plugins/ctf/fs-src/fs.c b/plugins/ctf/fs-src/fs.c index b0ca793b..3cee435a 100644 --- a/plugins/ctf/fs-src/fs.c +++ b/plugins/ctf/fs-src/fs.c @@ -25,12 +25,12 @@ * SOFTWARE. */ -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include #include #include "fs.h" diff --git a/plugins/ctf/fs-src/fs.h b/plugins/ctf/fs-src/fs.h index 9364af22..aa073599 100644 --- a/plugins/ctf/fs-src/fs.h +++ b/plugins/ctf/fs-src/fs.h @@ -29,8 +29,8 @@ */ #include -#include -#include +#include +#include #include "data-stream-file.h" #include "metadata.h" #include "../common/metadata/decoder.h" diff --git a/plugins/ctf/fs-src/logging.c b/plugins/ctf/fs-src/logging.c index 13f05526..6f24ce76 100644 --- a/plugins/ctf/fs-src/logging.c +++ b/plugins/ctf/fs-src/logging.c @@ -21,6 +21,6 @@ */ #define BT_LOG_OUTPUT_LEVEL ctf_fs_src_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(BT_LOG_OUTPUT_LEVEL, "BABELTRACE_SRC_CTF_FS_LOG_LEVEL"); diff --git a/plugins/ctf/fs-src/logging.h b/plugins/ctf/fs-src/logging.h index e82cbc98..8a249dcc 100644 --- a/plugins/ctf/fs-src/logging.h +++ b/plugins/ctf/fs-src/logging.h @@ -24,7 +24,7 @@ #define CTF_FS_SRC_LOGGING_H #define BT_LOG_OUTPUT_LEVEL ctf_fs_src_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(ctf_fs_src_log_level); diff --git a/plugins/ctf/fs-src/lttng-index.h b/plugins/ctf/fs-src/lttng-index.h index 05629f86..037010d7 100644 --- a/plugins/ctf/fs-src/lttng-index.h +++ b/plugins/ctf/fs-src/lttng-index.h @@ -25,7 +25,7 @@ #ifndef LTTNG_INDEX_H #define LTTNG_INDEX_H -#include +#include #define CTF_INDEX_MAGIC 0xC1F1DCC1 #define CTF_INDEX_MAJOR 1 diff --git a/plugins/ctf/fs-src/metadata.c b/plugins/ctf/fs-src/metadata.c index 628033be..75043dc1 100644 --- a/plugins/ctf/fs-src/metadata.c +++ b/plugins/ctf/fs-src/metadata.c @@ -27,11 +27,11 @@ #include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include "fs.h" #include "file.h" diff --git a/plugins/ctf/fs-src/metadata.h b/plugins/ctf/fs-src/metadata.h index 4d0e2ecc..6ddc0291 100644 --- a/plugins/ctf/fs-src/metadata.h +++ b/plugins/ctf/fs-src/metadata.h @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #define CTF_FS_METADATA_FILENAME "metadata" diff --git a/plugins/ctf/fs-src/query.c b/plugins/ctf/fs-src/query.c index c8ceb93c..0ddd4186 100644 --- a/plugins/ctf/fs-src/query.c +++ b/plugins/ctf/fs-src/query.c @@ -26,12 +26,12 @@ #include "query.h" #include -#include +#include #include "metadata.h" #include "../common/metadata/decoder.h" -#include -#include -#include +#include +#include +#include #include "fs.h" #define BT_LOG_TAG "PLUGIN-CTF-FS-QUERY-SRC" diff --git a/plugins/ctf/fs-src/query.h b/plugins/ctf/fs-src/query.h index 25229fde..d19a1394 100644 --- a/plugins/ctf/fs-src/query.h +++ b/plugins/ctf/fs-src/query.h @@ -25,8 +25,8 @@ * SOFTWARE. */ -#include -#include +#include +#include BT_HIDDEN bt_query_status metadata_info_query( diff --git a/plugins/ctf/lttng-live/data-stream.c b/plugins/ctf/lttng-live/data-stream.c index 9d093cb5..d617c302 100644 --- a/plugins/ctf/lttng-live/data-stream.c +++ b/plugins/ctf/lttng-live/data-stream.c @@ -32,10 +32,10 @@ #include #include #include -#include -#include +#include +#include #include "../common/msg-iter/msg-iter.h" -#include +#include #include "data-stream.h" diff --git a/plugins/ctf/lttng-live/data-stream.h b/plugins/ctf/lttng-live/data-stream.h index 4f60cf12..8ae5e59e 100644 --- a/plugins/ctf/lttng-live/data-stream.h +++ b/plugins/ctf/lttng-live/data-stream.h @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include "lttng-live.h" #include "../common/msg-iter/msg-iter.h" diff --git a/plugins/ctf/lttng-live/logging.c b/plugins/ctf/lttng-live/logging.c index 982b5b9e..bb081590 100644 --- a/plugins/ctf/lttng-live/logging.c +++ b/plugins/ctf/lttng-live/logging.c @@ -21,6 +21,6 @@ */ #define BT_LOG_OUTPUT_LEVEL lttng_live_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(lttng_live_log_level, "BABELTRACE_SRC_CTF_LTTNG_LIVE_LOG_LEVEL"); diff --git a/plugins/ctf/lttng-live/logging.h b/plugins/ctf/lttng-live/logging.h index e3f1632d..cd9b071d 100644 --- a/plugins/ctf/lttng-live/logging.h +++ b/plugins/ctf/lttng-live/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL lttng_live_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(lttng_live_log_level); diff --git a/plugins/ctf/lttng-live/lttng-live.c b/plugins/ctf/lttng-live/lttng-live.c index 85825d5e..24544a30 100644 --- a/plugins/ctf/lttng-live/lttng-live.c +++ b/plugins/ctf/lttng-live/lttng-live.c @@ -35,10 +35,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include "data-stream.h" diff --git a/plugins/ctf/lttng-live/lttng-live.h b/plugins/ctf/lttng-live/lttng-live.h index 4ea4865d..67f021c6 100644 --- a/plugins/ctf/lttng-live/lttng-live.h +++ b/plugins/ctf/lttng-live/lttng-live.h @@ -31,8 +31,8 @@ #include -#include -#include +#include +#include #include "../common/metadata/decoder.h" #include "../common/msg-iter/msg-iter.h" diff --git a/plugins/ctf/lttng-live/lttng-viewer-abi.h b/plugins/ctf/lttng-live/lttng-viewer-abi.h index 79b05695..a05ed61f 100644 --- a/plugins/ctf/lttng-live/lttng-viewer-abi.h +++ b/plugins/ctf/lttng-live/lttng-viewer-abi.h @@ -25,7 +25,7 @@ * SOFTWARE. */ -#include +#include #define LTTNG_VIEWER_PATH_MAX 4096 #define LTTNG_VIEWER_NAME_MAX 255 diff --git a/plugins/ctf/lttng-live/metadata.c b/plugins/ctf/lttng-live/metadata.c index bbecc16c..14088bbd 100644 --- a/plugins/ctf/lttng-live/metadata.c +++ b/plugins/ctf/lttng-live/metadata.c @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include #include "metadata.h" #include "../common/metadata/decoder.h" diff --git a/plugins/ctf/lttng-live/metadata.h b/plugins/ctf/lttng-live/metadata.h index ddd0e0f4..2a81c884 100644 --- a/plugins/ctf/lttng-live/metadata.h +++ b/plugins/ctf/lttng-live/metadata.h @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include "lttng-live.h" int lttng_live_metadata_create_stream(struct lttng_live_session *session, diff --git a/plugins/ctf/lttng-live/viewer-connection.c b/plugins/ctf/lttng-live/viewer-connection.c index fb770d71..e11fe7eb 100644 --- a/plugins/ctf/lttng-live/viewer-connection.c +++ b/plugins/ctf/lttng-live/viewer-connection.c @@ -34,11 +34,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "lttng-live.h" #include "viewer-connection.h" diff --git a/plugins/ctf/lttng-live/viewer-connection.h b/plugins/ctf/lttng-live/viewer-connection.h index 85fd745d..752d1a91 100644 --- a/plugins/ctf/lttng-live/viewer-connection.h +++ b/plugins/ctf/lttng-live/viewer-connection.h @@ -26,12 +26,12 @@ #include #include -#include -#include +#include +#include //TODO: this should not be used by plugins. Should copy code into plugin //instead. -#include +#include #define LTTNG_DEFAULT_NETWORK_VIEWER_PORT 5344 diff --git a/plugins/ctf/plugin.c b/plugins/ctf/plugin.c index d7e073d1..95974030 100644 --- a/plugins/ctf/plugin.c +++ b/plugins/ctf/plugin.c @@ -26,7 +26,7 @@ * SOFTWARE. */ -#include +#include #include "fs-src/fs.h" #include "fs-sink/fs-sink.h" diff --git a/plugins/lttng-utils/debug-info/bin-info.c b/plugins/lttng-utils/debug-info/bin-info.c index 7451993d..bad796d2 100644 --- a/plugins/lttng-utils/debug-info/bin-info.c +++ b/plugins/lttng-utils/debug-info/bin-info.c @@ -42,7 +42,7 @@ #include -#include +#include #include "bin-info.h" #include "crc32.h" diff --git a/plugins/lttng-utils/debug-info/bin-info.h b/plugins/lttng-utils/debug-info/bin-info.h index 93118a65..c193a06d 100644 --- a/plugins/lttng-utils/debug-info/bin-info.h +++ b/plugins/lttng-utils/debug-info/bin-info.h @@ -31,8 +31,8 @@ #include #include #include -#include -#include +#include +#include #define DEFAULT_DEBUG_DIR "/usr/lib/debug" #define DEBUG_SUBDIR ".debug" diff --git a/plugins/lttng-utils/debug-info/crc32.h b/plugins/lttng-utils/debug-info/crc32.h index 4a229d63..3cb825e4 100644 --- a/plugins/lttng-utils/debug-info/crc32.h +++ b/plugins/lttng-utils/debug-info/crc32.h @@ -37,7 +37,7 @@ #include #include #include -#include +#include /** * Compute a 32-bit cyclic redundancy checksum for a given file. diff --git a/plugins/lttng-utils/debug-info/debug-info.c b/plugins/lttng-utils/debug-info/debug-info.c index 60d3f982..1e7a2381 100644 --- a/plugins/lttng-utils/debug-info/debug-info.c +++ b/plugins/lttng-utils/debug-info/debug-info.c @@ -32,9 +32,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "bin-info.h" #include "debug-info.h" diff --git a/plugins/lttng-utils/debug-info/debug-info.h b/plugins/lttng-utils/debug-info/debug-info.h index bfdbccc1..f97d32d2 100644 --- a/plugins/lttng-utils/debug-info/debug-info.h +++ b/plugins/lttng-utils/debug-info/debug-info.h @@ -28,8 +28,8 @@ */ #include -#include -#include +#include +#include #define VPID_FIELD_NAME "vpid" #define IP_FIELD_NAME "ip" diff --git a/plugins/lttng-utils/debug-info/dwarf.h b/plugins/lttng-utils/debug-info/dwarf.h index 707431f9..72bb8d2b 100644 --- a/plugins/lttng-utils/debug-info/dwarf.h +++ b/plugins/lttng-utils/debug-info/dwarf.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include /* * bt_dwarf is a wrapper over libdw providing a nicer, higher-level diff --git a/plugins/lttng-utils/debug-info/logging.c b/plugins/lttng-utils/debug-info/logging.c index 78c2e17f..d7befe94 100644 --- a/plugins/lttng-utils/debug-info/logging.c +++ b/plugins/lttng-utils/debug-info/logging.c @@ -21,7 +21,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_plugin_lttng_utils_debug_info_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(bt_plugin_lttng_utils_debug_info_log_level, "BABELTRACE_FLT_LTTNG_UTILS_DEBUG_INFO_LOG_LEVEL"); diff --git a/plugins/lttng-utils/debug-info/logging.h b/plugins/lttng-utils/debug-info/logging.h index b77a02f9..154ca0ff 100644 --- a/plugins/lttng-utils/debug-info/logging.h +++ b/plugins/lttng-utils/debug-info/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_plugin_lttng_utils_debug_info_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(bt_plugin_lttng_utils_debug_info_log_level); diff --git a/plugins/lttng-utils/debug-info/trace-ir-data-copy.c b/plugins/lttng-utils/debug-info/trace-ir-data-copy.c index 78f611cb..8eb2eddf 100644 --- a/plugins/lttng-utils/debug-info/trace-ir-data-copy.c +++ b/plugins/lttng-utils/debug-info/trace-ir-data-copy.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include "trace-ir-data-copy.h" diff --git a/plugins/lttng-utils/debug-info/trace-ir-data-copy.h b/plugins/lttng-utils/debug-info/trace-ir-data-copy.h index 97eface5..b9259769 100644 --- a/plugins/lttng-utils/debug-info/trace-ir-data-copy.h +++ b/plugins/lttng-utils/debug-info/trace-ir-data-copy.h @@ -26,7 +26,7 @@ * SOFTWARE. */ -#include +#include #include "trace-ir-mapping.h" diff --git a/plugins/lttng-utils/debug-info/trace-ir-mapping.c b/plugins/lttng-utils/debug-info/trace-ir-mapping.c index 4617b42a..61bfb016 100644 --- a/plugins/lttng-utils/debug-info/trace-ir-mapping.c +++ b/plugins/lttng-utils/debug-info/trace-ir-mapping.c @@ -30,10 +30,10 @@ #include -#include -#include +#include +#include /* For bt_property_availability */ -#include +#include #include "debug-info.h" #include "trace-ir-data-copy.h" diff --git a/plugins/lttng-utils/debug-info/trace-ir-mapping.h b/plugins/lttng-utils/debug-info/trace-ir-mapping.h index 3601e81e..0f29e23e 100644 --- a/plugins/lttng-utils/debug-info/trace-ir-mapping.h +++ b/plugins/lttng-utils/debug-info/trace-ir-mapping.h @@ -24,8 +24,8 @@ #include -#include -#include +#include +#include #include "debug-info.h" diff --git a/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c b/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c index a4c57ba7..55bb953a 100644 --- a/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c +++ b/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include "trace-ir-metadata-copy.h" #include "trace-ir-metadata-field-class-copy.h" diff --git a/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.h b/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.h index 3901b26d..9330546d 100644 --- a/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.h +++ b/plugins/lttng-utils/debug-info/trace-ir-metadata-copy.h @@ -27,7 +27,7 @@ * SOFTWARE. */ -#include +#include #include "trace-ir-mapping.h" BT_HIDDEN diff --git a/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c b/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c index 7c9c4e5b..1247e598 100644 --- a/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c +++ b/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.c @@ -27,10 +27,10 @@ #define BT_LOG_TAG "PLUGIN-LTTNG-UTILS-DEBUG-INFO-TRACE-IR-METADATA-FC-COPY" #include "logging.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "trace-ir-metadata-copy.h" #include "trace-ir-metadata-field-class-copy.h" diff --git a/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.h b/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.h index 855e6cdc..3bd5b80f 100644 --- a/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.h +++ b/plugins/lttng-utils/debug-info/trace-ir-metadata-field-class-copy.h @@ -26,7 +26,7 @@ * SOFTWARE. */ -#include +#include #include "trace-ir-mapping.h" BT_HIDDEN diff --git a/plugins/lttng-utils/debug-info/utils.h b/plugins/lttng-utils/debug-info/utils.h index 5f65a470..82820fc0 100644 --- a/plugins/lttng-utils/debug-info/utils.h +++ b/plugins/lttng-utils/debug-info/utils.h @@ -26,7 +26,7 @@ * SOFTWARE. */ -#include +#include #include "trace-ir-mapping.h" /* diff --git a/plugins/lttng-utils/plugin.c b/plugins/lttng-utils/plugin.c index 0f100da2..8d50b0e8 100644 --- a/plugins/lttng-utils/plugin.c +++ b/plugins/lttng-utils/plugin.c @@ -26,7 +26,7 @@ * SOFTWARE. */ -#include +#include #include "debug-info/debug-info.h" #ifndef BT_BUILT_IN_PLUGINS diff --git a/plugins/text/dmesg/dmesg.c b/plugins/text/dmesg/dmesg.c index 068403d8..b10c9425 100644 --- a/plugins/text/dmesg/dmesg.c +++ b/plugins/text/dmesg/dmesg.c @@ -28,12 +28,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #define NSEC_PER_USEC 1000UL diff --git a/plugins/text/dmesg/dmesg.h b/plugins/text/dmesg/dmesg.h index f93eeaf3..6e75ea44 100644 --- a/plugins/text/dmesg/dmesg.h +++ b/plugins/text/dmesg/dmesg.h @@ -24,8 +24,8 @@ */ #include -#include -#include +#include +#include BT_HIDDEN bt_self_component_status dmesg_init( diff --git a/plugins/text/dmesg/logging.c b/plugins/text/dmesg/logging.c index 5f0a552d..3df7f49e 100644 --- a/plugins/text/dmesg/logging.c +++ b/plugins/text/dmesg/logging.c @@ -21,7 +21,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_plugin_text_dmesg_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(bt_plugin_text_dmesg_log_level, "BABELTRACE_SRC_TEXT_DMESG_LOG_LEVEL"); diff --git a/plugins/text/dmesg/logging.h b/plugins/text/dmesg/logging.h index 6e31a511..564479dd 100644 --- a/plugins/text/dmesg/logging.h +++ b/plugins/text/dmesg/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_plugin_text_dmesg_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(bt_plugin_text_dmesg_log_level); diff --git a/plugins/text/plugin.c b/plugins/text/plugin.c index bdd2789c..17f814b9 100644 --- a/plugins/text/plugin.c +++ b/plugins/text/plugin.c @@ -20,7 +20,7 @@ * SOFTWARE. */ -#include +#include #include "pretty/pretty.h" #include "dmesg/dmesg.h" diff --git a/plugins/text/pretty/logging.c b/plugins/text/pretty/logging.c index 42595e79..37beb6d3 100644 --- a/plugins/text/pretty/logging.c +++ b/plugins/text/pretty/logging.c @@ -21,7 +21,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_plugin_text_pretty_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(bt_plugin_text_pretty_log_level, "BABELTRACE_SINK_TEXT_PRETTY_LOG_LEVEL"); diff --git a/plugins/text/pretty/logging.h b/plugins/text/pretty/logging.h index 417ca6a0..5ac1f7b4 100644 --- a/plugins/text/pretty/logging.h +++ b/plugins/text/pretty/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_plugin_text_pretty_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(bt_plugin_text_pretty_log_level); diff --git a/plugins/text/pretty/pretty.c b/plugins/text/pretty/pretty.c index 6b6e3cd5..7c548391 100644 --- a/plugins/text/pretty/pretty.c +++ b/plugins/text/pretty/pretty.c @@ -26,14 +26,14 @@ #define BT_LOG_TAG "PLUGIN-TEXT-PRETTY-SINK" #include "logging.h" -#include -#include -#include +#include +#include +#include #include #include #include #include -#include +#include #include "pretty.h" diff --git a/plugins/text/pretty/pretty.h b/plugins/text/pretty/pretty.h index e1027277..4ebf54b3 100644 --- a/plugins/text/pretty/pretty.h +++ b/plugins/text/pretty/pretty.h @@ -26,8 +26,8 @@ */ #include -#include -#include +#include +#include enum pretty_default { PRETTY_DEFAULT_UNSET, diff --git a/plugins/text/pretty/print.c b/plugins/text/pretty/print.c index 87d9950b..a30f3a36 100644 --- a/plugins/text/pretty/print.c +++ b/plugins/text/pretty/print.c @@ -23,11 +23,11 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include "pretty.h" diff --git a/plugins/utils/counter/counter.c b/plugins/utils/counter/counter.c index fea90c33..5a6eadaf 100644 --- a/plugins/utils/counter/counter.c +++ b/plugins/utils/counter/counter.c @@ -23,11 +23,11 @@ #define BT_LOG_TAG "PLUGIN-UTILS-COUNTER-FLT" #include "logging.h" -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include diff --git a/plugins/utils/counter/counter.h b/plugins/utils/counter/counter.h index 784faf0f..c29f0fd5 100644 --- a/plugins/utils/counter/counter.h +++ b/plugins/utils/counter/counter.h @@ -24,7 +24,7 @@ */ #include -#include +#include #include #include diff --git a/plugins/utils/counter/logging.c b/plugins/utils/counter/logging.c index ff3e9c20..42de03f8 100644 --- a/plugins/utils/counter/logging.c +++ b/plugins/utils/counter/logging.c @@ -21,7 +21,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_plugin_utils_counter_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(bt_plugin_utils_counter_log_level, "BABELTRACE_FLT_UTILS_COUNTER_LOG_LEVEL"); diff --git a/plugins/utils/counter/logging.h b/plugins/utils/counter/logging.h index 3c9dd65a..176122f5 100644 --- a/plugins/utils/counter/logging.h +++ b/plugins/utils/counter/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_plugin_utils_muxer_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(bt_plugin_utils_muxer_log_level); diff --git a/plugins/utils/dummy/dummy.c b/plugins/utils/dummy/dummy.c index 61cdfe02..59d85152 100644 --- a/plugins/utils/dummy/dummy.c +++ b/plugins/utils/dummy/dummy.c @@ -20,10 +20,10 @@ * SOFTWARE. */ -#include -#include +#include +#include #include -#include +#include #include "dummy.h" static diff --git a/plugins/utils/dummy/dummy.h b/plugins/utils/dummy/dummy.h index 5df1a2de..dfe21d18 100644 --- a/plugins/utils/dummy/dummy.h +++ b/plugins/utils/dummy/dummy.h @@ -24,8 +24,8 @@ */ #include -#include -#include +#include +#include #include struct dummy { diff --git a/plugins/utils/muxer/logging.c b/plugins/utils/muxer/logging.c index 04f797d1..3f16b977 100644 --- a/plugins/utils/muxer/logging.c +++ b/plugins/utils/muxer/logging.c @@ -21,7 +21,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_plugin_utils_muxer_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(bt_plugin_utils_muxer_log_level, "BABELTRACE_FLT_UTILS_MUXER_LOG_LEVEL"); diff --git a/plugins/utils/muxer/logging.h b/plugins/utils/muxer/logging.h index 3c9dd65a..176122f5 100644 --- a/plugins/utils/muxer/logging.h +++ b/plugins/utils/muxer/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_plugin_utils_muxer_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(bt_plugin_utils_muxer_log_level); diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c index be4522f0..626c437b 100644 --- a/plugins/utils/muxer/muxer.c +++ b/plugins/utils/muxer/muxer.c @@ -23,19 +23,19 @@ #define BT_LOG_TAG "PLUGIN-UTILS-MUXER-FLT" #include "logging.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include diff --git a/plugins/utils/muxer/muxer.h b/plugins/utils/muxer/muxer.h index ec9d3815..23ec8c20 100644 --- a/plugins/utils/muxer/muxer.h +++ b/plugins/utils/muxer/muxer.h @@ -25,8 +25,8 @@ */ #include -#include -#include +#include +#include BT_HIDDEN bt_self_component_status muxer_init( diff --git a/plugins/utils/plugin.c b/plugins/utils/plugin.c index 2b646ae8..d6b5b244 100644 --- a/plugins/utils/plugin.c +++ b/plugins/utils/plugin.c @@ -20,7 +20,7 @@ * SOFTWARE. */ -#include +#include #include "dummy/dummy.h" #include "counter/counter.h" #include "muxer/muxer.h" diff --git a/plugins/utils/trimmer/logging.c b/plugins/utils/trimmer/logging.c index f4d4cd5a..f8b9be15 100644 --- a/plugins/utils/trimmer/logging.c +++ b/plugins/utils/trimmer/logging.c @@ -21,7 +21,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_plugin_utils_trimmer_log_level -#include +#include BT_LOG_INIT_LOG_LEVEL(bt_plugin_utils_trimmer_log_level, "BABELTRACE_FLT_UTILS_TRIMMER_LOG_LEVEL"); diff --git a/plugins/utils/trimmer/logging.h b/plugins/utils/trimmer/logging.h index d5ef128a..3bcd7ea8 100644 --- a/plugins/utils/trimmer/logging.h +++ b/plugins/utils/trimmer/logging.h @@ -24,7 +24,7 @@ */ #define BT_LOG_OUTPUT_LEVEL bt_plugin_utils_trimmer_log_level -#include +#include BT_LOG_LEVEL_EXTERN_SYMBOL(bt_plugin_utils_trimmer_log_level); diff --git a/plugins/utils/trimmer/trimmer.c b/plugins/utils/trimmer/trimmer.c index 2a40da74..1227dc50 100644 --- a/plugins/utils/trimmer/trimmer.c +++ b/plugins/utils/trimmer/trimmer.c @@ -24,12 +24,12 @@ #define BT_LOG_TAG "PLUGIN-UTILS-TRIMMER-FLT" #include "logging.h" -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include #include #include diff --git a/plugins/utils/trimmer/trimmer.h b/plugins/utils/trimmer/trimmer.h index 4b43c9aa..e792c3e5 100644 --- a/plugins/utils/trimmer/trimmer.h +++ b/plugins/utils/trimmer/trimmer.h @@ -28,8 +28,8 @@ */ #include -#include -#include +#include +#include BT_HIDDEN void trimmer_finalize(bt_self_component_filter *self_comp); diff --git a/python-plugin-provider/python-plugin-provider.c b/python-plugin-provider/python-plugin-provider.c index d32ff829..8e5ee08e 100644 --- a/python-plugin-provider/python-plugin-provider.c +++ b/python-plugin-provider/python-plugin-provider.c @@ -26,12 +26,12 @@ #define BT_LOG_TAG "PLUGIN-PY" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/tests/lib/test-plugin-plugins/minimal.c b/tests/lib/test-plugin-plugins/minimal.c index 42f9c6be..6c63d632 100644 --- a/tests/lib/test-plugin-plugins/minimal.c +++ b/tests/lib/test-plugin-plugins/minimal.c @@ -15,7 +15,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include #include #include diff --git a/tests/lib/test-plugin-plugins/sfs.c b/tests/lib/test-plugin-plugins/sfs.c index e9080b7e..d746afae 100644 --- a/tests/lib/test-plugin-plugins/sfs.c +++ b/tests/lib/test-plugin-plugins/sfs.c @@ -15,8 +15,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include +#include +#include static bt_self_component_status sink_consume( bt_self_component_sink *self_comp) diff --git a/tests/lib/test_bitfield.c b/tests/lib/test_bitfield.c index 9e9a52ad..848d4bd3 100644 --- a/tests/lib/test_bitfield.c +++ b/tests/lib/test_bitfield.c @@ -19,7 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include #include #include #include diff --git a/tests/lib/test_bt_values.c b/tests/lib/test_bt_values.c index 4619e624..f9526379 100644 --- a/tests/lib/test_bt_values.c +++ b/tests/lib/test_bt_values.c @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include +#include +#include #include #include "tap/tap.h" diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c index 8dae4292..75b914ce 100644 --- a/tests/lib/test_ctf_writer.c +++ b/tests/lib/test_ctf_writer.c @@ -19,25 +19,25 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include #include -#include -#include +#include +#include #include -#include +#include #include #include "tap/tap.h" #include diff --git a/tests/lib/test_graph_topo.c b/tests/lib/test_graph_topo.c index bf4a8629..b0409d49 100644 --- a/tests/lib/test_graph_topo.c +++ b/tests/lib/test_graph_topo.c @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include -#include +#include +#include #include #include #include diff --git a/tests/lib/test_plugin.c b/tests/lib/test_plugin.c index 08e57940..852b26fb 100644 --- a/tests/lib/test_plugin.c +++ b/tests/lib/test_plugin.c @@ -15,11 +15,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include +#include #include #include #include -#include +#include #include #include "tap/tap.h" #include "common.h" diff --git a/tests/lib/test_trace_ir_ref.c b/tests/lib/test_trace_ir_ref.c index f0f3961d..f4837c90 100644 --- a/tests/lib/test_trace_ir_ref.c +++ b/tests/lib/test_trace_ir_ref.c @@ -20,10 +20,10 @@ */ #include "tap/tap.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "common.h" #define NR_TESTS 37 diff --git a/tests/plugins/test_bin_info.c b/tests/plugins/test_bin_info.c index 339f91a4..7f873b36 100644 --- a/tests/plugins/test_bin_info.c +++ b/tests/plugins/test_bin_info.c @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include #include "tap/tap.h" -- 2.34.1