Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edb13ed4 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools lib bpf: Rename set_private() to set_priv() 



For consistency with class__priv() elsewhere, and with the callback
typedef for clearing those areas (e.g. bpf_map_clear_priv_t).

Acked-by: default avatarWang Nan <wangnan0@huawei.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/n/tip-rnbiyv27ohw8xppsgx0el3xb@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent be834ffb

tools/lib/bpf/libbpf.c

+4 −5
Original line number Diff line number Diff line
@@ -1218,8 +1218,7 @@ bpf_program__next(struct bpf_program *prev, struct bpf_object *obj) 
	return &obj->programs[idx];

}



int bpf_program__set_private(struct bpf_program *prog,

			     void *priv,

int bpf_program__set_priv(struct bpf_program *prog, void *priv,

			  bpf_program_clear_priv_t clear_priv)

{

	if (prog->priv && prog->clear_priv)
@@ -1319,7 +1318,7 @@ const char *bpf_map__name(struct bpf_map *map) 
	return map ? map->name : NULL;

}



int bpf_map__set_private(struct bpf_map *map, void *priv,

int bpf_map__set_priv(struct bpf_map *map, void *priv,

		     bpf_map_clear_priv_t clear_priv)

{

	if (!map)

tools/lib/bpf/libbpf.h

+4 −4
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct bpf_program *bpf_program__next(struct bpf_program *prog, 
typedef void (*bpf_program_clear_priv_t)(struct bpf_program *,

					 void *);



int bpf_program__set_private(struct bpf_program *prog, void *priv,

int bpf_program__set_priv(struct bpf_program *prog, void *priv,

			  bpf_program_clear_priv_t clear_priv);



void *bpf_program__priv(struct bpf_program *prog);
@@ -184,7 +184,7 @@ const struct bpf_map_def *bpf_map__def(struct bpf_map *map); 
const char *bpf_map__name(struct bpf_map *map);



typedef void (*bpf_map_clear_priv_t)(struct bpf_map *, void *);

int bpf_map__set_private(struct bpf_map *map, void *priv,

int bpf_map__set_priv(struct bpf_map *map, void *priv,

		      bpf_map_clear_priv_t clear_priv);

void *bpf_map__priv(struct bpf_map *map);

tools/perf/util/bpf-loader.c

+3 −3
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ config_bpf_program(struct bpf_program *prog) 
	}

	pr_debug("bpf: config '%s' is ok\n", config_str);



	err = bpf_program__set_private(prog, priv, clear_prog_priv);

	err = bpf_program__set_priv(prog, priv, clear_prog_priv);

	if (err) {

		pr_debug("Failed to set priv for program '%s'\n", config_str);

		goto errout;
@@ -910,7 +910,7 @@ bpf_map__add_op(struct bpf_map *map, struct bpf_map_op *op) 
		}

		INIT_LIST_HEAD(&priv->ops_list);



		if (bpf_map__set_private(map, priv, bpf_map_priv__clear)) {

		if (bpf_map__set_priv(map, priv, bpf_map_priv__clear)) {

			free(priv);

			return -BPF_LOADER_ERRNO__INTERNAL;

		}
@@ -1515,7 +1515,7 @@ int bpf__setup_stdout(struct perf_evlist *evlist __maybe_unused) 
			if (!priv)

				return -ENOMEM;



			err = bpf_map__set_private(map, priv, bpf_map_priv__clear);

			err = bpf_map__set_priv(map, priv, bpf_map_priv__clear);

			if (err) {

				bpf_map_priv__clear(map, priv);

				return err;