Skip to content

Commit 0927ac9

Browse files
Andreagit97poiana
authored andcommitted
chore(libbpf): bump libbpf to v1.3.0
Signed-off-by: Andrea Terzolo <[email protected]>
1 parent c5c9574 commit 0927ac9

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

cmake/modules/libbpf.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ else()
3333
libbpf
3434
PREFIX "${PROJECT_BINARY_DIR}/libbpf-prefix"
3535
DEPENDS zlib libelf
36-
URL "https://github.com/libbpf/libbpf/archive/refs/tags/v1.2.2.tar.gz"
36+
URL "https://github.com/libbpf/libbpf/archive/refs/tags/v1.3.0.tar.gz"
3737
URL_HASH
38-
"SHA256=32b0c41eabfbbe8e0c8aea784d7495387ff9171b5a338480a8fbaceb9da8d5e5"
38+
"SHA256=11db86acd627e468bc48b7258c1130aba41a12c4d364f78e184fd2f5a913d861"
3939
CONFIGURE_COMMAND mkdir -p build root
4040
BUILD_COMMAND make BUILD_STATIC_ONLY=y OBJDIR=${LIBBPF_BUILD_DIR}/build DESTDIR=${LIBBPF_BUILD_DIR}/root NO_PKG_CONFIG=1 "EXTRA_CFLAGS=-fPIC -I${LIBELF_INCLUDE} -I${ZLIB_INCLUDE}" "LDFLAGS=-Wl,-Bstatic" "EXTRA_LDFLAGS=-L${LIBELF_SRC}/libelf/libelf -L${ZLIB_SRC}" -C ${LIBBPF_SRC}/libbpf/src install install_uapi_headers
4141
INSTALL_COMMAND ""

userspace/libpman/src/ringbuffer.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -297,14 +297,14 @@ static void ringbuf__consume_first_event(struct ring_buffer *rb, struct ppm_evt_
297297
/* If the last consume operation was successful we can push the consumer position */
298298
if(g_state.last_ring_read != -1)
299299
{
300-
struct ring *r = &(rb->rings[g_state.last_ring_read]);
300+
struct ring *r = rb->rings[g_state.last_ring_read];
301301
g_state.cons_pos[g_state.last_ring_read] += g_state.last_event_size;
302302
smp_store_release(r->consumer_pos, g_state.cons_pos[g_state.last_ring_read]);
303303
}
304304

305305
for(uint16_t pos = 0; pos < rb->ring_cnt; pos++)
306306
{
307-
*event_ptr = ringbuf__get_first_ring_event(&rb->rings[pos], pos);
307+
*event_ptr = ringbuf__get_first_ring_event(rb->rings[pos], pos);
308308

309309
/* if NULL search for events in another buffer */
310310
if(*event_ptr == NULL)

userspace/libpman/src/ringbuffer_definitions.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ struct ring
3636
struct ring_buffer
3737
{
3838
struct epoll_event *events;
39-
struct ring *rings;
39+
struct ring **rings;
4040
size_t page_size;
4141
int epoll_fd;
4242
int ring_cnt;

0 commit comments

Comments
 (0)