joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "BpfRingBuf.h - implement isEmpty()" into main

Browse source
This commit is contained in:
Maciej Żenczykowski 2023-11-09 23:20:01 +00:00 • committed by Gerrit Code Review
commit ca6cf094b9
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
staticlibs/native/bpf_headers/BpfRingbufTest.cpp
View file

@ -72,12 +72,15 @@ class BpfRingbufTest : public ::testing::Test {
auto result = BpfRingbuf<uint64_t>::Create(mRingbufPath.c_str());
ASSERT_RESULT_OK(result);
EXPECT_TRUE(result.value()->isEmpty());
for (int i = 0; i < n; i++) {
RunProgram();
}
EXPECT_FALSE(result.value()->isEmpty());
EXPECT_THAT(result.value()->ConsumeAll(callback), HasValue(n));
EXPECT_TRUE(result.value()->isEmpty());
EXPECT_EQ(output, TEST_RINGBUF_MAGIC_NUM);
EXPECT_EQ(run_count, n);
}

9
staticlibs/native/bpf_headers/include/bpf/BpfRingbuf.h
View file

@ -39,6 +39,8 @@ class BpfRingbufBase {
mProducerPos = nullptr;
}
bool isEmpty(void);
protected:
// Non-initializing constructor, used by Create.
BpfRingbufBase(size_t value_size) : mValueSize(value_size) {}
@ -197,6 +199,13 @@ inline base::Result<void> BpfRingbufBase::Init(const char* path) {
return {};
}
inline bool BpfRingbufBase::isEmpty(void) {
uint32_t prod_pos = mProducerPos->load(std::memory_order_acquire);
// Only userspace writes to mConsumerPos, so no need to use std::memory_order_acquire
uint64_t cons_pos = mConsumerPos->load(std::memory_order_relaxed);
return (cons_pos & 0xFFFFFFFF) == prod_pos;
}
inline base::Result<int> BpfRingbufBase::ConsumeAll(
const std::function<void(const void*)>& callback) {
int64_t count = 0;