summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch')
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
index 359ee26e..46f1c9ce 100644
--- a/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
+++ b/recipes-qt/qt5/qtwebengine/0004-chromium-musl-Avoid-mallinfo-APIs-on-non-glibc-linux.patch
@@ -1,4 +1,4 @@
1From f3478cde99da29faebbdb3d13a479b50af9804fd Mon Sep 17 00:00:00 2001 1From 2ddd74e630db38b951697c0b020245c0c83b2316 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 7 Jul 2017 14:09:06 -0700 3Date: Fri, 7 Jul 2017 14:09:06 -0700
4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux 4Subject: [PATCH] chromium: musl: Avoid mallinfo() APIs on non-glibc/linux
@@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 3 files changed, 5 insertions(+), 4 deletions(-) 11 3 files changed, 5 insertions(+), 4 deletions(-)
12 12
13diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc 13diff --git a/chromium/base/process/process_metrics_posix.cc b/chromium/base/process/process_metrics_posix.cc
14index 0eb5c1f..8af7799 100644 14index 73a52d6..4867198 100644
15--- a/chromium/base/process/process_metrics_posix.cc 15--- a/chromium/base/process/process_metrics_posix.cc
16+++ b/chromium/base/process/process_metrics_posix.cc 16+++ b/chromium/base/process/process_metrics_posix.cc
17@@ -94,14 +94,14 @@ size_t ProcessMetrics::GetMallocUsage() { 17@@ -94,14 +94,14 @@ size_t ProcessMetrics::GetMallocUsage() {
@@ -32,18 +32,18 @@ index 0eb5c1f..8af7799 100644
32 return 0; 32 return 0;
33 #endif 33 #endif
34diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc 34diff --git a/chromium/base/trace_event/malloc_dump_provider.cc b/chromium/base/trace_event/malloc_dump_provider.cc
35index f1cc52a..256138d 100644 35index ffd5191..0c9131e 100644
36--- a/chromium/base/trace_event/malloc_dump_provider.cc 36--- a/chromium/base/trace_event/malloc_dump_provider.cc
37+++ b/chromium/base/trace_event/malloc_dump_provider.cc 37+++ b/chromium/base/trace_event/malloc_dump_provider.cc
38@@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() {} 38@@ -197,6 +197,7 @@ MallocDumpProvider::~MallocDumpProvider() = default;
39 // the current process. 39 // the current process.
40 bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, 40 bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
41 ProcessMemoryDump* pmd) { 41 ProcessMemoryDump* pmd) {
42+#if defined(__GLIBC__) 42+#if defined(__GLIBC__)
43 size_t total_virtual_size = 0; 43 {
44 size_t resident_size = 0; 44 base::AutoLock auto_lock(emit_metrics_on_memory_dump_lock_);
45 size_t allocated_objects_size = 0; 45 if (!emit_metrics_on_memory_dump_)
46@@ -316,7 +317,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, 46@@ -322,7 +323,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
47 pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc"); 47 pmd->DumpHeapUsage(metrics_by_context, overhead, "malloc");
48 } 48 }
49 tid_dumping_heap_ = kInvalidThreadId; 49 tid_dumping_heap_ = kInvalidThreadId;