summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2014-08-14 21:48:32 +0000
committerRene Ladan <rene@FreeBSD.org>2014-08-14 21:48:32 +0000
commitabb2b41ec6e1423147f483a667c189ebdc908535 (patch)
treed388d9f9b91dda05ab0d7e300a11f3844d1dbc08 /www/chromium/files/patch-base__process__process_metrics_freebsd.cc
parent- Fix escaping linker options at configure; this fixes build with SSP (diff)
- Update to 36.0.1985.143 and unforbid
- Use a lot of ports dependencies instead of bundled versions (idea from Gentoo Linux) - Make patches more compatible with OpenBSD - Add note about Python (only relevant for DIY builds) - Install more icons into PREFIX/share/icons/hicolor/XxY/apps/ - Mute mkdir in installation - Install mksnapshot binary - Do not install bundled protoc binary Obtained from: Gentoo, OpenBSD, various contributors in freebsd-chromium@ MFH: 2014Q3 Security: http://www.vuxml.org/freebsd/df7754c0-2294-11e4-b505-000c6e25e3e9.html
Diffstat (limited to 'www/chromium/files/patch-base__process__process_metrics_freebsd.cc')
-rw-r--r--www/chromium/files/patch-base__process__process_metrics_freebsd.cc31
1 files changed, 28 insertions, 3 deletions
diff --git a/www/chromium/files/patch-base__process__process_metrics_freebsd.cc b/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
index 4ca06dac4ca7..f6e0df0aca38 100644
--- a/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
+++ b/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
@@ -1,11 +1,36 @@
---- ./base/process/process_metrics_freebsd.cc.orig 2014-04-30 22:41:43.000000000 +0200
-+++ ./base/process/process_metrics_freebsd.cc 2014-05-04 14:38:46.000000000 +0200
-@@ -10,6 +10,8 @@
+--- ./base/process/process_metrics_freebsd.cc.orig 2014-08-12 21:01:27.000000000 +0200
++++ ./base/process/process_metrics_freebsd.cc 2014-08-13 09:56:56.000000000 +0200
+@@ -10,6 +10,9 @@
#include "base/sys_info.h"
+#include <unistd.h> /* getpagesize() */
++#include <fcntl.h> /* O_RDONLY */
+
namespace base {
ProcessMetrics::ProcessMetrics(ProcessHandle process)
+@@ -119,4 +122,23 @@
+ return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
+ }
+
++int GetNumberOfThreads(ProcessHandle process) {
++ // Taken from FreeBSD top (usr.bin/top/machine.c)
++
++ kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open");
++ if (kd == NULL)
++ return 0;
++
++ struct kinfo_proc* pbase;
++ int nproc;
++ pbase = kvm_getprocs(kd, KERN_PROC_PID, process, &nproc);
++ if (pbase == NULL)
++ return 0;
++
++ if (kvm_close(kd) == -1)
++ return 0;
++
++ return nproc;
++}
++
+ } // namespace base