commit a9c0e2b0a61932cc706f57d504ea289d308e2af8
author Christopher Ferris <cferris@google.com> Thu May 18 21:03:43 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 18 21:03:43 2023 +0000
tree 8dc5822ac0405879b52affc045daa2983ac4865e
parent d4a6b44c77ba87cda569a5b29ea96ba0894bc02e
parent 50f3478661d045652120f2edcd8f503298ad666a

Merge "Use M_PURGE_ALL instead M_PURGE."

src/base/utils.cc

diff --git a/src/base/utils.cc b/src/base/utils.cc
index 198daa9..82386fa 100644
--- a/src/base/utils.cc
+++ b/src/base/utils.cc
@@ -55,9 +55,16 @@
 #define PERFETTO_M_PURGE -101
 #endif  // M_PURGE
 
+#ifdef M_PURGE_ALL
+#define PERFETTO_M_PURGE_ALL M_PURGE_ALL
+#else
+// Only available in in-tree builds and on newer SDKs.
+#define PERFETTO_M_PURGE_ALL -104
+#endif  // M_PURGE
+
 namespace {
 extern "C" {
-using MalloptType = void (*)(int, int);
+using MalloptType = int (*)(int, int);
 }
 }  // namespace
 #endif  // OS_ANDROID
@@ -140,7 +147,9 @@
       reinterpret_cast<MalloptType>(dlsym(RTLD_DEFAULT, "mallopt"));
   if (!mallopt_fn)
     return;
-  mallopt_fn(PERFETTO_M_PURGE, 0);
+  if (mallopt_fn(PERFETTO_M_PURGE_ALL, 0) == 0) {
+    mallopt_fn(PERFETTO_M_PURGE, 0);
+  }
 #endif
 }