commit 08ee54d9d516031b08256f2e79e1983b848ccca8
author Daniele Di Proietto <ddiproietto@google.com> Fri Dec 10 15:14:23 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 10 15:14:23 2021 +0000
tree 46da1c45db7ac15d5f50831dc0eaa197b6619760
parent 7d3180a12cd45d7fb32182a27c6947f57f378e46
parent 2724a3642a951c5c0b45143cc28f77815fb78f7b

Merge "Avoid busy empty loop" am: 2724a3642a

Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1916402

Change-Id: Ib0037793b7099c0606b82d63589e435d80fcaaab

Android.bp

diff --git a/Android.bp b/Android.bp
index 57ce922..42c037f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1907,7 +1907,6 @@
         "-DGOOGLE_PROTOBUF_NO_RTTI",
         "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER",
         "-DHAVE_HIDDEN",
-        "-fno-finite-loops",
     ],
     header_libs: [
         "bionic_libc_platform_headers",

src/profiling/memory/heapprofd_end_to_end_test.cc

diff --git a/src/profiling/memory/heapprofd_end_to_end_test.cc b/src/profiling/memory/heapprofd_end_to_end_test.cc
index 3db57ee..df08bd9 100644
--- a/src/profiling/memory/heapprofd_end_to_end_test.cc
+++ b/src/profiling/memory/heapprofd_end_to_end_test.cc
@@ -312,6 +312,9 @@
 
   // Wait around so we can verify it did't crash.
   for (;;) {
+    // Call sleep, otherwise an empty busy loop is undefined behavior:
+    // http://en.cppreference.com/w/cpp/language/memory_model#Progress_guarantee
+    sleep(1);
   }
 }
 
@@ -351,6 +354,9 @@
 
   // Wait around so we can verify it did't crash.
   for (;;) {
+    // Call sleep, otherwise an empty busy loop is undefined behavior:
+    // http://en.cppreference.com/w/cpp/language/memory_model#Progress_guarantee
+    sleep(1);
   }
 }
 
@@ -387,6 +393,9 @@
 
   // Wait around so we can verify it did't crash.
   for (;;) {
+    // Call sleep, otherwise an empty busy loop is undefined behavior:
+    // http://en.cppreference.com/w/cpp/language/memory_model#Progress_guarantee
+    sleep(1);
   }
 }
 
@@ -493,6 +502,9 @@
 
   // Wait around so we can verify it didn't crash.
   for (;;) {
+    // Call sleep, otherwise an empty busy loop is undefined behavior:
+    // http://en.cppreference.com/w/cpp/language/memory_model#Progress_guarantee
+    sleep(1);
   }
 }
 

tools/gen_android_bp

diff --git a/tools/gen_android_bp b/tools/gen_android_bp
index af7d95d..262da04 100755
--- a/tools/gen_android_bp
+++ b/tools/gen_android_bp
@@ -204,7 +204,6 @@
         ('include_dirs', {'bionic/libc/kernel'}),
     ],
     'perfetto_integrationtests': [
-        ('cflags', {'-fno-finite-loops'}),
         ('test_suites', {'general-tests'}),
         ('test_config', 'PerfettoIntegrationTests.xml'),
     ],