commit a9a6ec3c7b79aa3df3031db5bcf598e507148ea6
author Maciej Żenczykowski <maze@google.com> Thu Jun 18 12:22:08 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 18 12:22:08 2020 +0000
tree 8f3b2de32883f9fe1f73a44f6c732683ae146a8c
parent 246e3d28f77ec1f11fdd239d022a2048bc321fef
parent b1b3cfda56509dbeba77aa11a75d83dea87667b4

waitForProgsLoaded() - reduce log spaminess am: 2090e3449d am: b1b3cfda56

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1336224

Change-Id: I88b5c5a62f4e5d146ca08e9878c18aca1e68a203

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index 5a65c1b..da6a109 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -665,12 +665,21 @@
     return ret;
 }
 
+static bool waitSecondsForProgsLoaded(int seconds) {
+    bool ok =
+            android::base::WaitForProperty("bpf.progs_loaded", "1", std::chrono::seconds(seconds));
+    if (!ok) ALOGW("Waited %ds for bpf.progs_loaded, still waiting...", seconds);
+    return ok;
+}
+
 void waitForProgsLoaded() {
     if (!android::bpf::isBpfSupported()) return;
 
-    while (!android::base::WaitForProperty("bpf.progs_loaded", "1", std::chrono::seconds(5))) {
-        ALOGW("Waited 5s for bpf.progs_loaded, still waiting...");
-    }
+    if (waitSecondsForProgsLoaded(5)) return;
+    if (waitSecondsForProgsLoaded(10)) return;
+    if (waitSecondsForProgsLoaded(20)) return;
+    while (!waitSecondsForProgsLoaded(60))
+        ;  // loop until success
 }
 
 }  // namespace bpf