medvedych/harbour-books
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Added option to disable ZLFile::ourPlainStreamCache

Browse source
This commit is contained in:
Slava Monich 2015-05-29 21:39:26 +03:00
parent 8cf747249c
commit 4248e14b73
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
fbreader/fbreader/zlibrary/core/src/filesystem/ZLFile.cpp
View file

@ -32,7 +32,13 @@
const ZLFile ZLFile::NO_FILE; const ZLFile ZLFile::NO_FILE;
#ifndef FBREADER_DISABLE_ZLFILE_PLAIN_STREAM_CACHE
# define FBREADER_DISABLE_ZLFILE_PLAIN_STREAM_CACHE 0
#endif
#if !FBREADER_DISABLE_ZLFILE_PLAIN_STREAM_CACHE
std::map<std::string,weak_ptr<ZLInputStream> > ZLFile::ourPlainStreamCache; std::map<std::string,weak_ptr<ZLInputStream> > ZLFile::ourPlainStreamCache;
#endif
ZLFile::ZLFile() : myMimeTypeIsUpToDate(true), myInfoIsFilled(true) { ZLFile::ZLFile() : myMimeTypeIsUpToDate(true), myInfoIsFilled(true) {
} }
@ -102,16 +108,20 @@ shared_ptr<ZLInputStream> ZLFile::inputStream() const {
int index = ZLFSManager::Instance().findArchiveFileNameDelimiter(myPath); int index = ZLFSManager::Instance().findArchiveFileNameDelimiter(myPath);
if (index == -1) { if (index == -1) {
stream = ourPlainStreamCache[myPath]; #if !FBREADER_DISABLE_ZLFILE_PLAIN_STREAM_CACHE
stream = ourPlainStreamCache[myPath];
if (stream.isNull()) { if (stream.isNull()) {
#endif
if (isDirectory()) { if (isDirectory()) {
return 0; return 0;
} }
stream = ZLFSManager::Instance().createPlainInputStream(myPath); stream = ZLFSManager::Instance().createPlainInputStream(myPath);
stream = envelopeCompressedStream(stream); stream = envelopeCompressedStream(stream);
ourPlainStreamCache[myPath] = stream; #if !FBREADER_DISABLE_ZLFILE_PLAIN_STREAM_CACHE
ourPlainStreamCache[myPath] = stream;
} }
} else { #endif
} else {
ZLFile baseFile(myPath.substr(0, index)); ZLFile baseFile(myPath.substr(0, index));
shared_ptr<ZLInputStream> base = baseFile.inputStream(); shared_ptr<ZLInputStream> base = baseFile.inputStream();
if (!base.isNull()) { if (!base.isNull()) {