1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't parse /etc/os-release every time we need to do uname(2)

Browse Source 
This is just an optimization of the code: instead of opening and parsing
/etc/os-release every time QSysInfo::kernelType() is called on Linux, do
that only in QSysInfo::productType() and productVersion().

Change-Id: I201504934ecf7a51854cb49c790bd9d30eba644b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Thiago Macieira 2014-07-07 21:27:46 -07:00
parent 5d11688d02
commit 7616586691
1 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/corelib/global/qglobal.cpp
View File

@ -2051,23 +2051,14 @@ const QSysInfo::WinVersion QSysInfo::WindowsVersion = QSysInfo::windowsVersion()
#if defined(Q_OS_UNIX) #if defined(Q_OS_UNIX)
# if (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)) || defined(Q_OS_FREEBSD) # if (defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)) || defined(Q_OS_FREEBSD)
# define USE_ETC_OS_RELEASE # define USE_ETC_OS_RELEASE
# endif
struct QUnixOSVersion struct QUnixOSVersion
{ {
// from uname(2)
QString sysName;
QString sysNameLower;
QString sysRelease;
# ifdef USE_ETC_OS_RELEASE
// from /etc/os-release // from /etc/os-release
QString productType; // $ID QString productType; // $ID
QString productVersion; // $VERSION_ID QString productVersion; // $VERSION_ID
QString prettyName; // $PRETTY_NAME QString prettyName; // $PRETTY_NAME
# endif
}; };
# ifdef USE_ETC_OS_RELEASE
static QString unquote(const char *begin, const char *end) static QString unquote(const char *begin, const char *end)
{ {
if (*begin == '"') { if (*begin == '"') {
@ -2140,27 +2131,6 @@ static bool readEtcOsRelease(QUnixOSVersion &v)
return true; return true;
} }
# endif // USE_ETC_OS_RELEASE # endif // USE_ETC_OS_RELEASE
static QUnixOSVersion detectUnixVersion()
{
QUnixOSVersion v;
struct utsname u;
if (uname(&u) != -1) {
v.sysName = QString::fromLatin1(u.sysname);
v.sysNameLower = v.sysName.toLower();
v.sysRelease = QString::fromLatin1(u.release);
} else {
v.sysName = QLatin1String("Detection failed");
// leave sysNameLower & sysRelease unset
}
# ifdef USE_ETC_OS_RELEASE
if (readEtcOsRelease(v))
return v;
# endif
return v;
}
#endif // Q_OS_UNIX #endif // Q_OS_UNIX
@ -2363,9 +2333,9 @@ QString QSysInfo::kernelType()
#elif defined(Q_OS_WIN) #elif defined(Q_OS_WIN)
return QStringLiteral("winnt"); return QStringLiteral("winnt");
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX)
QUnixOSVersion unixOsVersion = detectUnixVersion(); struct utsname u;
if (!unixOsVersion.sysNameLower.isEmpty()) if (uname(&u) == 0)
return unixOsVersion.sysNameLower; return QString::fromLatin1(u.sysname).toLower();
#endif #endif
return unknownText(); return unknownText();
} }
@ -2393,7 +2363,10 @@ QString QSysInfo::kernelVersion()
return QString::number(int(osver.dwMajorVersion)) + QLatin1Char('.') + QString::number(int(osver.dwMinorVersion)) return QString::number(int(osver.dwMajorVersion)) + QLatin1Char('.') + QString::number(int(osver.dwMinorVersion))
+ QLatin1Char('.') + QString::number(int(osver.dwBuildNumber)); + QLatin1Char('.') + QString::number(int(osver.dwBuildNumber));
#else #else
return detectUnixVersion().sysRelease; struct utsname u;
if (uname(&u) == 0)
return QString::fromLatin1(u.release);
return QString();
#endif #endif
} }
@ -2463,7 +2436,8 @@ QString QSysInfo::productType()
return QStringLiteral("darwin"); return QStringLiteral("darwin");
#elif defined(USE_ETC_OS_RELEASE) // Q_OS_UNIX #elif defined(USE_ETC_OS_RELEASE) // Q_OS_UNIX
QUnixOSVersion unixOsVersion = detectUnixVersion(); QUnixOSVersion unixOsVersion;
readEtcOsRelease(unixOsVersion);
if (!unixOsVersion.productType.isEmpty()) if (!unixOsVersion.productType.isEmpty())
return unixOsVersion.productType; return unixOsVersion.productType;
#endif #endif
@ -2532,7 +2506,8 @@ QString QSysInfo::productVersion()
return bbVersion; return bbVersion;
} }
#elif defined(USE_ETC_OS_RELEASE) // Q_OS_UNIX #elif defined(USE_ETC_OS_RELEASE) // Q_OS_UNIX
QUnixOSVersion unixOsVersion = detectUnixVersion(); QUnixOSVersion unixOsVersion;
readEtcOsRelease(unixOsVersion);
if (!unixOsVersion.productVersion.isEmpty()) if (!unixOsVersion.productVersion.isEmpty())
return unixOsVersion.productVersion; return unixOsVersion.productVersion;
#endif #endif
@ -2605,13 +2580,15 @@ QString QSysInfo::prettyProductName()
#elif defined(Q_OS_BLACKBERRY) #elif defined(Q_OS_BLACKBERRY)
return QLatin1String("BlackBerry ") + productVersion(); return QLatin1String("BlackBerry ") + productVersion();
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX)
QUnixOSVersion unixOsVersion = detectUnixVersion();
# ifdef USE_ETC_OS_RELEASE # ifdef USE_ETC_OS_RELEASE
QUnixOSVersion unixOsVersion;
readEtcOsRelease(unixOsVersion);
if (!unixOsVersion.prettyName.isEmpty()) if (!unixOsVersion.prettyName.isEmpty())
return unixOsVersion.prettyName; return unixOsVersion.prettyName;
# endif # endif
if (!unixOsVersion.sysName.isEmpty()) struct utsname u;
return unixOsVersion.sysName + QLatin1Char(' ') + unixOsVersion.sysRelease; if (uname(&u) == 0)
return QString::fromLatin1(u.sysname) + QLatin1Char(' ') + QString::fromLatin1(u.release);
#endif #endif
return unknownText(); return unknownText();
} }