Commit 39748db1 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov

bpftool: use preferred setters/getters instead of deprecated ones

Use bpf_program__type() instead of discouraged bpf_program__get_type().
Also switch to bpf_map__set_max_entries() instead of bpf_map__resize().
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20220124194254.2051434-5-andrii@kernel.orgSigned-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 5d98fce8
...@@ -378,7 +378,7 @@ static void codegen_attach_detach(struct bpf_object *obj, const char *obj_name) ...@@ -378,7 +378,7 @@ static void codegen_attach_detach(struct bpf_object *obj, const char *obj_name)
int prog_fd = skel->progs.%2$s.prog_fd; \n\ int prog_fd = skel->progs.%2$s.prog_fd; \n\
", obj_name, bpf_program__name(prog)); ", obj_name, bpf_program__name(prog));
switch (bpf_program__get_type(prog)) { switch (bpf_program__type(prog)) {
case BPF_PROG_TYPE_RAW_TRACEPOINT: case BPF_PROG_TYPE_RAW_TRACEPOINT:
tp_name = strchr(bpf_program__section_name(prog), '/') + 1; tp_name = strchr(bpf_program__section_name(prog), '/') + 1;
printf("\tint fd = bpf_raw_tracepoint_open(\"%s\", prog_fd);\n", tp_name); printf("\tint fd = bpf_raw_tracepoint_open(\"%s\", prog_fd);\n", tp_name);
......
...@@ -2283,10 +2283,10 @@ static int do_profile(int argc, char **argv) ...@@ -2283,10 +2283,10 @@ static int do_profile(int argc, char **argv)
profile_obj->rodata->num_metric = num_metric; profile_obj->rodata->num_metric = num_metric;
/* adjust map sizes */ /* adjust map sizes */
bpf_map__resize(profile_obj->maps.events, num_metric * num_cpu); bpf_map__set_max_entries(profile_obj->maps.events, num_metric * num_cpu);
bpf_map__resize(profile_obj->maps.fentry_readings, num_metric); bpf_map__set_max_entries(profile_obj->maps.fentry_readings, num_metric);
bpf_map__resize(profile_obj->maps.accum_readings, num_metric); bpf_map__set_max_entries(profile_obj->maps.accum_readings, num_metric);
bpf_map__resize(profile_obj->maps.counts, 1); bpf_map__set_max_entries(profile_obj->maps.counts, 1);
/* change target name */ /* change target name */
profile_tgt_name = profile_target_name(profile_tgt_fd); profile_tgt_name = profile_target_name(profile_tgt_fd);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment