tor-browser

commit 9df584253d6c16afc69609848fb4ca227d9357d3
parent 425f9ec4676cda1d3ffc49bb86adb9d94aa63380
Author: Nika Layzell <nika@thelayzells.com>
Date:   Tue, 16 Dec 2025 04:53:46 +0000

Bug 1927599 - Part 1: Disable nsMemoryInfoDumper on iOS, r=glandium

This depended on the libevent event loop, which is not going to work in iOS content processes due to the sandbox blocking the kevent syscall.

Differential Revision: https://phabricator.services.mozilla.com/D227101

Diffstat:
M
xpcom/base/nsDumpUtils.cpp
 | 
4
++--
M
xpcom/base/nsDumpUtils.h
 | 
4
++--
M
xpcom/base/nsMemoryInfoDumper.cpp
 | 
2
+-

3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/xpcom/base/nsDumpUtils.cpp b/xpcom/base/nsDumpUtils.cpp
@@ -14,7 +14,7 @@
 #include "mozilla/ClearOnShutdown.h"
 #include "SpecialSystemDirectory.h"
 
-#ifdef XP_UNIX  // {
+#if defined(XP_UNIX) && !defined(XP_IOS)  // {
 #  include "mozilla/Preferences.h"
 #  include <fcntl.h>
 #  include <unistd.h>
@@ -393,7 +393,7 @@ void FifoWatcher::OnFileCanReadWithoutBlocking(int aFd) {
   LOG("Got unexpected value from fifo; ignoring it.");
 }
 
-#endif  // XP_UNIX }
+#endif  // XP_UNIX && !XP_IOS }
 
 // In Android case, this function will open a file named aFilename under
 // /data/local/tmp/"aFoldername".
diff --git a/xpcom/base/nsDumpUtils.h b/xpcom/base/nsDumpUtils.h
@@ -27,7 +27,7 @@
 #  define LOG(...)
 #endif
 
-#ifdef XP_UNIX  // {
+#if defined(XP_UNIX) && !defined(XP_IOS)  // {
 
 /**
  * Abstract base class for something which watches an fd and takes action when
@@ -163,7 +163,7 @@ class SignalPipeWatcher : public FdWatcher {
   SignalInfoArray mSignalInfo MOZ_GUARDED_BY(mSignalInfoLock);
 };
 
-#endif  // XP_UNIX }
+#endif  // XP_UNIX && !XP_IOS }
 
 class nsDumpUtils {
  public:
diff --git a/xpcom/base/nsMemoryInfoDumper.cpp b/xpcom/base/nsMemoryInfoDumper.cpp
@@ -31,7 +31,7 @@
 #  include <unistd.h>
 #endif
 
-#ifdef XP_UNIX
+#if defined(XP_UNIX) && !defined(XP_IOS)
 #  define MOZ_SUPPORTS_FIFO 1
 #endif