From 077c63084488ac38c1c44e8cdaa9c33086f0a649 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 27 Apr 2018 13:56:47 +0200 Subject: Remove support for making jemalloc4 the default memory allocator. --- xpcom/base/nsMemoryReporterManager.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'xpcom/base') diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp index aa3d74dfd..616eefbdc 100644 --- a/xpcom/base/nsMemoryReporterManager.cpp +++ b/xpcom/base/nsMemoryReporterManager.cpp @@ -439,12 +439,10 @@ static MOZ_MUST_USE nsresult ResidentDistinguishedAmountHelper(int64_t* aN, bool aDoPurge) { #ifdef HAVE_JEMALLOC_STATS -#ifndef MOZ_JEMALLOC4 if (aDoPurge) { Telemetry::AutoTimer timer; jemalloc_purge_freed_pages(); } -#endif #endif task_basic_info ti; -- cgit v1.2.3 From 4613b91ecac2745252c40be64e73de5ff920b02b Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 3 May 2018 01:24:31 +0200 Subject: Remove sandbox ductwork conditional code. --- xpcom/base/nsSystemInfo.cpp | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'xpcom/base') diff --git a/xpcom/base/nsSystemInfo.cpp b/xpcom/base/nsSystemInfo.cpp index f6d9fd5ad..a72dd3826 100644 --- a/xpcom/base/nsSystemInfo.cpp +++ b/xpcom/base/nsSystemInfo.cpp @@ -66,10 +66,6 @@ NS_EXPORT int android_sdk_version; #include #endif -#if defined(XP_LINUX) && defined(MOZ_SANDBOX) -#include "mozilla/SandboxInfo.h" -#endif - // Slot for NS_InitXPCOM2 to pass information to nsSystemInfo::Init. // Only set to nonzero (potentially) if XP_UNIX. On such systems, the // system call to discover the appropriate value is not thread-safe, @@ -789,29 +785,6 @@ nsSystemInfo::Init() } #endif -#if defined(XP_LINUX) && defined(MOZ_SANDBOX) - SandboxInfo sandInfo = SandboxInfo::Get(); - - SetPropertyAsBool(NS_LITERAL_STRING("hasSeccompBPF"), - sandInfo.Test(SandboxInfo::kHasSeccompBPF)); - SetPropertyAsBool(NS_LITERAL_STRING("hasSeccompTSync"), - sandInfo.Test(SandboxInfo::kHasSeccompTSync)); - SetPropertyAsBool(NS_LITERAL_STRING("hasUserNamespaces"), - sandInfo.Test(SandboxInfo::kHasUserNamespaces)); - SetPropertyAsBool(NS_LITERAL_STRING("hasPrivilegedUserNamespaces"), - sandInfo.Test(SandboxInfo::kHasPrivilegedUserNamespaces)); - - if (sandInfo.Test(SandboxInfo::kEnabledForContent)) { - SetPropertyAsBool(NS_LITERAL_STRING("canSandboxContent"), - sandInfo.CanSandboxContent()); - } - - if (sandInfo.Test(SandboxInfo::kEnabledForMedia)) { - SetPropertyAsBool(NS_LITERAL_STRING("canSandboxMedia"), - sandInfo.CanSandboxMedia()); - } -#endif // XP_LINUX && MOZ_SANDBOX - return NS_OK; } -- cgit v1.2.3 From 6571d2ceb42930dab01677ef0e95e732d5076fb8 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sat, 12 May 2018 16:19:33 +0200 Subject: Remove MOZ_WIDGET_GONK [1/2] Tag #288 --- xpcom/base/nsMemoryReporterManager.cpp | 4 ---- xpcom/base/nsSystemInfo.cpp | 44 ---------------------------------- 2 files changed, 48 deletions(-) (limited to 'xpcom/base') diff --git a/xpcom/base/nsMemoryReporterManager.cpp b/xpcom/base/nsMemoryReporterManager.cpp index 616eefbdc..7c62e2af5 100644 --- a/xpcom/base/nsMemoryReporterManager.cpp +++ b/xpcom/base/nsMemoryReporterManager.cpp @@ -1596,10 +1596,6 @@ nsMemoryReporterManager::~nsMemoryReporterManager() NS_ASSERTION(!mSavedWeakReporters, "failed to restore weak reporters"); } -#ifdef MOZ_WIDGET_GONK -#define DEBUG_CHILD_PROCESS_MEMORY_REPORTING 1 -#endif - #ifdef DEBUG_CHILD_PROCESS_MEMORY_REPORTING #define MEMORY_REPORTING_LOG(format, ...) \ printf_stderr("++++ MEMORY REPORTING: " format, ##__VA_ARGS__); diff --git a/xpcom/base/nsSystemInfo.cpp b/xpcom/base/nsSystemInfo.cpp index a72dd3826..4a92a2eb4 100644 --- a/xpcom/base/nsSystemInfo.cpp +++ b/xpcom/base/nsSystemInfo.cpp @@ -50,12 +50,6 @@ #include "mozilla/dom/ContentChild.h" #endif -#ifdef MOZ_WIDGET_GONK -#include -#include "mozilla/Preferences.h" -#include "nsPrintfCString.h" -#endif - #ifdef ANDROID extern "C" { NS_EXPORT int android_sdk_version; @@ -747,44 +741,6 @@ nsSystemInfo::Init() } #endif -#ifdef MOZ_WIDGET_GONK - char sdk[PROP_VALUE_MAX]; - if (__system_property_get("ro.build.version.sdk", sdk)) { - android_sdk_version = atoi(sdk); - SetPropertyAsInt32(NS_LITERAL_STRING("sdk_version"), android_sdk_version); - - SetPropertyAsACString(NS_LITERAL_STRING("secondaryLibrary"), - nsPrintfCString("SDK %u", android_sdk_version)); - } - - char characteristics[PROP_VALUE_MAX]; - if (__system_property_get("ro.build.characteristics", characteristics)) { - if (!strcmp(characteristics, "tablet")) { - SetPropertyAsBool(NS_LITERAL_STRING("tablet"), true); - } else if (!strcmp(characteristics, "tv")) { - SetPropertyAsBool(NS_LITERAL_STRING("tv"), true); - } - } - - nsAutoString str; - rv = GetPropertyAsAString(NS_LITERAL_STRING("version"), str); - if (NS_SUCCEEDED(rv)) { - SetPropertyAsAString(NS_LITERAL_STRING("kernel_version"), str); - } - - const nsAdoptingString& b2g_os_name = - mozilla::Preferences::GetString("b2g.osName"); - if (b2g_os_name) { - SetPropertyAsAString(NS_LITERAL_STRING("name"), b2g_os_name); - } - - const nsAdoptingString& b2g_version = - mozilla::Preferences::GetString("b2g.version"); - if (b2g_version) { - SetPropertyAsAString(NS_LITERAL_STRING("version"), b2g_version); - } -#endif - return NS_OK; } -- cgit v1.2.3