napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the new physical memory checker.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-06-10 00:04:50 +02:00
parent 5e2f6ff2b8
commit adad3535a8
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/welcome/checker/RequirementsChecker.cpp
View File

@ -25,6 +25,7 @@
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Retranslator.h" #include "utils/Retranslator.h"
#include "utils/CalamaresUtilsSystem.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
@ -245,15 +246,9 @@ RequirementsChecker::checkEnoughStorage( qint64 requiredSpace )
bool bool
RequirementsChecker::checkEnoughRam( qint64 requiredRam ) RequirementsChecker::checkEnoughRam( qint64 requiredRam )
{ {
// A line in meminfo looks like this, with {print $2} we grab the second column. qint64 availableRam = CalamaresUtils::getPhysicalMemoryB();
// MemTotal: 8133432 kB if ( !availableRam )
availableRam = CalamaresUtils::getTotalMemoryB();
QProcess p;
p.start( "awk", { "/MemTotal/ {print $2}", "/proc/meminfo" } );
p.waitForFinished();
QString memoryLine = p.readAllStandardOutput().simplified();
qint64 availableRam = memoryLine.toLongLong() * 1024;
return availableRam >= requiredRam * 0.95; // because MemTotal is variable return availableRam >= requiredRam * 0.95; // because MemTotal is variable
} }