diff options
author | Joseph Mingrone <jrm@FreeBSD.org> | 2020-10-23 04:29:32 +0000 |
---|---|---|
committer | Joseph Mingrone <jrm@FreeBSD.org> | 2020-10-23 04:29:32 +0000 |
commit | 40c48efc97e1692154f38e01ef1739bbef1e4728 (patch) | |
tree | 80245efab86b6f22f00a53b43568f0fd51edfb14 /www/chromium/files/patch-base_process_process__metrics.h | |
parent | deskutils/ultralist: Update to 1.6.1 (diff) |
www/chromium: Update to version 85.0.4183.121
Submitted by: cem, rene
Obtained from: some patches from OpenBSD port
Diffstat (limited to 'www/chromium/files/patch-base_process_process__metrics.h')
-rw-r--r-- | www/chromium/files/patch-base_process_process__metrics.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 420d563e5b29..2291a54d32e0 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,6 +1,6 @@ ---- base/process/process_metrics.h.orig 2019-10-21 19:06:18 UTC +--- base/process/process_metrics.h.orig 2020-09-08 19:13:57 UTC +++ base/process/process_metrics.h -@@ -41,7 +41,7 @@ namespace base { +@@ -44,7 +44,7 @@ namespace base { // Full declaration is in process_metrics_iocounters.h. struct IoCounters; @@ -9,7 +9,7 @@ // Minor and major page fault counts since the process creation. // Both counts are process-wide, and exclude child processes. // -@@ -51,7 +51,7 @@ struct PageFaultCounts { +@@ -54,7 +54,7 @@ struct PageFaultCounts { int64_t minor; int64_t major; }; @@ -18,7 +18,7 @@ // Convert a POSIX timeval to microseconds. BASE_EXPORT int64_t TimeValToMicroseconds(const struct timeval& tv); -@@ -92,7 +92,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -95,7 +95,7 @@ class BASE_EXPORT ProcessMetrics { // convenience wrapper for CreateProcessMetrics(). static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics(); @@ -27,7 +27,7 @@ // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; -@@ -172,14 +172,14 @@ class BASE_EXPORT ProcessMetrics { +@@ -186,14 +186,14 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // defined(OS_POSIX) @@ -44,7 +44,7 @@ // Returns total memory usage of malloc. size_t GetMallocUsage(); -@@ -191,7 +191,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -205,7 +205,7 @@ class BASE_EXPORT ProcessMetrics { ProcessMetrics(ProcessHandle process, PortProvider* port_provider); #endif // !defined(OS_MACOSX) || defined(OS_IOS) @@ -53,7 +53,7 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if defined(OS_MACOSX) -@@ -220,7 +220,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -234,7 +234,7 @@ class BASE_EXPORT ProcessMetrics { // Number of bytes transferred to/from disk in bytes. uint64_t last_cumulative_disk_usage_ = 0; @@ -62,7 +62,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -271,7 +271,7 @@ BASE_EXPORT size_t GetHandleLimit(); +@@ -285,7 +285,7 @@ BASE_EXPORT size_t GetHandleLimit(); BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_descriptors); #endif // defined(OS_POSIX) @@ -71,7 +71,7 @@ defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. -@@ -305,7 +305,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -319,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int avail_phys = 0; #endif @@ -80,7 +80,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -319,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -333,7 +333,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int swap_free = 0; #endif @@ -89,7 +89,7 @@ defined(OS_FUCHSIA) int buffers = 0; int cached = 0; -@@ -329,7 +329,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -343,7 +343,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { int inactive_file = 0; int dirty = 0; int reclaimable = 0; @@ -98,7 +98,7 @@ // defined(OS_FUCHSIA) #if defined(OS_CHROMEOS) -@@ -355,10 +355,10 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -369,10 +369,10 @@ struct BASE_EXPORT SystemMemoryInfoKB { // Exposed for memory debugging widget. BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo); @@ -111,7 +111,7 @@ // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -431,7 +431,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis +@@ -445,7 +445,7 @@ BASE_EXPORT bool GetSystemDiskInfo(SystemDiskInfo* dis // Returns the amount of time spent in user space since boot across all CPUs. BASE_EXPORT TimeDelta GetUserCpuTimeSinceBoot(); @@ -120,7 +120,7 @@ #if defined(OS_CHROMEOS) // Data from files in directory /sys/block/zram0 about ZRAM usage. -@@ -526,7 +526,7 @@ class BASE_EXPORT SystemMetrics { +@@ -540,7 +540,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; |