Skip to content

Commit e69e41c

Browse files
christycyleeNobody
authored andcommitted
libbpf: deprecate bpf_object__open_buffer() API
Deprecate bpf_object__open_buffer() API in favor of bpf_object__open_mem() instead. Signed-off-by: Christy Lee <christylee@fb.com>
1 parent 9ff1634 commit e69e41c

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

tools/lib/bpf/libbpf.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ bpf_object__open_mem(const void *obj_buf, size_t obj_buf_sz,
181181
const struct bpf_object_open_opts *opts);
182182

183183
/* deprecated bpf_object__open variants */
184+
LIBBPF_DEPRECATED_SINCE(0, 8, "use bpf_object__open_mem() instead")
184185
LIBBPF_API struct bpf_object *
185186
bpf_object__open_buffer(const void *obj_buf, size_t obj_buf_sz,
186187
const char *name);

tools/perf/tests/llvm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ static int test__bpf_parsing(void *obj_buf, size_t obj_buf_sz)
1313
{
1414
struct bpf_object *obj;
1515

16-
obj = bpf_object__open_buffer(obj_buf, obj_buf_sz, NULL);
16+
obj = bpf_object__open_mem(obj_buf, obj_buf_sz, NULL);
1717
if (libbpf_get_error(obj))
1818
return TEST_FAIL;
1919
bpf_object__close(obj);

tools/perf/util/bpf-loader.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ bpf__prepare_load_buffer(void *obj_buf, size_t obj_buf_sz, const char *name)
7272

7373
struct bpf_object *bpf__prepare_load(const char *filename, bool source)
7474
{
75+
DECLARE_LIBBPF_OPTS(bpf_object_open_opts, opts,
76+
.object_name = filename
77+
);
7578
struct bpf_object *obj;
7679

7780
if (!libbpf_initialized) {
@@ -94,7 +97,7 @@ struct bpf_object *bpf__prepare_load(const char *filename, bool source)
9497
return ERR_PTR(-BPF_LOADER_ERRNO__COMPILE);
9598
} else
9699
pr_debug("bpf: successful builtin compilation\n");
97-
obj = bpf_object__open_buffer(obj_buf, obj_buf_sz, filename);
100+
obj = bpf_object__open_mem(obj_buf, obj_buf_sz, &opts);
98101

99102
if (!IS_ERR_OR_NULL(obj) && llvm_param.dump_obj)
100103
llvm__dump_obj(filename, obj_buf, obj_buf_sz);

0 commit comments

Comments
 (0)