diff options
author | Andrii Nakryiko <andriin@fb.com> | 2019-02-08 14:19:39 -0500 |
---|---|---|
committer | Alexei Starovoitov <ast@kernel.org> | 2019-02-08 15:04:13 -0500 |
commit | 49b57e0d01db73c99f86d68480fb9b4014bb1060 (patch) | |
tree | a5b61868a7ba083c1828e438a07a33d9add96c6f /tools/lib/bpf | |
parent | ae4ab4b4117d23da49f04a7e1fe82a41e6074eeb (diff) |
tools/bpf: remove btf__get_strings() superseded by raw data API
Now that we have btf__get_raw_data() it's trivial for tests to iterate
over all strings for testing purposes, which eliminates the need for
btf__get_strings() API.
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Acked-by: Yonghong Song <yhs@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/lib/bpf')
-rw-r--r-- | tools/lib/bpf/btf.c | 7 | ||||
-rw-r--r-- | tools/lib/bpf/btf.h | 2 | ||||
-rw-r--r-- | tools/lib/bpf/libbpf.map | 1 |
3 files changed, 0 insertions, 10 deletions
diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index f6b724ed1bdd..6953fedb88ff 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c | |||
@@ -449,13 +449,6 @@ const void *btf__get_raw_data(const struct btf *btf, __u32 *size) | |||
449 | return btf->data; | 449 | return btf->data; |
450 | } | 450 | } |
451 | 451 | ||
452 | void btf__get_strings(const struct btf *btf, const char **strings, | ||
453 | __u32 *str_len) | ||
454 | { | ||
455 | *strings = btf->strings; | ||
456 | *str_len = btf->hdr->str_len; | ||
457 | } | ||
458 | |||
459 | const char *btf__name_by_offset(const struct btf *btf, __u32 offset) | 452 | const char *btf__name_by_offset(const struct btf *btf, __u32 offset) |
460 | { | 453 | { |
461 | if (offset < btf->hdr->str_len) | 454 | if (offset < btf->hdr->str_len) |
diff --git a/tools/lib/bpf/btf.h b/tools/lib/bpf/btf.h index 0306b54d54eb..94bbc249b0f1 100644 --- a/tools/lib/bpf/btf.h +++ b/tools/lib/bpf/btf.h | |||
@@ -67,8 +67,6 @@ LIBBPF_API __s64 btf__resolve_size(const struct btf *btf, __u32 type_id); | |||
67 | LIBBPF_API int btf__resolve_type(const struct btf *btf, __u32 type_id); | 67 | LIBBPF_API int btf__resolve_type(const struct btf *btf, __u32 type_id); |
68 | LIBBPF_API int btf__fd(const struct btf *btf); | 68 | LIBBPF_API int btf__fd(const struct btf *btf); |
69 | LIBBPF_API const void *btf__get_raw_data(const struct btf *btf, __u32 *size); | 69 | LIBBPF_API const void *btf__get_raw_data(const struct btf *btf, __u32 *size); |
70 | LIBBPF_API void btf__get_strings(const struct btf *btf, const char **strings, | ||
71 | __u32 *str_len); | ||
72 | LIBBPF_API const char *btf__name_by_offset(const struct btf *btf, __u32 offset); | 70 | LIBBPF_API const char *btf__name_by_offset(const struct btf *btf, __u32 offset); |
73 | LIBBPF_API int btf__get_from_id(__u32 id, struct btf **btf); | 71 | LIBBPF_API int btf__get_from_id(__u32 id, struct btf **btf); |
74 | LIBBPF_API int btf__get_map_kv_tids(const struct btf *btf, const char *map_name, | 72 | LIBBPF_API int btf__get_map_kv_tids(const struct btf *btf, const char *map_name, |
diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index eb78c7c261d9..5fc8222209f8 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map | |||
@@ -137,7 +137,6 @@ LIBBPF_0.0.2 { | |||
137 | btf__get_map_kv_tids; | 137 | btf__get_map_kv_tids; |
138 | btf__get_nr_types; | 138 | btf__get_nr_types; |
139 | btf__get_raw_data; | 139 | btf__get_raw_data; |
140 | btf__get_strings; | ||
141 | btf__load; | 140 | btf__load; |
142 | btf_ext__free; | 141 | btf_ext__free; |
143 | btf_ext__func_info_rec_size; | 142 | btf_ext__func_info_rec_size; |