Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdecore: drop redundant QFileInfo cache

Browse source 
not only does it leak memory but private QFileInfo data is shared and the
object data will have to be refreshed to obtain correct information

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-01-12 16:29:33 +00:00
parent fff3f3fbf3
commit 8f0ce23410
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
kdecore/kernel/kstandarddirs.cpp
View file

@ -62,7 +62,6 @@
#include <QtNetwork/QHostInfo>
#define case_sensitivity Qt::CaseSensitive
#define max_file_info 10000
class KStandardDirs::KStandardDirsPrivate
{
@ -72,7 +71,7 @@ public:
m_checkRestrictions(true),
m_cacheMutex(QMutex::Recursive), // resourceDirs is recursive
q(qq)
{ m_infocache.setMaxCost(max_file_info); }
{ }
bool hasDataRestrictions(const QString &relPath) const;
QStringList resourceDirs(const char* type, const QString& subdirForRestrictions);
@ -96,7 +95,6 @@ public:
// Caches (protected by mutex in const methods, cf ctor docu)
QMap<QByteArray, QStringList> m_dircache;
QMap<QByteArray, QString> m_savelocations;
QCache<QString, QFileInfo> m_infocache;
QMutex m_cacheMutex;
KStandardDirs* q;
@ -554,18 +552,13 @@ bool KStandardDirs::exists(const QString &fullPath) const
bool KStandardDirs::KStandardDirsPrivate::exists(const QString &fullPath)
{
QFileInfo *fileinfo = m_infocache.object(fullPath);
if (!fileinfo) {
fileinfo = new QFileInfo(fullPath);
m_infocache.insert(fullPath, fileinfo);
}
if (!fileinfo->isReadable()) {
QFileInfo fileinfo(fullPath);
if (!fileinfo.isReadable()) {
return false;
} else if (!fullPath.endsWith(QLatin1Char('/'))) {
return !fileinfo->isDir() && fileinfo->exists();
return !fileinfo.isDir() && fileinfo.exists();
} else {
return fileinfo->isDir() && fileinfo->exists();
return fileinfo.isDir() && fileinfo.exists();
}
}

1
kdecore/kernel/kstandarddirs.h
View file

@ -655,7 +655,6 @@ public:
/**
* Checks for existence and accessability of a file or directory.
* Faster than creating a QFileInfo first.
* @param fullPath the path to check. IMPORTANT: must end with a slash if expected to be a directory
* (and no slash for a file, obviously).
* @return @c true if the directory exists, @c false otherwise