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

QResource: de-inline registerSelf for files

Browse Source 
No other changes, aside from the coding style update to make sure the
coding style bot won't complain.

Change-Id: Iae320a2868db402a993dfffd15689a8a6ac202e8
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Thiago Macieira 2018-11-19 10:39:51 -08:00
parent 57b4b45cbd
commit f56ca2c4f6
1 changed files with 58 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
src/corelib/io/qresource.cpp
View File

@ -1050,74 +1050,76 @@ public:
QString mappingFile() const { return fileName; } QString mappingFile() const { return fileName; }
ResourceRootType type() const override { return Resource_File; } ResourceRootType type() const override { return Resource_File; }
bool registerSelf(const QString &f) { bool registerSelf(const QString &f);
bool fromMM = false; };
uchar *data = 0;
unsigned int data_len = 0;
#ifdef QT_USE_MMAP
#ifndef MAP_FILE #ifndef MAP_FILE
#define MAP_FILE 0 # define MAP_FILE 0
#endif #endif
#ifndef MAP_FAILED #ifndef MAP_FAILED
#define MAP_FAILED -1 # define MAP_FAILED -1
#endif #endif
int fd = QT_OPEN(QFile::encodeName(f), O_RDONLY, bool QDynamicFileResourceRoot::registerSelf(const QString &f)
{
bool fromMM = false;
uchar *data = 0;
unsigned int data_len = 0;
#ifdef QT_USE_MMAP
int fd = QT_OPEN(QFile::encodeName(f), O_RDONLY,
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
_S_IREAD | _S_IWRITE _S_IREAD | _S_IWRITE
#else #else
0666 0666
#endif #endif
); );
if (fd >= 0) { if (fd >= 0) {
QT_STATBUF st; QT_STATBUF st;
if (!QT_FSTAT(fd, &st)) { if (!QT_FSTAT(fd, &st)) {
uchar *ptr; uchar *ptr;
ptr = reinterpret_cast<uchar *>( ptr = reinterpret_cast<uchar *>(
mmap(0, st.st_size, // any address, whole file mmap(0, st.st_size, // any address, whole file
PROT_READ, // read-only memory PROT_READ, // read-only memory
MAP_FILE | MAP_PRIVATE, // swap-backed map from file MAP_FILE | MAP_PRIVATE, // swap-backed map from file
fd, 0)); // from offset 0 of fd fd, 0)); // from offset 0 of fd
if (ptr && ptr != reinterpret_cast<uchar *>(MAP_FAILED)) { if (ptr && ptr != reinterpret_cast<uchar *>(MAP_FAILED)) {
data = ptr; data = ptr;
data_len = st.st_size; data_len = st.st_size;
fromMM = true; fromMM = true;
}
} }
::close(fd);
} }
#endif // QT_USE_MMAP ::close(fd);
if(!data) {
QFile file(f);
if (!file.exists())
return false;
data_len = file.size();
data = new uchar[data_len];
bool ok = false;
if (file.open(QIODevice::ReadOnly))
ok = (data_len == (uint)file.read((char*)data, data_len));
if (!ok) {
delete [] data;
data = 0;
data_len = 0;
return false;
}
fromMM = false;
}
if (data && QDynamicBufferResourceRoot::registerSelf(data, data_len)) {
if(fromMM) {
unmapPointer = data;
unmapLength = data_len;
}
fileName = f;
return true;
}
return false;
} }
}; #endif // QT_USE_MMAP
if (!data) {
QFile file(f);
if (!file.exists())
return false;
data_len = file.size();
data = new uchar[data_len];
bool ok = false;
if (file.open(QIODevice::ReadOnly))
ok = (data_len == (uint)file.read((char*)data, data_len));
if (!ok) {
delete [] data;
data = 0;
data_len = 0;
return false;
}
fromMM = false;
}
if (data && QDynamicBufferResourceRoot::registerSelf(data, data_len)) {
if (fromMM) {
unmapPointer = data;
unmapLength = data_len;
}
fileName = f;
return true;
}
return false;
}
static QString qt_resource_fixResourceRoot(QString r) { static QString qt_resource_fixResourceRoot(QString r) {
if(!r.isEmpty()) { if(!r.isEmpty()) {