From a1501ac9839c62c056230bcae11f06b483e5e347 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 2 Nov 2023 20:00:27 +0000 Subject: [PATCH] ctf: rename `ctx` structures Rename the various structures named `ctx` to something else, to avoid ODR problems when C++-ifying them. Change-Id: I1b30c38ba6b88687b5baa5b965b805b0a9097ffe Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/12236 Tested-by: jenkins Reviewed-by: Philippe Proulx --- .../src/metadata/tsdl/ctf-meta-translate.cpp | 45 ++++++----- .../ctf/fs-sink/translate-ctf-ir-to-tsdl.cpp | 58 +++++++------ .../fs-sink/translate-trace-ir-to-ctf-ir.cpp | 81 +++++++++++-------- 3 files changed, 105 insertions(+), 79 deletions(-) diff --git a/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-translate.cpp b/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-translate.cpp index e3ecfd07..b62dabf6 100644 --- a/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-translate.cpp +++ b/src/plugins/ctf/common/src/metadata/tsdl/ctf-meta-translate.cpp @@ -13,7 +13,9 @@ #include "ctf-meta-visitors.hpp" -struct ctx +namespace ctf { + +struct MetaTranslateCtx { bt_self_component *self_comp; bt_trace_class *ir_tc; @@ -24,7 +26,10 @@ struct ctx enum ctf_scope scope; }; -static inline bt_field_class *ctf_field_class_to_ir(struct ctx *ctx, struct ctf_field_class *fc); +} /* namespace ctf */ + +static inline bt_field_class *ctf_field_class_to_ir(ctf::MetaTranslateCtx *ctx, + struct ctf_field_class *fc); static inline void ctf_field_class_int_set_props(struct ctf_field_class_int *fc, bt_field_class *ir_fc) @@ -33,7 +38,7 @@ static inline void ctf_field_class_int_set_props(struct ctf_field_class_int *fc, bt_field_class_integer_set_preferred_display_base(ir_fc, fc->disp_base); } -static inline bt_field_class *ctf_field_class_int_to_ir(struct ctx *ctx, +static inline bt_field_class *ctf_field_class_int_to_ir(ctf::MetaTranslateCtx *ctx, struct ctf_field_class_int *fc) { bt_field_class *ir_fc; @@ -49,7 +54,7 @@ static inline bt_field_class *ctf_field_class_int_to_ir(struct ctx *ctx, return ir_fc; } -static inline bt_field_class *ctf_field_class_enum_to_ir(struct ctx *ctx, +static inline bt_field_class *ctf_field_class_enum_to_ir(ctf::MetaTranslateCtx *ctx, struct ctf_field_class_enum *fc) { int ret; @@ -111,7 +116,7 @@ static inline bt_field_class *ctf_field_class_enum_to_ir(struct ctx *ctx, return ir_fc; } -static inline bt_field_class *ctf_field_class_float_to_ir(struct ctx *ctx, +static inline bt_field_class *ctf_field_class_float_to_ir(ctf::MetaTranslateCtx *ctx, struct ctf_field_class_float *fc) { bt_field_class *ir_fc; @@ -126,8 +131,7 @@ static inline bt_field_class *ctf_field_class_float_to_ir(struct ctx *ctx, return ir_fc; } -static inline bt_field_class *ctf_field_class_string_to_ir(struct ctx *ctx, - struct ctf_field_class_string *) +static inline bt_field_class *ctf_field_class_string_to_ir(ctf::MetaTranslateCtx *ctx) { bt_field_class *ir_fc = bt_field_class_string_create(ctx->ir_tc); @@ -135,7 +139,7 @@ static inline bt_field_class *ctf_field_class_string_to_ir(struct ctx *ctx, return ir_fc; } -static inline void translate_struct_field_class_members(struct ctx *ctx, +static inline void translate_struct_field_class_members(ctf::MetaTranslateCtx *ctx, struct ctf_field_class_struct *fc, bt_field_class *ir_fc, bool, struct ctf_field_class_struct *) @@ -161,7 +165,7 @@ static inline void translate_struct_field_class_members(struct ctx *ctx, } } -static inline bt_field_class *ctf_field_class_struct_to_ir(struct ctx *ctx, +static inline bt_field_class *ctf_field_class_struct_to_ir(ctf::MetaTranslateCtx *ctx, struct ctf_field_class_struct *fc) { bt_field_class *ir_fc = bt_field_class_structure_create(ctx->ir_tc); @@ -171,7 +175,7 @@ static inline bt_field_class *ctf_field_class_struct_to_ir(struct ctx *ctx, return ir_fc; } -static inline bt_field_class *borrow_ir_fc_from_field_path(struct ctx *ctx, +static inline bt_field_class *borrow_ir_fc_from_field_path(ctf::MetaTranslateCtx *ctx, struct ctf_field_path *field_path) { bt_field_class *ir_fc = NULL; @@ -225,7 +229,7 @@ end: return mapping; } -static inline bt_field_class *ctf_field_class_variant_to_ir(struct ctx *ctx, +static inline bt_field_class *ctf_field_class_variant_to_ir(ctf::MetaTranslateCtx *ctx, struct ctf_field_class_variant *fc) { int ret; @@ -301,7 +305,7 @@ static inline bt_field_class *ctf_field_class_variant_to_ir(struct ctx *ctx, return ir_fc; } -static inline bt_field_class *ctf_field_class_array_to_ir(struct ctx *ctx, +static inline bt_field_class *ctf_field_class_array_to_ir(ctf::MetaTranslateCtx *ctx, struct ctf_field_class_array *fc) { bt_field_class *ir_fc; @@ -323,7 +327,7 @@ end: return ir_fc; } -static inline bt_field_class *ctf_field_class_sequence_to_ir(struct ctx *ctx, +static inline bt_field_class *ctf_field_class_sequence_to_ir(ctf::MetaTranslateCtx *ctx, struct ctf_field_class_sequence *fc) { bt_field_class *ir_fc; @@ -354,7 +358,8 @@ end: return ir_fc; } -static inline bt_field_class *ctf_field_class_to_ir(struct ctx *ctx, struct ctf_field_class *fc) +static inline bt_field_class *ctf_field_class_to_ir(ctf::MetaTranslateCtx *ctx, + struct ctf_field_class *fc) { bt_field_class *ir_fc = NULL; @@ -372,7 +377,7 @@ static inline bt_field_class *ctf_field_class_to_ir(struct ctx *ctx, struct ctf_ ir_fc = ctf_field_class_float_to_ir(ctx, ctf_field_class_as_float(fc)); break; case CTF_FIELD_CLASS_TYPE_STRING: - ir_fc = ctf_field_class_string_to_ir(ctx, ctf_field_class_as_string(fc)); + ir_fc = ctf_field_class_string_to_ir(ctx); break; case CTF_FIELD_CLASS_TYPE_STRUCT: ir_fc = ctf_field_class_struct_to_ir(ctx, ctf_field_class_as_struct(fc)); @@ -424,7 +429,7 @@ end: return has_immediate_member_in_ir; } -static inline bt_field_class *scope_ctf_field_class_to_ir(struct ctx *ctx) +static inline bt_field_class *scope_ctf_field_class_to_ir(ctf::MetaTranslateCtx *ctx) { bt_field_class *ir_fc = NULL; struct ctf_field_class *fc = NULL; @@ -453,7 +458,7 @@ static inline bt_field_class *scope_ctf_field_class_to_ir(struct ctx *ctx) return ir_fc; } -static inline void ctf_event_class_to_ir(struct ctx *ctx) +static inline void ctf_event_class_to_ir(ctf::MetaTranslateCtx *ctx) { int ret; bt_event_class *ir_ec = NULL; @@ -507,7 +512,7 @@ end: return; } -static inline void ctf_stream_class_to_ir(struct ctx *ctx) +static inline void ctf_stream_class_to_ir(ctf::MetaTranslateCtx *ctx) { int ret; bt_field_class *ir_fc; @@ -588,7 +593,7 @@ static inline void ctf_clock_class_to_ir(bt_clock_class *ir_cc, struct ctf_clock bt_clock_class_set_origin_is_unix_epoch(ir_cc, cc->is_absolute); } -static inline int ctf_trace_class_to_ir(struct ctx *ctx) +static inline int ctf_trace_class_to_ir(ctf::MetaTranslateCtx *ctx) { int ret = 0; uint64_t i; @@ -620,7 +625,7 @@ int ctf_trace_class_translate(bt_self_component *self_comp, bt_trace_class *ir_t { int ret = 0; uint64_t i; - struct ctx ctx = {}; + ctf::MetaTranslateCtx ctx = {}; ctx.self_comp = self_comp; ctx.tc = tc; 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 db7af865..c45a1685 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 @@ -15,13 +15,19 @@ #include "fs-sink-ctf-meta.hpp" #include "translate-ctf-ir-to-tsdl.hpp" -struct ctx +namespace ctf { +namespace sink { + +struct CtfIrToTsdlCtx { unsigned int indent_level; GString *tsdl; }; -static inline void append_indent(struct ctx *ctx) +} /* namespace sink */ +} /* namespace ctf */ + +static inline void append_indent(ctf::sink::CtfIrToTsdlCtx *ctx) { unsigned int i; @@ -30,12 +36,12 @@ static inline void append_indent(struct ctx *ctx) } } -static void append_uuid(struct ctx *ctx, bt_uuid uuid) +static void append_uuid(ctf::sink::CtfIrToTsdlCtx *ctx, bt_uuid uuid) { g_string_append_printf(ctx->tsdl, "\"" BT_UUID_FMT "\"", BT_UUID_FMT_VALUES(uuid)); } -static void append_quoted_string_content(struct ctx *ctx, const char *str) +static void append_quoted_string_content(ctf::sink::CtfIrToTsdlCtx *ctx, const char *str) { const char *ch; @@ -78,7 +84,7 @@ static void append_quoted_string_content(struct ctx *ctx, const char *str) } } -static void append_quoted_string(struct ctx *ctx, const char *str) +static void append_quoted_string(ctf::sink::CtfIrToTsdlCtx *ctx, const char *str) { g_string_append_c(ctx->tsdl, '"'); append_quoted_string_content(ctx, str); @@ -86,7 +92,7 @@ static void append_quoted_string(struct ctx *ctx, const char *str) } static void append_integer_field_class_from_props( - struct ctx *ctx, unsigned int size, unsigned int alignment, bool is_signed, + ctf::sink::CtfIrToTsdlCtx *ctx, unsigned int size, unsigned int alignment, bool is_signed, bt_field_class_integer_preferred_display_base disp_base, const char *mapped_clock_class_name, const char *field_name, bool end) { @@ -131,27 +137,27 @@ static void append_integer_field_class_from_props( } } -static void append_end_block(struct ctx *ctx) +static void append_end_block(ctf::sink::CtfIrToTsdlCtx *ctx) { ctx->indent_level--; append_indent(ctx); g_string_append(ctx->tsdl, "}"); } -static void append_end_block_semi_nl(struct ctx *ctx) +static void append_end_block_semi_nl(ctf::sink::CtfIrToTsdlCtx *ctx) { ctx->indent_level--; append_indent(ctx); g_string_append(ctx->tsdl, "};\n"); } -static void append_end_block_semi_nl_nl(struct ctx *ctx) +static void append_end_block_semi_nl_nl(ctf::sink::CtfIrToTsdlCtx *ctx) { append_end_block_semi_nl(ctx); g_string_append_c(ctx->tsdl, '\n'); } -static void append_bool_field_class(struct ctx *ctx, +static void append_bool_field_class(ctf::sink::CtfIrToTsdlCtx *ctx, __attribute__((unused)) struct fs_sink_ctf_field_class_bool *fc) { /* @@ -163,7 +169,7 @@ static void append_bool_field_class(struct ctx *ctx, NULL, NULL, false); } -static void append_bit_array_field_class(struct ctx *ctx, +static void append_bit_array_field_class(ctf::sink::CtfIrToTsdlCtx *ctx, struct fs_sink_ctf_field_class_bit_array *fc) { /* @@ -176,7 +182,8 @@ static void append_bit_array_field_class(struct ctx *ctx, NULL, NULL, false); } -static void append_integer_field_class(struct ctx *ctx, struct fs_sink_ctf_field_class_int *fc) +static void append_integer_field_class(ctf::sink::CtfIrToTsdlCtx *ctx, + struct fs_sink_ctf_field_class_int *fc) { const bt_field_class *ir_fc = fc->base.base.ir_fc; bt_field_class_type type = bt_field_class_get_type(ir_fc); @@ -269,7 +276,8 @@ static void append_integer_field_class(struct ctx *ctx, struct fs_sink_ctf_field } } -static void append_float_field_class(struct ctx *ctx, struct fs_sink_ctf_field_class_float *fc) +static void append_float_field_class(ctf::sink::CtfIrToTsdlCtx *ctx, + struct fs_sink_ctf_field_class_float *fc) { unsigned int mant_dig, exp_dig; @@ -285,14 +293,15 @@ static void append_float_field_class(struct ctx *ctx, struct fs_sink_ctf_field_c mant_dig, exp_dig, fc->base.base.alignment); } -static void append_string_field_class(struct ctx *ctx) +static void append_string_field_class(ctf::sink::CtfIrToTsdlCtx *ctx) { g_string_append(ctx->tsdl, "string { encoding = UTF8; }"); } -static void append_field_class(struct ctx *ctx, struct fs_sink_ctf_field_class *fc); +static void append_field_class(ctf::sink::CtfIrToTsdlCtx *ctx, struct fs_sink_ctf_field_class *fc); -static void append_member(struct ctx *ctx, const char *name, struct fs_sink_ctf_field_class *fc) +static void append_member(ctf::sink::CtfIrToTsdlCtx *ctx, const char *name, + struct fs_sink_ctf_field_class *fc) { GString *lengths = NULL; const char *lengths_str = ""; @@ -333,7 +342,7 @@ static void append_member(struct ctx *ctx, const char *name, struct fs_sink_ctf_ } } -static void append_struct_field_class_members(struct ctx *ctx, +static void append_struct_field_class_members(ctf::sink::CtfIrToTsdlCtx *ctx, struct fs_sink_ctf_field_class_struct *struct_fc) { uint64_t i; @@ -431,7 +440,8 @@ static void append_struct_field_class_members(struct ctx *ctx, } } -static void append_struct_field_class(struct ctx *ctx, struct fs_sink_ctf_field_class_struct *fc) +static void append_struct_field_class(ctf::sink::CtfIrToTsdlCtx *ctx, + struct fs_sink_ctf_field_class_struct *fc) { g_string_append(ctx->tsdl, "struct {\n"); ctx->indent_level++; @@ -440,7 +450,7 @@ static void append_struct_field_class(struct ctx *ctx, struct fs_sink_ctf_field_ g_string_append_printf(ctx->tsdl, " align(%u)", fc->base.alignment); } -static void append_option_field_class(struct ctx *ctx, +static void append_option_field_class(ctf::sink::CtfIrToTsdlCtx *ctx, struct fs_sink_ctf_field_class_option *opt_fc) { g_string_append_printf(ctx->tsdl, "variant <%s> {\n", opt_fc->tag_ref->str); @@ -452,7 +462,7 @@ static void append_option_field_class(struct ctx *ctx, append_end_block(ctx); } -static void append_variant_field_class(struct ctx *ctx, +static void append_variant_field_class(ctf::sink::CtfIrToTsdlCtx *ctx, struct fs_sink_ctf_field_class_variant *var_fc) { uint64_t i; @@ -471,7 +481,7 @@ static void append_variant_field_class(struct ctx *ctx, append_end_block(ctx); } -static void append_field_class(struct ctx *ctx, struct fs_sink_ctf_field_class *fc) +static void append_field_class(ctf::sink::CtfIrToTsdlCtx *ctx, struct fs_sink_ctf_field_class *fc) { switch (fc->type) { case FS_SINK_CTF_FIELD_CLASS_TYPE_BOOL: @@ -503,7 +513,7 @@ static void append_field_class(struct ctx *ctx, struct fs_sink_ctf_field_class * } } -static void append_event_class(struct ctx *ctx, struct fs_sink_ctf_event_class *ec) +static void append_event_class(ctf::sink::CtfIrToTsdlCtx *ctx, struct fs_sink_ctf_event_class *ec) { const char *str; bt_event_class_log_level log_level; @@ -615,7 +625,7 @@ static void append_event_class(struct ctx *ctx, struct fs_sink_ctf_event_class * append_end_block_semi_nl_nl(ctx); } -static void append_stream_class(struct ctx *ctx, struct fs_sink_ctf_stream_class *sc) +static void append_stream_class(ctf::sink::CtfIrToTsdlCtx *ctx, struct fs_sink_ctf_stream_class *sc) { uint64_t i; @@ -776,7 +786,7 @@ static void append_stream_class(struct ctx *ctx, struct fs_sink_ctf_stream_class void translate_trace_ctf_ir_to_tsdl(struct fs_sink_ctf_trace *trace, GString *tsdl) { - struct ctx ctx = { + ctf::sink::CtfIrToTsdlCtx ctx = { .indent_level = 0, .tsdl = tsdl, }; 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 6d52bf2a..96884a16 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 @@ -35,7 +35,10 @@ struct field_path_elem struct fs_sink_ctf_field_class *parent_fc; }; -struct ctx +namespace ctf { +namespace sink { + +struct TraceIrToCtfIrCtx { bt_logging_level log_level; bt_self_component *self_comp; @@ -53,13 +56,17 @@ struct ctx GArray *cur_path; }; -static inline struct field_path_elem *cur_path_stack_at(struct ctx *ctx, uint64_t i) +} /* namespace sink */ +} /* namespace ctf */ + +static inline struct field_path_elem *cur_path_stack_at(ctf::sink::TraceIrToCtfIrCtx *ctx, + uint64_t i) { BT_ASSERT(i < ctx->cur_path->len); return &bt_g_array_index(ctx->cur_path, struct field_path_elem, i); } -static inline struct field_path_elem *cur_path_stack_top(struct ctx *ctx) +static inline struct field_path_elem *cur_path_stack_top(ctf::sink::TraceIrToCtfIrCtx *ctx) { BT_ASSERT(ctx->cur_path->len > 0); return cur_path_stack_at(ctx, ctx->cur_path->len - 1); @@ -151,8 +158,8 @@ end: return must_protect; } -static inline int cur_path_stack_push(struct ctx *ctx, const char *name, bool force_protect_name, - const bt_field_class *ir_fc, +static inline int cur_path_stack_push(ctf::sink::TraceIrToCtfIrCtx *ctx, const char *name, + bool force_protect_name, const bt_field_class *ir_fc, struct fs_sink_ctf_field_class *parent_fc) { int ret = 0; @@ -200,7 +207,7 @@ end: return ret; } -static inline void cur_path_stack_pop(struct ctx *ctx) +static inline void cur_path_stack_pop(ctf::sink::TraceIrToCtfIrCtx *ctx) { struct field_path_elem *field_path_elem; @@ -227,8 +234,8 @@ static inline void cur_path_stack_pop(struct ctx *ctx) * * Returns a negative value if this resolving operation failed. */ -static int create_relative_field_ref(struct ctx *ctx, const bt_field_path *tgt_ir_field_path, - GString *tgt_field_ref, +static int create_relative_field_ref(ctf::sink::TraceIrToCtfIrCtx *ctx, + const bt_field_path *tgt_ir_field_path, GString *tgt_field_ref, struct fs_sink_ctf_field_class **user_tgt_fc) { int ret = 0; @@ -392,8 +399,8 @@ end: * * Returns a negative value if this resolving operation failed. */ -static int create_absolute_field_ref(struct ctx *ctx, const bt_field_path *tgt_ir_field_path, - GString *tgt_field_ref, +static int create_absolute_field_ref(ctf::sink::TraceIrToCtfIrCtx *ctx, + const bt_field_path *tgt_ir_field_path, GString *tgt_field_ref, struct fs_sink_ctf_field_class **user_tgt_fc) { int ret = 0; @@ -475,9 +482,9 @@ end: * created immediately before (in which case `tgt_field_ref` is * irrelevant). */ -static void resolve_field_class(struct ctx *ctx, const bt_field_path *tgt_ir_field_path, - GString *tgt_field_ref, bool *create_before, - struct fs_sink_ctf_field_class **user_tgt_fc) +static void resolve_field_class(ctf::sink::TraceIrToCtfIrCtx *ctx, + const bt_field_path *tgt_ir_field_path, GString *tgt_field_ref, + bool *create_before, struct fs_sink_ctf_field_class **user_tgt_fc) { int ret; bt_field_path_scope tgt_scope; @@ -525,9 +532,10 @@ end: return; } -static int translate_field_class(struct ctx *ctx); +static int translate_field_class(ctf::sink::TraceIrToCtfIrCtx *ctx); -static inline void append_to_parent_field_class(struct ctx *ctx, struct fs_sink_ctf_field_class *fc) +static inline void append_to_parent_field_class(ctf::sink::TraceIrToCtfIrCtx *ctx, + struct fs_sink_ctf_field_class *fc) { struct fs_sink_ctf_field_class *parent_fc = cur_path_stack_top(ctx)->parent_fc; @@ -566,7 +574,8 @@ static inline void append_to_parent_field_class(struct ctx *ctx, struct fs_sink_ } } -static inline void update_parent_field_class_alignment(struct ctx *ctx, unsigned int alignment) +static inline void update_parent_field_class_alignment(ctf::sink::TraceIrToCtfIrCtx *ctx, + unsigned int alignment) { struct fs_sink_ctf_field_class *parent_fc = cur_path_stack_top(ctx)->parent_fc; @@ -589,8 +598,10 @@ static inline void update_parent_field_class_alignment(struct ctx *ctx, unsigned } } -static inline int translate_structure_field_class_members( - struct ctx *ctx, struct fs_sink_ctf_field_class_struct *struct_fc, const bt_field_class *ir_fc) +static inline int +translate_structure_field_class_members(ctf::sink::TraceIrToCtfIrCtx *ctx, + struct fs_sink_ctf_field_class_struct *struct_fc, + const bt_field_class *ir_fc) { int ret = 0; uint64_t i; @@ -626,7 +637,7 @@ end: return ret; } -static inline int translate_structure_field_class(struct ctx *ctx) +static inline int translate_structure_field_class(ctf::sink::TraceIrToCtfIrCtx *ctx) { int ret; struct fs_sink_ctf_field_class_struct *fc = @@ -840,7 +851,7 @@ end: return ret; } -static inline int translate_option_field_class(struct ctx *ctx) +static inline int translate_option_field_class(ctf::sink::TraceIrToCtfIrCtx *ctx) { struct fs_sink_ctf_field_class_option *fc = fs_sink_ctf_field_class_option_create_empty(cur_path_stack_top(ctx)->ir_fc); @@ -881,7 +892,7 @@ end: return ret; } -static inline int translate_variant_field_class(struct ctx *ctx) +static inline int translate_variant_field_class(ctf::sink::TraceIrToCtfIrCtx *ctx) { int ret = 0; uint64_t i; @@ -1041,7 +1052,7 @@ end: return ret; } -static inline int translate_static_array_field_class(struct ctx *ctx) +static inline int translate_static_array_field_class(ctf::sink::TraceIrToCtfIrCtx *ctx) { struct fs_sink_ctf_field_class_array *fc = fs_sink_ctf_field_class_array_create_empty(cur_path_stack_top(ctx)->ir_fc); @@ -1070,7 +1081,7 @@ end: return ret; } -static inline int translate_dynamic_array_field_class(struct ctx *ctx) +static inline int translate_dynamic_array_field_class(ctf::sink::TraceIrToCtfIrCtx *ctx) { struct fs_sink_ctf_field_class_sequence *fc = fs_sink_ctf_field_class_sequence_create_empty(cur_path_stack_top(ctx)->ir_fc); @@ -1110,7 +1121,7 @@ end: return ret; } -static inline int translate_bool_field_class(struct ctx *ctx) +static inline int translate_bool_field_class(ctf::sink::TraceIrToCtfIrCtx *ctx) { struct fs_sink_ctf_field_class_bool *fc = fs_sink_ctf_field_class_bool_create(cur_path_stack_top(ctx)->ir_fc); @@ -1120,7 +1131,7 @@ static inline int translate_bool_field_class(struct ctx *ctx) return 0; } -static inline int translate_bit_array_field_class(struct ctx *ctx) +static inline int translate_bit_array_field_class(ctf::sink::TraceIrToCtfIrCtx *ctx) { struct fs_sink_ctf_field_class_bit_array *fc = fs_sink_ctf_field_class_bit_array_create(cur_path_stack_top(ctx)->ir_fc); @@ -1130,7 +1141,7 @@ static inline int translate_bit_array_field_class(struct ctx *ctx) return 0; } -static inline int translate_integer_field_class(struct ctx *ctx) +static inline int translate_integer_field_class(ctf::sink::TraceIrToCtfIrCtx *ctx) { struct fs_sink_ctf_field_class_int *fc = fs_sink_ctf_field_class_int_create(cur_path_stack_top(ctx)->ir_fc); @@ -1140,7 +1151,7 @@ static inline int translate_integer_field_class(struct ctx *ctx) return 0; } -static inline int translate_real_field_class(struct ctx *ctx) +static inline int translate_real_field_class(ctf::sink::TraceIrToCtfIrCtx *ctx) { struct fs_sink_ctf_field_class_float *fc = fs_sink_ctf_field_class_float_create(cur_path_stack_top(ctx)->ir_fc); @@ -1150,7 +1161,7 @@ static inline int translate_real_field_class(struct ctx *ctx) return 0; } -static inline int translate_string_field_class(struct ctx *ctx) +static inline int translate_string_field_class(ctf::sink::TraceIrToCtfIrCtx *ctx) { struct fs_sink_ctf_field_class_string *fc = fs_sink_ctf_field_class_string_create(cur_path_stack_top(ctx)->ir_fc); @@ -1167,7 +1178,7 @@ static inline int translate_string_field_class(struct ctx *ctx) * within its parent are in the context's current path's top element * (cur_path_stack_top()). */ -static int translate_field_class(struct ctx *ctx) +static int translate_field_class(ctf::sink::TraceIrToCtfIrCtx *ctx) { int ret; bt_field_class_type ir_fc_type = bt_field_class_get_type(cur_path_stack_top(ctx)->ir_fc); @@ -1417,7 +1428,7 @@ end: * class and then calls translate_structure_field_class_members() to * fill it. */ -static int translate_scope_field_class(struct ctx *ctx, bt_field_path_scope scope, +static int translate_scope_field_class(ctf::sink::TraceIrToCtfIrCtx *ctx, bt_field_path_scope scope, struct fs_sink_ctf_field_class **fc, const bt_field_class *ir_fc) { @@ -1459,16 +1470,16 @@ end: return ret; } -static inline void ctx_init(struct ctx *ctx, struct fs_sink_comp *fs_sink) +static inline void ctx_init(ctf::sink::TraceIrToCtfIrCtx *ctx, struct fs_sink_comp *fs_sink) { - memset(ctx, 0, sizeof(struct ctx)); + memset(ctx, 0, sizeof(*ctx)); ctx->cur_path = g_array_new(FALSE, TRUE, sizeof(struct field_path_elem)); BT_ASSERT(ctx->cur_path); ctx->log_level = fs_sink->log_level; ctx->self_comp = fs_sink->self_comp; } -static inline void ctx_fini(struct ctx *ctx) +static inline void ctx_fini(ctf::sink::TraceIrToCtfIrCtx *ctx) { if (ctx->cur_path) { g_array_free(ctx->cur_path, TRUE); @@ -1481,7 +1492,7 @@ static int translate_event_class(struct fs_sink_comp *fs_sink, struct fs_sink_ct struct fs_sink_ctf_event_class **out_ec) { int ret = 0; - struct ctx ctx; + ctf::sink::TraceIrToCtfIrCtx ctx; struct fs_sink_ctf_event_class *ec; BT_ASSERT(sc); @@ -1576,7 +1587,7 @@ static int translate_stream_class(struct fs_sink_comp *fs_sink, struct fs_sink_c struct fs_sink_ctf_stream_class **out_sc) { int ret = 0; - struct ctx ctx; + ctf::sink::TraceIrToCtfIrCtx ctx; BT_ASSERT(trace); BT_ASSERT(ir_sc); -- 2.34.1