Revert "memevents: Create new API to verify listener state"
This reverts commit 4e99824a65a8068eaef87a75e07a8b3ec78b0a8a.
Reason for revert: Intermediate CLs of b/330433910
Change-Id: Ib39ba19d4333575cdb14518ef84b18d32a91d6da
diff --git a/libmemevents/include/memevents/memevents.h b/libmemevents/include/memevents/memevents.h
index 9282ab9..e17270c 100644
--- a/libmemevents/include/memevents/memevents.h
+++ b/libmemevents/include/memevents/memevents.h
@@ -47,28 +47,10 @@
class MemEventListener final {
public:
- /*
- * MemEventListener will `std::abort` when failing to initialize
- * the bpf ring buffer manager, on a bpf-rb supported kernel.
- *
- * If running on a kernel that doesn't support bpf-rb, the listener
- * will initialize in an invalid state, preventing it from making
- * any actions/calls.
- * To check if the listener initialized correctly use `ok()`.
- */
MemEventListener(MemEventClient client, bool attachTpForTests = false);
~MemEventListener();
/**
- * Check if the listener was initialized correctly, with a valid bpf
- * ring buffer manager on a bpf-rb supported kernel.
- *
- * @return true if initialized with a valid bpf rb manager, false
- * otherwise.
- */
- bool ok();
-
- /**
* Registers the requested memory event to the listener.
*
* @param event_type Memory event type to listen for.
diff --git a/libmemevents/memevents.cpp b/libmemevents/memevents.cpp
index 5aad594..eefbd46 100644
--- a/libmemevents/memevents.cpp
+++ b/libmemevents/memevents.cpp
@@ -43,8 +43,6 @@
static const std::string kClientRingBuffers[MemEventClient::NR_CLIENTS] = {
MEM_EVENTS_AMS_RB, MEM_EVENTS_LMKD_RB, MEM_EVENTS_TEST_RB};
-static const bool isBpfRingBufferSupported = isAtLeastKernelVersion(5, 8, 0);
-
class MemBpfRingbuf : public BpfRingbufBase {
public:
using EventCallback = std::function<void(const mem_event_t&)>;
@@ -176,10 +174,9 @@
* throughout the public APIs to prevent the listener to do any actions.
*/
memBpfRb.reset(nullptr);
- if (isBpfRingBufferSupported) {
+ if (isAtLeastKernelVersion(5, 8, 0)) {
LOG(ERROR) << "memevent listener MemBpfRingbuf init failed: "
<< status.error().message();
- std::abort();
} else {
LOG(ERROR) << "memevent listener failed to initialize, not supported kernel";
}
@@ -190,12 +187,8 @@
deregisterAllEvents();
}
-bool MemEventListener::ok() {
- return isBpfRingBufferSupported && memBpfRb;
-}
-
bool MemEventListener::registerEvent(mem_event_type_t event_type) {
- if (!ok()) {
+ if (!memBpfRb) {
LOG(ERROR) << "memevent register failed, failure to initialize";
return false;
}
@@ -254,7 +247,7 @@
}
bool MemEventListener::listen(int timeout_ms) {
- if (!ok()) {
+ if (!memBpfRb) {
LOG(ERROR) << "memevent listen failed, failure to initialize";
return false;
}
@@ -267,7 +260,7 @@
}
bool MemEventListener::deregisterEvent(mem_event_type_t event_type) {
- if (!ok()) {
+ if (!memBpfRb) {
LOG(ERROR) << "memevent failed to deregister, failure to initialize";
return false;
}
@@ -308,7 +301,7 @@
}
void MemEventListener::deregisterAllEvents() {
- if (!ok()) {
+ if (!memBpfRb) {
LOG(ERROR) << "memevent deregister all events failed, failure to initialize";
return;
}
@@ -319,7 +312,7 @@
}
bool MemEventListener::getMemEvents(std::vector<mem_event_t>& mem_events) {
- if (!ok()) {
+ if (!memBpfRb) {
LOG(ERROR) << "memevent failed getting memory events, failure to initialize";
return false;
}
@@ -337,7 +330,7 @@
}
int MemEventListener::getRingBufferFd() {
- if (!ok()) {
+ if (!memBpfRb) {
LOG(ERROR) << "memevent failed getting ring-buffer fd, failure to initialize";
return -1;
}
diff --git a/libmemevents/memevents_test.cpp b/libmemevents/memevents_test.cpp
index b846e38..611912c 100644
--- a/libmemevents/memevents_test.cpp
+++ b/libmemevents/memevents_test.cpp
@@ -69,10 +69,6 @@
}
}
- void SetUp() override {
- ASSERT_FALSE(memevent_listener.ok()) << "BPF ring buffer manager shouldn't initialize";
- }
-
void TearDown() override { memevent_listener.deregisterAllEvents(); }
};
@@ -194,11 +190,6 @@
}
}
- void SetUp() override {
- ASSERT_TRUE(memevent_listener.ok())
- << "Memory listener failed to initialize bpf ring buffer manager";
- }
-
void TearDown() override { memevent_listener.deregisterAllEvents(); }
};
@@ -235,7 +226,6 @@
listener = std::make_unique<MemEventListener>(client);
ASSERT_TRUE(listener) << "MemEventListener failed to initialize with valid client value: "
<< client;
- ASSERT_TRUE(listener->ok()) << "MemEventListener failed to initialize with bpf rb manager";
}
}
@@ -406,10 +396,6 @@
}
}
- void SetUp() override {
- ASSERT_TRUE(mem_listener.ok()) << "Listener failed to initialize bpf rb manager";
- }
-
void TearDown() override { mem_listener.deregisterAllEvents(); }
/*
@@ -601,10 +587,6 @@
protected:
MemEventListener mem_listener = MemEventListener(mem_test_client, true);
- void SetUp() override {
- ASSERT_TRUE(mem_listener.ok()) << "listener failed to initialize bpf ring buffer manager";
- }
-
void TearDown() override { mem_listener.deregisterAllEvents(); }
/**
