smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use a concurrent cache to store Archive cache.

This commit is contained in:
Matthieu Gautier 2022-04-26 17:49:10 +02:00
parent 28fb76bbc2
commit 582e3ec46d
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/library.cpp
View File

@ -27,6 +27,8 @@
#include "tools/regexTools.h" #include "tools/regexTools.h"
#include "tools/pathTools.h" #include "tools/pathTools.h"
#include "tools/stringTools.h" #include "tools/stringTools.h"
#include "tools/otherTools.h"
#include "tools/concurrent_cache.h"
#include <pugixml.hpp> #include <pugixml.hpp>
#include <algorithm> #include <algorithm>
@ -64,13 +66,12 @@ struct Library::Impl
{ {
Library::Revision lastUpdatedRevision = 0; Library::Revision lastUpdatedRevision = 0;
// May also keep the Archive and Reader pointers here and get
// rid of the m_readers and m_archives data members in Library
}; };
Library::Revision m_revision; Library::Revision m_revision;
std::map<std::string, Entry> m_books; std::map<std::string, Entry> m_books;
std::map<std::string, std::shared_ptr<zim::Archive>> m_archives; using ArchiveCache = ConcurrentCache<std::string, std::shared_ptr<zim::Archive>>;
std::unique_ptr<ArchiveCache> mp_archiveCache;
std::vector<kiwix::Bookmark> m_bookmarks; std::vector<kiwix::Bookmark> m_bookmarks;
Xapian::WritableDatabase m_bookDB; Xapian::WritableDatabase m_bookDB;
@ -84,7 +85,8 @@ struct Library::Impl
}; };
Library::Impl::Impl() Library::Impl::Impl()
: m_bookDB("", Xapian::DB_BACKEND_INMEMORY) : mp_archiveCache(new ArchiveCache(std::max(getEnvVar<int>("ARCHIVE_CACHE_SIZE", 1), 1))),
m_bookDB("", Xapian::DB_BACKEND_INMEMORY)
{ {
} }
@ -174,7 +176,7 @@ bool Library::removeBookmark(const std::string& zimId, const std::string& url)
void Library::dropCache(const std::string& id) void Library::dropCache(const std::string& id)
{ {
mp_impl->m_archives.erase(id); mp_impl->mp_archiveCache->drop(id);
} }
bool Library::removeBookById(const std::string& id) bool Library::removeBookById(const std::string& id)
@ -250,18 +252,19 @@ std::shared_ptr<Reader> Library::getReaderById(const std::string& id)
std::shared_ptr<zim::Archive> Library::getArchiveById(const std::string& id) std::shared_ptr<zim::Archive> Library::getArchiveById(const std::string& id)
{ {
std::lock_guard<std::mutex> lock(m_mutex);
try { try {
return mp_impl->m_archives.at(id); return mp_impl->mp_archiveCache->getOrPut(id,
} catch (std::out_of_range& e) {} [&](){
auto book = getBookById(id);
auto book = getBookById(id); if (!book.isPathValid()) {
if (!book.isPathValid()) throw std::invalid_argument("");
}
return std::make_shared<zim::Archive>(book.getPath());
});
} catch (std::invalid_argument&) {
return nullptr; return nullptr;
}
auto sptr = make_shared<zim::Archive>(book.getPath());
mp_impl->m_archives[id] = sptr;
return sptr;
} }
unsigned int Library::getBookCount(const bool localBooks, unsigned int Library::getBookCount(const bool localBooks,