github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-21 09:58:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sure p->last_jiffies doesn't change after sanity checking

Browse Source 
See 821525e5032bf56912ecce5f2aa650c57ea89ea2 and #7066
This commit is contained in:
Mahmoud Al-Qudsi 2020-05-30 16:05:29 -05:00
parent 821525e503
commit 7e61205294
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/builtin_jobs.cpp
View File

@ -40,12 +40,13 @@ static int cpu_use(const job_t *j) {
double t2 = 1000000.0 * t.tv_sec + t.tv_usec;
// Check for a race condition that can cause negative CPU usage to be reported (#7066)
if (t2 < t1 || jiffies < p->last_jiffies) {
unsigned long cached_last_jiffies = p->last_jiffies;
if (t2 < t1 || jiffies < cached_last_jiffies) {
continue;
}
// std::fwprintf( stderr, L"t1 %f t2 %f p1 %d p2 %d\n", t1, t2, jiffies, p->last_jiffies );
u += (static_cast<double>(jiffies - p->last_jiffies)) / (t2 - t1);
u += (static_cast<double>(jiffies - cached_last_jiffies)) / (t2 - t1);
}
return u * 1000000;
}