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

Merge remote-tracking branch 'check/cst-next'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 22dd798325
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-25 (Wed, 25 Feb 2015)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-02-25 21:20:22 +01:00
parent 3ce8390843 f62fbd7b50
commit f5d3bb2d9f
8 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/flashtool.cpp
View File

@@ -165,7 +165,7 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra
int globalProgressBegin = 0;
if(g_settings.epg_save)
CNeutrinoApp::getInstance()->saveEpg(false);
CNeutrinoApp::getInstance()->saveEpg(true);
if(statusViewer)
statusViewer->showLocalStatus(0);

7
src/system/sysload.cpp
View File

@@ -62,8 +62,11 @@ void *cSysLoad::Run(void *arg)
while (getline(in, line)) {
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)) {
unsigned long _stat_total = _stat_user + _stat_nice + _stat_system + _stat_idle;
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);
if (caller->data_avail < caller->data_size) {
caller->data[caller->data_avail++] = caller->data_last;
@@ -73,7 +76,7 @@ void *cSysLoad::Run(void *arg)
}
}
stat_idle = _stat_idle;
stat_total = _stat_user + _stat_nice + _stat_system + _stat_idle;
stat_total = _stat_total;
break;
}
}