From: Simon Marchi Date: Thu, 7 Dec 2023 21:54:24 +0000 (+0000) Subject: Remove some unused includes in C++ files X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=c7e1be4b771715840b4bc3d635f72eeaf1d2e984 Remove some unused includes in C++ files Remove some unused include files. This was done partly looking at "unused-includes" warnings from clangd in my IDE, and partly with include-what-you-use. Whenever needed, add some includes to keep things compiling (where some header files relied on previous inclusions). Change-Id: I0bca7aba4c172a13474a76b08e4a0b543e152733 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/11493 Tested-by: jenkins --- diff --git a/src/common/uuid.h b/src/common/uuid.h index dfe3a7ee..c8418a67 100644 --- a/src/common/uuid.h +++ b/src/common/uuid.h @@ -7,6 +7,7 @@ #ifndef _BABELTRACE_COMMON_UUID_H #define _BABELTRACE_COMMON_UUID_H +#include #include #include "common/macros.h" diff --git a/src/cpp-common/bt2/common-iter.hpp b/src/cpp-common/bt2/common-iter.hpp index 5ebade34..553282f8 100644 --- a/src/cpp-common/bt2/common-iter.hpp +++ b/src/cpp-common/bt2/common-iter.hpp @@ -8,7 +8,6 @@ #define BABELTRACE_CPP_COMMON_BT2_COMMON_ITER_HPP #include -#include #include "cpp-common/optional.hpp" diff --git a/src/cpp-common/bt2/exc.hpp b/src/cpp-common/bt2/exc.hpp index 96a6b2cf..3b16a22b 100644 --- a/src/cpp-common/bt2/exc.hpp +++ b/src/cpp-common/bt2/exc.hpp @@ -7,9 +7,6 @@ #ifndef BABELTRACE_CPP_COMMON_BT2_EXC_HPP #define BABELTRACE_CPP_COMMON_BT2_EXC_HPP -#include -#include - #include "cpp-common/exc.hpp" namespace bt2 { diff --git a/src/cpp-common/bt2/internal/utils.hpp b/src/cpp-common/bt2/internal/utils.hpp index 7b162d12..3c655b88 100644 --- a/src/cpp-common/bt2/internal/utils.hpp +++ b/src/cpp-common/bt2/internal/utils.hpp @@ -7,8 +7,6 @@ #ifndef BABELTRACE_CPP_COMMON_BT2_INTERNAL_UTILS_HPP #define BABELTRACE_CPP_COMMON_BT2_INTERNAL_UTILS_HPP -#include - #include "../exc.hpp" namespace bt2 { diff --git a/src/cpp-common/bt2/message.hpp b/src/cpp-common/bt2/message.hpp index 1603a6dd..36ea68a3 100644 --- a/src/cpp-common/bt2/message.hpp +++ b/src/cpp-common/bt2/message.hpp @@ -8,18 +8,14 @@ #define BABELTRACE_CPP_COMMON_BT2_MESSAGE_HPP #include -#include #include #include #include "common/assert.h" -#include "common/common.h" #include "cpp-common/bt2/trace-ir.hpp" #include "cpp-common/optional.hpp" -#include "cpp-common/string_view.hpp" -#include "exc.hpp" #include "internal/borrowed-obj.hpp" #include "internal/shared-obj.hpp" #include "internal/utils.hpp" diff --git a/src/cpp-common/bt2/trace-ir.hpp b/src/cpp-common/bt2/trace-ir.hpp index b61394e7..f27a87ae 100644 --- a/src/cpp-common/bt2/trace-ir.hpp +++ b/src/cpp-common/bt2/trace-ir.hpp @@ -16,7 +16,6 @@ #include "cpp-common/string_view.hpp" #include "clock-class.hpp" -#include "clock-snapshot.hpp" #include "field-class.hpp" #include "field.hpp" #include "internal/borrowed-obj.hpp" diff --git a/src/cpp-common/bt2/value.hpp b/src/cpp-common/bt2/value.hpp index f99dbe94..0dfe9dc6 100644 --- a/src/cpp-common/bt2/value.hpp +++ b/src/cpp-common/bt2/value.hpp @@ -9,7 +9,6 @@ #include #include -#include #include #include diff --git a/src/cpp-common/cfg-error-reporting-throw.hpp b/src/cpp-common/cfg-error-reporting-throw.hpp index 55059c5a..6d39877c 100644 --- a/src/cpp-common/cfg-error-reporting-throw.hpp +++ b/src/cpp-common/cfg-error-reporting-throw.hpp @@ -33,9 +33,8 @@ #define BT_APPEND_CAUSE_AND_RETHROW_EX(_log_cfg, _fmt, ...) \ do { \ BT_APPEND_CAUSE_EX((_log_cfg), _fmt, ##__VA_ARGS__); \ - throw; -} -while (false) + throw; \ + } while (false) #define BT_APPEND_CAUSE_AND_RETHROW(_fmt, ...) \ BT_APPEND_CAUSE_AND_RETHROW_EX((BT_CLOG_CFG), _fmt, ##__VA_ARGS__) diff --git a/src/cpp-common/cfg-error-reporting.hpp b/src/cpp-common/cfg-error-reporting.hpp index 81f94682..49a2081e 100644 --- a/src/cpp-common/cfg-error-reporting.hpp +++ b/src/cpp-common/cfg-error-reporting.hpp @@ -10,8 +10,6 @@ #include -#include "cfg-logging.hpp" - /* * Appends a cause to the error of the current thread using the logging * configuration `_log_cfg`. diff --git a/src/cpp-common/read-fixed-len-int.hpp b/src/cpp-common/read-fixed-len-int.hpp index c0654f8b..07481f21 100644 --- a/src/cpp-common/read-fixed-len-int.hpp +++ b/src/cpp-common/read-fixed-len-int.hpp @@ -8,7 +8,6 @@ #define BABELTRACE_CPP_COMMON_READ_FIXED_LEN_INT_HPP #include -#include #include #include diff --git a/src/cpp-common/uuid-view.hpp b/src/cpp-common/uuid-view.hpp index e39a40e0..d719d877 100644 --- a/src/cpp-common/uuid-view.hpp +++ b/src/cpp-common/uuid-view.hpp @@ -8,7 +8,6 @@ #define BABELTRACE_CPP_COMMON_UUID_VIEW_HPP #include -#include #include #include diff --git a/src/cpp-common/uuid.hpp b/src/cpp-common/uuid.hpp index 5f29da4a..13c3cb91 100644 --- a/src/cpp-common/uuid.hpp +++ b/src/cpp-common/uuid.hpp @@ -9,7 +9,6 @@ #include #include -#include #include #include "common/assert.h" diff --git a/src/plugins/ctf/common/bfcr/bfcr.cpp b/src/plugins/ctf/common/bfcr/bfcr.cpp index 89560e86..f59f65d0 100644 --- a/src/plugins/ctf/common/bfcr/bfcr.cpp +++ b/src/plugins/ctf/common/bfcr/bfcr.cpp @@ -11,8 +11,6 @@ #include #include #include -#include -#include #include #include @@ -56,8 +54,6 @@ struct stack_entry int64_t index; }; -struct bt_bfcr; - /* Visit stack */ struct stack { diff --git a/src/plugins/ctf/common/bfcr/bfcr.hpp b/src/plugins/ctf/common/bfcr/bfcr.hpp index fc745b8b..8a7864e3 100644 --- a/src/plugins/ctf/common/bfcr/bfcr.hpp +++ b/src/plugins/ctf/common/bfcr/bfcr.hpp @@ -12,14 +12,9 @@ #include #include -#include #include -#include "common/macros.h" - -#include "../metadata/ctf-meta.hpp" - /** * @file bfcr.h * @@ -64,9 +59,6 @@ enum bt_bfcr_status BT_BFCR_STATUS_OK = 0, }; -/** Field class reader. */ -struct bt_bfcr; - typedef enum bt_bfcr_status (*bt_bfcr_unsigned_int_cb_func)(uint64_t, struct ctf_field_class *, void *); diff --git a/src/plugins/ctf/common/metadata/ast.hpp b/src/plugins/ctf/common/metadata/ast.hpp index ad14a5af..a6a7e9f7 100644 --- a/src/plugins/ctf/common/metadata/ast.hpp +++ b/src/plugins/ctf/common/metadata/ast.hpp @@ -15,7 +15,6 @@ #include "common/assert.h" #include "common/list.h" -#include "common/macros.h" #include "ctf-meta.hpp" #include "decoder.hpp" diff --git a/src/plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.cpp b/src/plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.cpp index fc89c6ce..ef178c53 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.cpp +++ b/src/plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.cpp @@ -6,7 +6,10 @@ #include +#include "common/assert.h" + #include "ctf-meta-configure-ir-trace.hpp" +#include "plugins/ctf/common/metadata/ctf-meta.hpp" int ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, bt_trace *ir_trace) { diff --git a/src/plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.hpp b/src/plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.hpp index 23f8d260..0f9c8795 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.hpp +++ b/src/plugins/ctf/common/metadata/ctf-meta-configure-ir-trace.hpp @@ -7,10 +7,6 @@ #ifndef _CTF_META_CONFIGURE_IR_TRACE_H #define _CTF_META_CONFIGURE_IR_TRACE_H -#include "common/macros.h" - -#include "ctf-meta.hpp" - int ctf_trace_class_configure_ir_trace(struct ctf_trace_class *tc, bt_trace *ir_trace); #endif /* _CTF_META_CONFIGURE_IR_TRACE_H */ diff --git a/src/plugins/ctf/common/metadata/ctf-meta-resolve.cpp b/src/plugins/ctf/common/metadata/ctf-meta-resolve.cpp index 293ee4a5..b238b6fb 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-resolve.cpp +++ b/src/plugins/ctf/common/metadata/ctf-meta-resolve.cpp @@ -7,8 +7,6 @@ #include #include -#include -#include #include #include @@ -23,7 +21,6 @@ #include "common/assert.h" #include "common/common.h" -#include "common/macros.h" #include "ctf-meta-visitors.hpp" diff --git a/src/plugins/ctf/common/metadata/ctf-meta-translate.cpp b/src/plugins/ctf/common/metadata/ctf-meta-translate.cpp index f86b979b..e3ecfd07 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-translate.cpp +++ b/src/plugins/ctf/common/metadata/ctf-meta-translate.cpp @@ -4,15 +4,12 @@ * Copyright 2018 Philippe Proulx */ -#include -#include #include #include #include #include "common/assert.h" -#include "common/macros.h" #include "ctf-meta-visitors.hpp" diff --git a/src/plugins/ctf/common/metadata/ctf-meta-update-alignments.cpp b/src/plugins/ctf/common/metadata/ctf-meta-update-alignments.cpp index 5927e92f..bea62bf9 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-update-alignments.cpp +++ b/src/plugins/ctf/common/metadata/ctf-meta-update-alignments.cpp @@ -4,15 +4,7 @@ * Copyright 2020 Philippe Proulx */ -#include -#include #include -#include - -#include - -#include "common/assert.h" -#include "common/macros.h" #include "ctf-meta-visitors.hpp" diff --git a/src/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.cpp b/src/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.cpp index 106d6628..ab10dd4f 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.cpp +++ b/src/plugins/ctf/common/metadata/ctf-meta-update-default-clock-classes.cpp @@ -4,22 +4,14 @@ * Copyright 2018 Philippe Proulx */ -#include #include -#include #include -#include - #define BT_COMP_LOG_SELF_COMP (log_cfg->self_comp) #define BT_COMP_LOG_SELF_COMP_CLASS (log_cfg->self_comp_class) #define BT_LOG_OUTPUT_LEVEL (log_cfg->log_level) #define BT_LOG_TAG "PLUGIN/CTF/META/UPDATE-DEF-CC" #include "logging.hpp" -#include "logging/comp-logging.h" - -#include "common/assert.h" -#include "common/macros.h" #include "ctf-meta-visitors.hpp" diff --git a/src/plugins/ctf/common/metadata/ctf-meta-update-in-ir.cpp b/src/plugins/ctf/common/metadata/ctf-meta-update-in-ir.cpp index 1c49e8a7..c7902383 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-update-in-ir.cpp +++ b/src/plugins/ctf/common/metadata/ctf-meta-update-in-ir.cpp @@ -4,15 +4,11 @@ * Copyright 2018 Philippe Proulx */ +#include #include -#include #include -#include - -#include #include "common/assert.h" -#include "common/macros.h" #include "compat/glib.h" #include "ctf-meta-visitors.hpp" diff --git a/src/plugins/ctf/common/metadata/ctf-meta-update-meanings.cpp b/src/plugins/ctf/common/metadata/ctf-meta-update-meanings.cpp index 6f4138af..23c65745 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-update-meanings.cpp +++ b/src/plugins/ctf/common/metadata/ctf-meta-update-meanings.cpp @@ -4,16 +4,9 @@ * Copyright 2018 Philippe Proulx */ -#include -#include #include #include -#include - -#include "common/assert.h" -#include "common/macros.h" - #include "ctf-meta-visitors.hpp" static int set_int_field_class_meaning_by_name(struct ctf_field_class *fc, const char *field_name, diff --git a/src/plugins/ctf/common/metadata/ctf-meta-update-stream-class-config.cpp b/src/plugins/ctf/common/metadata/ctf-meta-update-stream-class-config.cpp index 9dec05f2..a8f5add6 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-update-stream-class-config.cpp +++ b/src/plugins/ctf/common/metadata/ctf-meta-update-stream-class-config.cpp @@ -4,15 +4,7 @@ * Copyright 2019 Philippe Proulx */ -#include -#include #include -#include - -#include - -#include "common/assert.h" -#include "common/macros.h" #include "ctf-meta-visitors.hpp" diff --git a/src/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.cpp b/src/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.cpp index 2e59529f..6c3bfc97 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.cpp +++ b/src/plugins/ctf/common/metadata/ctf-meta-update-text-array-sequence.cpp @@ -4,15 +4,7 @@ * Copyright 2018 Philippe Proulx */ -#include -#include #include -#include - -#include - -#include "common/assert.h" -#include "common/macros.h" #include "ctf-meta-visitors.hpp" diff --git a/src/plugins/ctf/common/metadata/ctf-meta-update-value-storing-indexes.cpp b/src/plugins/ctf/common/metadata/ctf-meta-update-value-storing-indexes.cpp index a51b03cf..65e4c9fe 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-update-value-storing-indexes.cpp +++ b/src/plugins/ctf/common/metadata/ctf-meta-update-value-storing-indexes.cpp @@ -4,15 +4,10 @@ * Copyright 2018 Philippe Proulx */ -#include -#include #include #include -#include - #include "common/assert.h" -#include "common/macros.h" #include "ctf-meta-visitors.hpp" diff --git a/src/plugins/ctf/common/metadata/ctf-meta-validate.cpp b/src/plugins/ctf/common/metadata/ctf-meta-validate.cpp index c11a0b94..9a01c593 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-validate.cpp +++ b/src/plugins/ctf/common/metadata/ctf-meta-validate.cpp @@ -4,22 +4,13 @@ * Copyright 2018 Philippe Proulx */ -#include #include -#include -#include - -#include #define BT_COMP_LOG_SELF_COMP (log_cfg->self_comp) #define BT_COMP_LOG_SELF_COMP_CLASS (log_cfg->self_comp_class) #define BT_LOG_OUTPUT_LEVEL (log_cfg->log_level) #define BT_LOG_TAG "PLUGIN/CTF/META/VALIDATE" #include "logging.hpp" -#include "logging/comp-logging.h" - -#include "common/assert.h" -#include "common/macros.h" #include "ctf-meta-visitors.hpp" diff --git a/src/plugins/ctf/common/metadata/ctf-meta-visitors.hpp b/src/plugins/ctf/common/metadata/ctf-meta-visitors.hpp index 9dd30301..5294ecec 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-visitors.hpp +++ b/src/plugins/ctf/common/metadata/ctf-meta-visitors.hpp @@ -9,8 +9,6 @@ #include -#include "common/macros.h" - #include "ctf-meta.hpp" struct meta_log_config; diff --git a/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.cpp b/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.cpp index 6b31f88e..6d7e274a 100644 --- a/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.cpp +++ b/src/plugins/ctf/common/metadata/ctf-meta-warn-meaningless-header-fields.cpp @@ -4,13 +4,9 @@ * Copyright 2018 Philippe Proulx */ -#include -#include #include #include -#include - #define BT_COMP_LOG_SELF_COMP (log_cfg->self_comp) #define BT_LOG_OUTPUT_LEVEL (log_cfg->log_level) #define BT_LOG_TAG "PLUGIN/CTF/META/WARN-MEANINGLESS-HEADER-FIELDS" @@ -18,7 +14,6 @@ #include "logging/comp-logging.h" #include "common/assert.h" -#include "common/macros.h" #include "ctf-meta-visitors.hpp" diff --git a/src/plugins/ctf/common/metadata/decoder-packetized-file-stream-to-buf.cpp b/src/plugins/ctf/common/metadata/decoder-packetized-file-stream-to-buf.cpp index 18227241..2150465b 100644 --- a/src/plugins/ctf/common/metadata/decoder-packetized-file-stream-to-buf.cpp +++ b/src/plugins/ctf/common/metadata/decoder-packetized-file-stream-to-buf.cpp @@ -5,9 +5,7 @@ */ #include -#include #include -#include #include #include @@ -20,14 +18,11 @@ #include "logging.hpp" #include "logging/comp-logging.h" -#include "common/assert.h" #include "common/uuid.h" #include "compat/memstream.h" -#include "ast.hpp" #include "decoder-packetized-file-stream-to-buf.hpp" #include "decoder.hpp" -#include "scanner.hpp" #define TSDL_MAGIC 0x75d11d57 diff --git a/src/plugins/ctf/common/metadata/decoder.hpp b/src/plugins/ctf/common/metadata/decoder.hpp index 25ed5188..d4385f4c 100644 --- a/src/plugins/ctf/common/metadata/decoder.hpp +++ b/src/plugins/ctf/common/metadata/decoder.hpp @@ -12,14 +12,8 @@ #include -#include "common/macros.h" #include "common/uuid.h" -struct ctf_trace_class; - -/* A CTF metadata decoder object */ -struct ctf_metadata_decoder; - /* CTF metadata decoder status */ enum ctf_metadata_decoder_status { diff --git a/src/plugins/ctf/common/metadata/logging.hpp b/src/plugins/ctf/common/metadata/logging.hpp index d2cb03f6..234a1d60 100644 --- a/src/plugins/ctf/common/metadata/logging.hpp +++ b/src/plugins/ctf/common/metadata/logging.hpp @@ -9,6 +9,7 @@ #include +#include "logging/comp-logging.h" #include "logging/log.h" /* diff --git a/src/plugins/ctf/common/metadata/objstack.cpp b/src/plugins/ctf/common/metadata/objstack.cpp index 2eb93838..bdf31e02 100644 --- a/src/plugins/ctf/common/metadata/objstack.cpp +++ b/src/plugins/ctf/common/metadata/objstack.cpp @@ -14,7 +14,6 @@ #include "common/align.h" #include "common/list.h" -#include "common/macros.h" #include "objstack.hpp" diff --git a/src/plugins/ctf/common/metadata/objstack.hpp b/src/plugins/ctf/common/metadata/objstack.hpp index 52bcd796..93154b10 100644 --- a/src/plugins/ctf/common/metadata/objstack.hpp +++ b/src/plugins/ctf/common/metadata/objstack.hpp @@ -9,10 +9,6 @@ #ifndef _OBJSTACK_H #define _OBJSTACK_H -#include "common/macros.h" - -struct objstack; - struct objstack *objstack_create(void); void objstack_destroy(struct objstack *objstack); diff --git a/src/plugins/ctf/common/metadata/scanner.hpp b/src/plugins/ctf/common/metadata/scanner.hpp index 15e8e4ae..dd16e977 100644 --- a/src/plugins/ctf/common/metadata/scanner.hpp +++ b/src/plugins/ctf/common/metadata/scanner.hpp @@ -9,8 +9,6 @@ #include -#include "common/macros.h" - #include "ast.hpp" #ifndef YY_TYPEDEF_YY_SCANNER_T diff --git a/src/plugins/ctf/common/metadata/visitor-generate-ir.cpp b/src/plugins/ctf/common/metadata/visitor-generate-ir.cpp index 7d38f85c..50a8b541 100644 --- a/src/plugins/ctf/common/metadata/visitor-generate-ir.cpp +++ b/src/plugins/ctf/common/metadata/visitor-generate-ir.cpp @@ -9,14 +9,11 @@ #include -#include #include #include #include #include -#include #include -#include #include @@ -36,7 +33,6 @@ #include "ctf-meta-visitors.hpp" #include "ctf-meta.hpp" #include "decoder.hpp" -#include "scanner.hpp" /* Bit value (left shift) */ #define _BV(_val) (1 << (_val)) diff --git a/src/plugins/ctf/common/metadata/visitor-parent-links.cpp b/src/plugins/ctf/common/metadata/visitor-parent-links.cpp index 3c0f095d..84c504f9 100644 --- a/src/plugins/ctf/common/metadata/visitor-parent-links.cpp +++ b/src/plugins/ctf/common/metadata/visitor-parent-links.cpp @@ -7,25 +7,15 @@ */ #include -#include -#include -#include -#include -#include -#include #define BT_COMP_LOG_SELF_COMP (log_cfg->self_comp) #define BT_LOG_OUTPUT_LEVEL (log_cfg->log_level) #define BT_LOG_TAG "PLUGIN/CTF/META/PARENT-LINKS-VISITOR" #include "logging.hpp" -#include "logging/comp-logging.h" -#include "common/assert.h" #include "common/list.h" -#include "common/macros.h" #include "ast.hpp" -#include "scanner.hpp" static int ctf_visitor_unary_expression(int depth, struct ctf_node *node, struct meta_log_config *log_cfg) diff --git a/src/plugins/ctf/common/metadata/visitor-semantic-validator.cpp b/src/plugins/ctf/common/metadata/visitor-semantic-validator.cpp index 93631fa4..4fad1360 100644 --- a/src/plugins/ctf/common/metadata/visitor-semantic-validator.cpp +++ b/src/plugins/ctf/common/metadata/visitor-semantic-validator.cpp @@ -7,24 +7,15 @@ */ #include -#include -#include -#include -#include -#include -#include #define BT_COMP_LOG_SELF_COMP (log_cfg->self_comp) #define BT_LOG_OUTPUT_LEVEL (log_cfg->log_level) #define BT_LOG_TAG "PLUGIN/CTF/META/SEMANTIC-VALIDATOR-VISITOR" #include "logging.hpp" -#include "logging/comp-logging.h" -#include "common/assert.h" #include "common/list.h" #include "ast.hpp" -#include "scanner.hpp" #define _bt_list_first_entry(ptr, type, member) bt_list_entry((ptr)->next, type, member) diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.cpp b/src/plugins/ctf/common/msg-iter/msg-iter.cpp index dc4a07ee..79de791c 100644 --- a/src/plugins/ctf/common/msg-iter/msg-iter.cpp +++ b/src/plugins/ctf/common/msg-iter/msg-iter.cpp @@ -12,8 +12,6 @@ #include #include #include -#include -#include #include @@ -27,8 +25,7 @@ #include "../bfcr/bfcr.hpp" #include "msg-iter.hpp" - -struct ctf_msg_iter; +#include "plugins/ctf/common/metadata/ctf-meta.hpp" /* A visit stack entry */ struct stack_entry @@ -50,8 +47,6 @@ struct stack_entry size_t index; }; -struct ctf_msg_iter; - /* Visit stack */ struct stack { diff --git a/src/plugins/ctf/common/msg-iter/msg-iter.hpp b/src/plugins/ctf/common/msg-iter/msg-iter.hpp index fc6d5d4d..0b49c1c6 100644 --- a/src/plugins/ctf/common/msg-iter/msg-iter.hpp +++ b/src/plugins/ctf/common/msg-iter/msg-iter.hpp @@ -16,9 +16,7 @@ #include -#include "common/macros.h" - -#include "../metadata/ctf-meta.hpp" +#include "common/common.h" /** * @file ctf-msg-iter.h @@ -208,9 +206,6 @@ struct ctf_msg_iter_medium_ops bt_stream *(*borrow_stream)(bt_stream_class *stream_class, int64_t stream_id, void *data); }; -/** CTF message iterator. */ -struct ctf_msg_iter; - /** * Creates a CTF message iterator. * diff --git a/src/plugins/ctf/common/print.hpp b/src/plugins/ctf/common/print.hpp index 4e89da7b..7db4dde9 100644 --- a/src/plugins/ctf/common/print.hpp +++ b/src/plugins/ctf/common/print.hpp @@ -11,8 +11,6 @@ #include -#include "common/macros.h" - #define PERR(fmt, ...) \ do { \ if (PRINT_ERR_STREAM) { \ diff --git a/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.hpp b/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.hpp index 00445951..6cde44fe 100644 --- a/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.hpp +++ b/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.hpp @@ -7,7 +7,6 @@ #ifndef BABELTRACE_PLUGIN_CTF_FS_SINK_FS_SINK_CTF_META_H #define BABELTRACE_PLUGIN_CTF_FS_SINK_FS_SINK_CTF_META_H -#include #include #include #include diff --git a/src/plugins/ctf/fs-sink/fs-sink-stream.cpp b/src/plugins/ctf/fs-sink/fs-sink-stream.cpp index 540e3d98..d56180b1 100644 --- a/src/plugins/ctf/fs-sink/fs-sink-stream.cpp +++ b/src/plugins/ctf/fs-sink/fs-sink-stream.cpp @@ -18,6 +18,7 @@ #include "compat/endian.h" #include "ctfser/ctfser.h" +#include "fs-sink-ctf-meta.hpp" #include "fs-sink-stream.hpp" #include "fs-sink-trace.hpp" #include "fs-sink.hpp" diff --git a/src/plugins/ctf/fs-sink/fs-sink-stream.hpp b/src/plugins/ctf/fs-sink/fs-sink-stream.hpp index e234c4a2..8d559c6a 100644 --- a/src/plugins/ctf/fs-sink/fs-sink-stream.hpp +++ b/src/plugins/ctf/fs-sink/fs-sink-stream.hpp @@ -12,13 +12,8 @@ #include -#include "common/macros.h" #include "ctfser/ctfser.h" -#include "fs-sink-ctf-meta.hpp" - -struct fs_sink_trace; - struct fs_sink_stream { bt_logging_level log_level; diff --git a/src/plugins/ctf/fs-sink/fs-sink-trace.cpp b/src/plugins/ctf/fs-sink/fs-sink-trace.cpp index ea35deb3..5466dd64 100644 --- a/src/plugins/ctf/fs-sink/fs-sink-trace.cpp +++ b/src/plugins/ctf/fs-sink/fs-sink-trace.cpp @@ -15,8 +15,8 @@ #include "logging/comp-logging.h" #include "common/assert.h" -#include "ctfser/ctfser.h" +#include "fs-sink-ctf-meta.hpp" #include "fs-sink-stream.hpp" #include "fs-sink-trace.hpp" #include "fs-sink.hpp" diff --git a/src/plugins/ctf/fs-sink/fs-sink-trace.hpp b/src/plugins/ctf/fs-sink/fs-sink-trace.hpp index 5ddb678d..0da8b4b0 100644 --- a/src/plugins/ctf/fs-sink/fs-sink-trace.hpp +++ b/src/plugins/ctf/fs-sink/fs-sink-trace.hpp @@ -8,17 +8,9 @@ #define BABELTRACE_PLUGIN_CTF_FS_SINK_FS_SINK_TRACE_H #include -#include #include -#include "common/macros.h" -#include "ctfser/ctfser.h" - -#include "fs-sink-ctf-meta.hpp" - -struct fs_sink_comp; - struct fs_sink_trace { bt_logging_level log_level; diff --git a/src/plugins/ctf/fs-sink/fs-sink.cpp b/src/plugins/ctf/fs-sink/fs-sink.cpp index 4aa44c15..00084b79 100644 --- a/src/plugins/ctf/fs-sink/fs-sink.cpp +++ b/src/plugins/ctf/fs-sink/fs-sink.cpp @@ -23,7 +23,6 @@ #include "fs-sink-stream.hpp" #include "fs-sink-trace.hpp" #include "fs-sink.hpp" -#include "translate-ctf-ir-to-tsdl.hpp" #include "translate-trace-ir-to-ctf-ir.hpp" static const char * const in_port_name = "in"; diff --git a/src/plugins/ctf/fs-sink/fs-sink.hpp b/src/plugins/ctf/fs-sink/fs-sink.hpp index a353cc9f..3c1e0128 100644 --- a/src/plugins/ctf/fs-sink/fs-sink.hpp +++ b/src/plugins/ctf/fs-sink/fs-sink.hpp @@ -11,8 +11,6 @@ #include -#include "common/macros.h" - struct fs_sink_comp { bt_logging_level log_level; diff --git a/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.cpp b/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.cpp index f5f1e46e..a67796b8 100644 --- a/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.cpp +++ b/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.cpp @@ -6,12 +6,10 @@ #include #include -#include #include #include "common/assert.h" -#include "common/macros.h" #include "compat/endian.h" #include "fs-sink-ctf-meta.hpp" diff --git a/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.hpp b/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.hpp index 1cdefc81..1efe100f 100644 --- a/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.hpp +++ b/src/plugins/ctf/fs-sink/translate-ctf-ir-to-tsdl.hpp @@ -9,10 +9,6 @@ #include -#include "common/macros.h" - -#include "fs-sink-ctf-meta.hpp" - void translate_trace_ctf_ir_to_tsdl(struct fs_sink_ctf_trace *trace, GString *tsdl); #endif /* BABELTRACE_PLUGIN_CTF_FS_SINK_TRANSLATE_CTF_IR_TO_TSDL_H */ diff --git a/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.cpp b/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.cpp index 7227e2cd..72a29140 100644 --- a/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.cpp +++ b/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.cpp @@ -19,7 +19,6 @@ #include "common/assert.h" #include "common/common.h" -#include "common/macros.h" #include "fs-sink-ctf-meta.hpp" #include "fs-sink.hpp" diff --git a/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.hpp b/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.hpp index 736a160a..5a3fda6c 100644 --- a/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.hpp +++ b/src/plugins/ctf/fs-sink/translate-trace-ir-to-ctf-ir.hpp @@ -9,11 +9,6 @@ #include -#include "common/macros.h" - -#include "fs-sink-ctf-meta.hpp" -#include "fs-sink.hpp" - int try_translate_event_class_trace_ir_to_ctf_ir(struct fs_sink_comp *fs_sink, struct fs_sink_ctf_stream_class *sc, const bt_event_class *ir_ec, diff --git a/src/plugins/ctf/fs-src/data-stream-file.cpp b/src/plugins/ctf/fs-src/data-stream-file.cpp index d4898442..698c0129 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.cpp +++ b/src/plugins/ctf/fs-src/data-stream-file.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include @@ -21,14 +20,15 @@ #include "logging/comp-logging.h" #include "common/assert.h" -#include "common/common.h" #include "compat/endian.h" #include "compat/mman.h" #include "../common/msg-iter/msg-iter.hpp" #include "data-stream-file.hpp" #include "file.hpp" -#include "metadata.hpp" +#include "fs.hpp" +#include "lttng-index.hpp" +#include "plugins/ctf/common/metadata/ctf-meta.hpp" static inline size_t remaining_mmap_bytes(struct ctf_fs_ds_file *ds_file) { diff --git a/src/plugins/ctf/fs-src/data-stream-file.hpp b/src/plugins/ctf/fs-src/data-stream-file.hpp index 1fefeee8..297c859f 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.hpp +++ b/src/plugins/ctf/fs-src/data-stream-file.hpp @@ -12,17 +12,7 @@ #include -#include "common/macros.h" - #include "../common/msg-iter/msg-iter.hpp" -#include "lttng-index.hpp" - -struct ctf_fs_component; -struct ctf_fs_file; -struct ctf_fs_trace; -struct ctf_fs_ds_file; -struct ctf_fs_ds_file_group; -struct ctf_fs_ds_group_medops_data; struct ctf_fs_ds_file_info { @@ -33,8 +23,6 @@ struct ctf_fs_ds_file_info int64_t begin_ns; }; -struct ctf_fs_metadata; - struct ctf_fs_ds_file { bt_logging_level log_level; diff --git a/src/plugins/ctf/fs-src/file.cpp b/src/plugins/ctf/fs-src/file.cpp index 947e09dd..25a29d0a 100644 --- a/src/plugins/ctf/fs-src/file.cpp +++ b/src/plugins/ctf/fs-src/file.cpp @@ -7,8 +7,6 @@ #include #include #include -#include -#include #define BT_COMP_LOG_SELF_COMP (file->self_comp) #define BT_LOG_OUTPUT_LEVEL (file->log_level) @@ -16,6 +14,7 @@ #include "logging/comp-logging.h" #include "file.hpp" +#include "fs.hpp" void ctf_fs_file_destroy(struct ctf_fs_file *file) { diff --git a/src/plugins/ctf/fs-src/file.hpp b/src/plugins/ctf/fs-src/file.hpp index c3b524a3..779c9177 100644 --- a/src/plugins/ctf/fs-src/file.hpp +++ b/src/plugins/ctf/fs-src/file.hpp @@ -7,12 +7,7 @@ #ifndef CTF_FS_FILE_H #define CTF_FS_FILE_H -#include -#include - -#include "common/macros.h" - -#include "fs.hpp" +#include void ctf_fs_file_destroy(struct ctf_fs_file *file); diff --git a/src/plugins/ctf/fs-src/fs.cpp b/src/plugins/ctf/fs-src/fs.cpp index 1946fdcb..53a763dd 100644 --- a/src/plugins/ctf/fs-src/fs.cpp +++ b/src/plugins/ctf/fs-src/fs.cpp @@ -24,12 +24,12 @@ #include "plugins/common/param-validation/param-validation.h" #include "../common/metadata/ctf-meta-configure-ir-trace.hpp" -#include "../common/metadata/decoder.hpp" #include "../common/msg-iter/msg-iter.hpp" #include "data-stream-file.hpp" #include "file.hpp" #include "fs.hpp" #include "metadata.hpp" +#include "plugins/ctf/common/metadata/ctf-meta.hpp" #include "query.hpp" struct tracer_info diff --git a/src/plugins/ctf/fs-src/fs.hpp b/src/plugins/ctf/fs-src/fs.hpp index 13fcb6c8..fadef78b 100644 --- a/src/plugins/ctf/fs-src/fs.hpp +++ b/src/plugins/ctf/fs-src/fs.hpp @@ -10,12 +10,10 @@ #ifndef BABELTRACE_PLUGIN_CTF_FS_H #define BABELTRACE_PLUGIN_CTF_FS_H -#include +#include -#include "common/macros.h" +#include -#include "../common/metadata/decoder.hpp" -#include "data-stream-file.hpp" #include "metadata.hpp" extern bool ctf_fs_debug; diff --git a/src/plugins/ctf/fs-src/lttng-index.hpp b/src/plugins/ctf/fs-src/lttng-index.hpp index 46f4a4d1..1542679d 100644 --- a/src/plugins/ctf/fs-src/lttng-index.hpp +++ b/src/plugins/ctf/fs-src/lttng-index.hpp @@ -9,8 +9,6 @@ #ifndef LTTNG_INDEX_H #define LTTNG_INDEX_H -#include - #include "compat/limits.h" #define CTF_INDEX_MAGIC 0xC1F1DCC1 diff --git a/src/plugins/ctf/fs-src/metadata.cpp b/src/plugins/ctf/fs-src/metadata.cpp index 562ef981..ad215f9f 100644 --- a/src/plugins/ctf/fs-src/metadata.cpp +++ b/src/plugins/ctf/fs-src/metadata.cpp @@ -6,7 +6,6 @@ */ #include -#include #include #include @@ -18,8 +17,6 @@ #include "logging/comp-logging.h" #include "common/assert.h" -#include "common/uuid.h" -#include "compat/memstream.h" #include "../common/metadata/decoder.hpp" #include "file.hpp" diff --git a/src/plugins/ctf/fs-src/metadata.hpp b/src/plugins/ctf/fs-src/metadata.hpp index 3f10a90b..60790ada 100644 --- a/src/plugins/ctf/fs-src/metadata.hpp +++ b/src/plugins/ctf/fs-src/metadata.hpp @@ -7,18 +7,12 @@ #ifndef CTF_FS_METADATA_H #define CTF_FS_METADATA_H -#include #include #include -#include "common/macros.h" - #define CTF_FS_METADATA_FILENAME "metadata" -struct ctf_fs_trace; -struct ctf_fs_metadata; - struct ctf_fs_metadata_config { bool force_clock_class_origin_unix_epoch; diff --git a/src/plugins/ctf/fs-src/query.cpp b/src/plugins/ctf/fs-src/query.cpp index a80be2dd..b11d6f81 100644 --- a/src/plugins/ctf/fs-src/query.cpp +++ b/src/plugins/ctf/fs-src/query.cpp @@ -6,10 +6,8 @@ * Babeltrace CTF file system Reader Component queries */ -#include #include #include -#include #include #include @@ -20,8 +18,6 @@ #include "logging/log.h" #include "common/assert.h" -#include "common/common.h" -#include "common/macros.h" #include "../common/metadata/decoder.hpp" #include "fs.hpp" diff --git a/src/plugins/ctf/fs-src/query.hpp b/src/plugins/ctf/fs-src/query.hpp index 3b17fb8a..053540ff 100644 --- a/src/plugins/ctf/fs-src/query.hpp +++ b/src/plugins/ctf/fs-src/query.hpp @@ -11,8 +11,6 @@ #include -#include "common/macros.h" - bt_component_class_query_method_status metadata_info_query(bt_self_component_class_source *comp_class, const bt_value *params, bt_logging_level log_level, const bt_value **result); diff --git a/src/plugins/ctf/lttng-live/data-stream.cpp b/src/plugins/ctf/lttng-live/data-stream.cpp index 5ab21297..9ad1e9ef 100644 --- a/src/plugins/ctf/lttng-live/data-stream.cpp +++ b/src/plugins/ctf/lttng-live/data-stream.cpp @@ -10,10 +10,11 @@ #include #include #include -#include #include +#include "plugins/ctf/common/metadata/decoder.hpp" + #define BT_COMP_LOG_SELF_COMP self_comp #define BT_LOG_OUTPUT_LEVEL log_level #define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE/DS" diff --git a/src/plugins/ctf/lttng-live/data-stream.hpp b/src/plugins/ctf/lttng-live/data-stream.hpp index 28b3b95f..d49a9506 100644 --- a/src/plugins/ctf/lttng-live/data-stream.hpp +++ b/src/plugins/ctf/lttng-live/data-stream.hpp @@ -7,11 +7,8 @@ #ifndef LTTNG_LIVE_DATA_STREAM_H #define LTTNG_LIVE_DATA_STREAM_H -#include #include -#include -#include "../common/msg-iter/msg-iter.hpp" #include "lttng-live.hpp" enum lttng_live_iterator_status lttng_live_lazy_msg_init(struct lttng_live_session *session, diff --git a/src/plugins/ctf/lttng-live/lttng-live.cpp b/src/plugins/ctf/lttng-live/lttng-live.cpp index 342bd1ea..49dc148c 100644 --- a/src/plugins/ctf/lttng-live/lttng-live.cpp +++ b/src/plugins/ctf/lttng-live/lttng-live.cpp @@ -20,7 +20,6 @@ #include "logging/comp-logging.h" #include "common/assert.h" -#include "compat/compiler.h" #include "plugins/common/muxing/muxing.h" #include "plugins/common/param-validation/param-validation.h" diff --git a/src/plugins/ctf/lttng-live/lttng-live.hpp b/src/plugins/ctf/lttng-live/lttng-live.hpp index d963e987..9ca87401 100644 --- a/src/plugins/ctf/lttng-live/lttng-live.hpp +++ b/src/plugins/ctf/lttng-live/lttng-live.hpp @@ -16,16 +16,9 @@ #include -#include "common/macros.h" - -#include "../common/metadata/decoder.hpp" #include "../common/msg-iter/msg-iter.hpp" #include "viewer-connection.hpp" -struct lttng_live_component; -struct lttng_live_session; -struct lttng_live_msg_iter; - enum lttng_live_stream_state { /* This stream won't have data until some known time in the future. */ diff --git a/src/plugins/ctf/lttng-live/metadata.hpp b/src/plugins/ctf/lttng-live/metadata.hpp index 798d4809..49596c3b 100644 --- a/src/plugins/ctf/lttng-live/metadata.hpp +++ b/src/plugins/ctf/lttng-live/metadata.hpp @@ -8,7 +8,6 @@ #define LTTNG_LIVE_METADATA_H #include -#include #include "lttng-live.hpp" diff --git a/src/plugins/ctf/lttng-live/viewer-connection.cpp b/src/plugins/ctf/lttng-live/viewer-connection.cpp index 41e81ec8..02c7e6ac 100644 --- a/src/plugins/ctf/lttng-live/viewer-connection.cpp +++ b/src/plugins/ctf/lttng-live/viewer-connection.cpp @@ -5,13 +5,9 @@ * Copyright 2016 Mathieu Desnoyers */ -#include #include #include #include -#include -#include -#include #include @@ -21,7 +17,6 @@ #include "logging/comp-logging.h" #include "common/common.h" -#include "compat/compiler.h" #include "compat/endian.h" #include "compat/socket.h" diff --git a/src/plugins/ctf/lttng-live/viewer-connection.hpp b/src/plugins/ctf/lttng-live/viewer-connection.hpp index 59316371..67e71e0c 100644 --- a/src/plugins/ctf/lttng-live/viewer-connection.hpp +++ b/src/plugins/ctf/lttng-live/viewer-connection.hpp @@ -9,11 +9,9 @@ #include #include -#include #include -#include "common/macros.h" #include "compat/socket.h" #define LTTNG_DEFAULT_NETWORK_VIEWER_PORT 5344 @@ -46,8 +44,6 @@ enum lttng_live_get_one_metadata_status LTTNG_LIVE_GET_ONE_METADATA_STATUS_CLOSED = -3, }; -struct lttng_live_component; - struct live_viewer_connection { bt_logging_level log_level; diff --git a/tests/lib/conds/utils.cpp b/tests/lib/conds/utils.cpp index 53984752..c5992e3b 100644 --- a/tests/lib/conds/utils.cpp +++ b/tests/lib/conds/utils.cpp @@ -6,7 +6,6 @@ #include -#include #include #include #include