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_internal__linux.cc | |
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_internal__linux.cc')
-rw-r--r-- | www/chromium/files/patch-base_process_internal__linux.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/www/chromium/files/patch-base_process_internal__linux.cc b/www/chromium/files/patch-base_process_internal__linux.cc index abfff7cd44ce..5c981ae62d2b 100644 --- a/www/chromium/files/patch-base_process_internal__linux.cc +++ b/www/chromium/files/patch-base_process_internal__linux.cc @@ -1,6 +1,6 @@ ---- base/process/internal_linux.cc.orig 2020-03-16 18:39:41 UTC +--- base/process/internal_linux.cc.orig 2020-09-08 19:13:57 UTC +++ base/process/internal_linux.cc -@@ -29,7 +29,11 @@ namespace internal { +@@ -30,7 +30,11 @@ namespace internal { const char kProcDir[] = "/proc"; @@ -12,7 +12,7 @@ FilePath GetProcPidDir(pid_t pid) { return FilePath(kProcDir).Append(NumberToString(pid)); -@@ -64,6 +68,7 @@ bool ReadProcFile(const FilePath& file, std::string* b +@@ -66,6 +70,7 @@ bool ReadProcFile(const FilePath& file, std::string* b DLOG(WARNING) << "Failed to read " << file.MaybeAsASCII(); return false; } @@ -20,7 +20,7 @@ return !buffer->empty(); } -@@ -79,6 +84,22 @@ bool ParseProcStats(const std::string& stats_data, +@@ -81,6 +86,22 @@ bool ParseProcStats(const std::string& stats_data, if (stats_data.empty()) return false; @@ -43,7 +43,7 @@ // The stat file is formatted as: // pid (process name) data1 data2 .... dataN // Look for the closing paren by scanning backwards, to avoid being fooled by -@@ -108,6 +129,7 @@ bool ParseProcStats(const std::string& stats_data, +@@ -110,6 +131,7 @@ bool ParseProcStats(const std::string& stats_data, base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); for (const auto& i : other_stats) proc_stats->push_back(i); @@ -51,7 +51,7 @@ return true; } -@@ -155,7 +177,11 @@ int64_t ReadProcStatsAndGetFieldAsInt64(pid_t pid, Pro +@@ -157,7 +179,11 @@ int64_t ReadProcStatsAndGetFieldAsInt64(pid_t pid, Pro } int64_t ReadProcSelfStatsAndGetFieldAsInt64(ProcStatsFields field_num) { @@ -63,7 +63,7 @@ return ReadStatFileAndGetFieldAsInt64(stat_file, field_num); } -@@ -171,6 +197,9 @@ size_t ReadProcStatsAndGetFieldAsSizeT(pid_t pid, +@@ -173,6 +199,9 @@ size_t ReadProcStatsAndGetFieldAsSizeT(pid_t pid, } Time GetBootTime() { @@ -73,7 +73,7 @@ FilePath path("/proc/stat"); std::string contents; if (!ReadProcFile(path, &contents)) -@@ -184,9 +213,13 @@ Time GetBootTime() { +@@ -186,9 +215,13 @@ Time GetBootTime() { if (!StringToInt(btime_it->second, &btime)) return Time(); return Time::FromTimeT(btime); @@ -87,7 +87,7 @@ FilePath path("/proc/stat"); std::string contents; if (!ReadProcFile(path, &contents)) -@@ -210,6 +243,7 @@ TimeDelta GetUserCpuTimeSinceBoot() { +@@ -212,6 +245,7 @@ TimeDelta GetUserCpuTimeSinceBoot() { return TimeDelta(); return ClockTicksToTimeDelta(user + nice); |