benkyd/universal-system-monitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimised cpu class a little

Browse Source
This commit is contained in:
Ben
2018-12-13 10:02:50 +00:00
parent 6fd299c4cd
commit 92de201651
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
TODO
View File

@@ -8,7 +8,8 @@ x -> complete
[ ] [ ]
**TODO** **TODO**
[ ] API [ ] Optimise cpu.cpp in /platform/linux/monitoring
[ ] System informaton API
[x] CPU header [x] CPU header
[x] Linux implimentation [x] Linux implimentation
[ ] Windows implimentation [ ] Windows implimentation

BIN
bin/resource-monitor
View File

Binary file not shown.

39
platform/linux/monitoring/cpu.cpp
View File

@@ -14,6 +14,25 @@ CPU::CPU() {
this->m_isPolling = false; this->m_isPolling = false;
this->cpuStat = new CPUStat(); this->cpuStat = new CPUStat();
this->cpuStat->HARDWARE_THREADS = this->CPU_HARDWARE_THREADS; this->cpuStat->HARDWARE_THREADS = this->CPU_HARDWARE_THREADS;
std::vector<std::string> lscpu = execcommand("lscpu");
for (unsigned int i = 0; i < lscpu.size(); i++) {
std::regex architecture("Architecture.*?((?:[a-z][a-z0-9_]*))");
std::regex maxMHz ("CPU max MHz.*?((?:[0-9].*))");
std::regex minMHz ("CPU min MHz.*?((?:[0-9].*))");
std::regex MHz ("CPU MHz.*?((?:[0-9].*))");
std::smatch m;
if (std::regex_search(lscpu[i], m, architecture)) {
this->cpuStat->ARCHITECTURE = m[1].str();
} else if (std::regex_search(lscpu[i], m, maxMHz)) {
this->cpuStat->MAX_FREQ = std::stod(m[1].str());
} else if (std::regex_search(lscpu[i], m, minMHz)) {
this->cpuStat->MIN_FREQ = std::stod(m[1].str());
} else if (std::regex_search(lscpu[i], m, MHz)) {
this->cpuStat->FREQ = std::stod(m[1].str());
}
}
std::cout << "Number of hardware threads supported: " << CPU_HARDWARE_THREADS << std::endl; std::cout << "Number of hardware threads supported: " << CPU_HARDWARE_THREADS << std::endl;
} }
@@ -96,25 +115,13 @@ void CPU::CPU_POLL(CPU* cpu) {
std::vector<std::string> lscpu = execcommand("lscpu"); std::vector<std::string> lscpu = execcommand("lscpu");
for (unsigned int i = 0; i < lscpu.size(); i++) { for (unsigned int i = 0; i < lscpu.size(); i++) {
std::regex architecture("Architecture.*?((?:[a-z][a-z0-9_]*))"); std::regex MHz("CPU MHz.*?((?:[0-9].*))");
std::regex maxMHz ("CPU max MHz.*?((?:[0-9].*))");
std::regex minMHz ("CPU min MHz.*?((?:[0-9].*))");
std::regex MHz ("CPU MHz.*?((?:[0-9].*))");
std::smatch m; std::smatch m;
if (std::regex_search(lscpu[i], m, MHz)) {
cpu->CPU_Mutex.lock(); cpu->CPU_Mutex.lock();
if (std::regex_search(lscpu[i], m, architecture)) {
cpu->cpuStat->ARCHITECTURE = m[1].str();
} else if (std::regex_search(lscpu[i], m, maxMHz)) {
cpu->cpuStat->MAX_FREQ = std::stod(m[1].str());
} else if (std::regex_search(lscpu[i], m, minMHz)) {
cpu->cpuStat->MIN_FREQ = std::stod(m[1].str());
} else if (std::regex_search(lscpu[i], m, MHz)) {
cpu->cpuStat->FREQ = std::stod(m[1].str()); cpu->cpuStat->FREQ = std::stod(m[1].str());
cpu->CPU_Mutex.unlock();
} }
cpu->CPU_Mutex.unlock();
} }
sleep(1); sleep(1);