mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/system/sysload.cpp: fix possible divide by zero bug, stats are not guarantueed to be different for each sample.

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fdaa869d7
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2015-02-22 (Sun, 22 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Bas
2015-02-22 20:18:07 +08:00
committed by [CST] Focus
parent c16dc96284
commit 567f875f06
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/system/sysload.cpp
View File

@@ -62,8 +62,11 @@ void *cSysLoad::Run(void *arg)
while (getline(in, line)) { while (getline(in, line)) {
unsigned long _stat_user, _stat_nice, _stat_system, _stat_idle; unsigned long _stat_user, _stat_nice, _stat_system, _stat_idle;
if (4 == sscanf(line.c_str(), "cpu %lu %lu %lu %lu", &_stat_user, &_stat_nice, &_stat_system, &_stat_idle)) { if (4 == sscanf(line.c_str(), "cpu %lu %lu %lu %lu", &_stat_user, &_stat_nice, &_stat_system, &_stat_idle)) {
unsigned long _stat_total = _stat_user + _stat_nice + _stat_system + _stat_idle;
if (stat_total) { if (stat_total) {
unsigned long div = _stat_user + _stat_nice + _stat_system + _stat_idle - stat_total; unsigned long div = _stat_total - stat_total;
if (!div) // prevent division by zero if previous stat_total is equal to new.
break;
caller->data_last = (int)(1000 - 1000 * (_stat_idle - stat_idle) / div); caller->data_last = (int)(1000 - 1000 * (_stat_idle - stat_idle) / div);
if (caller->data_avail < caller->data_size) { if (caller->data_avail < caller->data_size) {
caller->data[caller->data_avail++] = caller->data_last; caller->data[caller->data_avail++] = caller->data_last;
@@ -73,7 +76,7 @@ void *cSysLoad::Run(void *arg)
} }
} }
stat_idle = _stat_idle; stat_idle = _stat_idle;
stat_total = _stat_user + _stat_nice + _stat_system + _stat_idle; stat_total = _stat_total;
break; break;
} }
} }