diff options
| author | Steven Moreland <smoreland@google.com> | 2020-01-10 15:38:03 -0800 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2020-01-10 15:38:03 -0800 |
| commit | e234902f4e4c493c3eeb8daf24d844334ed6b699 (patch) | |
| tree | 1e84b52a9cc5d64bb6e844372e99b78575168567 /server/main.cpp | |
| parent | b601c04f77924d09ffc377ec7c07a3c7e311b27a (diff) | |
| download | platform_system_netd-e234902f4e4c493c3eeb8daf24d844334ed6b699.tar.gz platform_system_netd-e234902f4e4c493c3eeb8daf24d844334ed6b699.tar.bz2 platform_system_netd-e234902f4e4c493c3eeb8daf24d844334ed6b699.zip | |
Use libbpf_android to wait for bpf.
Since it would be annoying to copy these four lines of waiting logic
everywhere.
Bug: 140330870
Test: boot & use network
Change-Id: I68f68d889dfc4e165b7214e7c17dcc86a6b02ea3
Diffstat (limited to 'server/main.cpp')
| -rw-r--r-- | server/main.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/server/main.cpp b/server/main.cpp index b3408bedb..0a86b0a22 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -32,9 +32,9 @@ #include "log/log.h" -#include <android-base/properties.h> #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> +#include <libbpf_android.h> #include <netdutils/Stopwatch.h> #include "Controllers.h" @@ -119,10 +119,7 @@ int main() { } // Make sure BPF programs are loaded before doing anything - while (!android::base::WaitForProperty("bpf.progs_loaded", "1", - std::chrono::seconds(5))) { - ALOGD("netd waited 5s for bpf.progs_loaded, still waiting..."); - } + android::bpf::waitForProgsLoaded(); NetlinkManager *nm = NetlinkManager::Instance(); if (nm == nullptr) { |