On Wed, Oct 11, 2023 at 10:17:29AM +0100, Alan Maguire wrote:
> ...rather than passing them to btf_encoder__new(); this tidies
> up the encoder API and also allows us to use generalized methods
> to translate from a BTF feature (forthcoming) to a conf_load
> parameter.
>
> Signed-off-by: Alan Maguire <alan.maguire@xxxxxxxxxx>
nice cleanup
Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx>
jirka
> ---
> btf_encoder.c | 8 ++++----
> btf_encoder.h | 2 +-
> dwarves.h | 3 +++
> pahole.c | 21 ++++++++-------------
> 4 files changed, 16 insertions(+), 18 deletions(-)
>
> diff --git a/btf_encoder.c b/btf_encoder.c
> index 65f6e71..fd04008 100644
> --- a/btf_encoder.c
> +++ b/btf_encoder.c
> @@ -1625,7 +1625,7 @@ out:
> return err;
> }
>
> -struct btf_encoder *btf_encoder__new(struct cu *cu, const char *detached_filename, struct btf *base_btf, bool skip_encoding_vars, bool force, bool gen_floats, bool verbose)
> +struct btf_encoder *btf_encoder__new(struct cu *cu, const char *detached_filename, struct btf *base_btf, bool verbose, struct conf_load *conf_load)
> {
> struct btf_encoder *encoder = zalloc(sizeof(*encoder));
>
> @@ -1639,9 +1639,9 @@ struct btf_encoder *btf_encoder__new(struct cu *cu, const char *detached_filenam
> if (encoder->btf == NULL)
> goto out_delete;
>
> - encoder->force = force;
> - encoder->gen_floats = gen_floats;
> - encoder->skip_encoding_vars = skip_encoding_vars;
> + encoder->force = conf_load->btf_encode_force;
> + encoder->gen_floats = conf_load->btf_gen_floats;
> + encoder->skip_encoding_vars = conf_load->skip_encoding_btf_vars;
> encoder->verbose = verbose;
> encoder->has_index_type = false;
> encoder->need_index_type = false;
> diff --git a/btf_encoder.h b/btf_encoder.h
> index 34516bb..f54c95a 100644
> --- a/btf_encoder.h
> +++ b/btf_encoder.h
> @@ -16,7 +16,7 @@ struct btf;
> struct cu;
> struct list_head;
>
> -struct btf_encoder *btf_encoder__new(struct cu *cu, const char *detached_filename, struct btf *base_btf, bool skip_encoding_vars, bool force, bool gen_floats, bool verbose);
> +struct btf_encoder *btf_encoder__new(struct cu *cu, const char *detached_filename, struct btf *base_btf, bool verbose, struct conf_load *conf_load);
> void btf_encoder__delete(struct btf_encoder *encoder);
>
> int btf_encoder__encode(struct btf_encoder *encoder);
> diff --git a/dwarves.h b/dwarves.h
> index eb1a6df..db68161 100644
> --- a/dwarves.h
> +++ b/dwarves.h
> @@ -68,6 +68,9 @@ struct conf_load {
> bool skip_encoding_btf_enum64;
> bool btf_gen_optimized;
> bool skip_encoding_btf_inconsistent_proto;
> + bool skip_encoding_btf_vars;
> + bool btf_gen_floats;
> + bool btf_encode_force;
> uint8_t hashtable_bits;
> uint8_t max_hashtable_bits;
> uint16_t kabi_prefix_len;
> diff --git a/pahole.c b/pahole.c
> index e843999..7a41dc3 100644
> --- a/pahole.c
> +++ b/pahole.c
> @@ -32,13 +32,10 @@
> static struct btf_encoder *btf_encoder;
> static char *detached_btf_filename;
> static bool btf_encode;
> -static bool btf_gen_floats;
> static bool ctf_encode;
> static bool sort_output;
> static bool need_resort;
> static bool first_obj_only;
> -static bool skip_encoding_btf_vars;
> -static bool btf_encode_force;
> static const char *base_btf_file;
>
> static const char *prettify_input_filename;
> @@ -1786,9 +1783,9 @@ static error_t pahole__options_parser(int key, char *arg,
> case ARGP_header_type:
> conf.header_type = arg; break;
> case ARGP_skip_encoding_btf_vars:
> - skip_encoding_btf_vars = true; break;
> + conf_load.skip_encoding_btf_vars = true; break;
> case ARGP_btf_encode_force:
> - btf_encode_force = true; break;
> + conf_load.btf_encode_force = true; break;
> case ARGP_btf_base:
> base_btf_file = arg; break;
> case ARGP_kabi_prefix:
> @@ -1797,9 +1794,9 @@ static error_t pahole__options_parser(int key, char *arg,
> case ARGP_numeric_version:
> print_numeric_version = true; break;
> case ARGP_btf_gen_floats:
> - btf_gen_floats = true; break;
> + conf_load.btf_gen_floats = true; break;
> case ARGP_btf_gen_all:
> - btf_gen_floats = true; break;
> + conf_load.btf_gen_floats = true; break;
> case ARGP_with_flexible_array:
> show_with_flexible_array = true; break;
> case ARGP_prettify_input_filename:
> @@ -3063,8 +3060,8 @@ static enum load_steal_kind pahole_stealer(struct cu *cu,
> * And, it is used by the thread
> * create it.
> */
> - btf_encoder = btf_encoder__new(cu, detached_btf_filename, conf_load->base_btf, skip_encoding_btf_vars,
> - btf_encode_force, btf_gen_floats, global_verbose);
> + btf_encoder = btf_encoder__new(cu, detached_btf_filename, conf_load->base_btf,
> + global_verbose, conf_load);
> if (btf_encoder && thr_data) {
> struct thread_data *thread = thr_data;
>
> @@ -3093,10 +3090,8 @@ static enum load_steal_kind pahole_stealer(struct cu *cu,
> thread->encoder =
> btf_encoder__new(cu, detached_btf_filename,
> NULL,
> - skip_encoding_btf_vars,
> - btf_encode_force,
> - btf_gen_floats,
> - global_verbose);
> + global_verbose,
> + conf_load);
> thread->btf = btf_encoder__btf(thread->encoder);
> }
> encoder = thread->encoder;
> --
> 2.31.1
>
