liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some minor cleanups and optimizations

Browse Source
This commit is contained in:
Flössie 2019-06-03 09:19:46 +02:00
parent 25fdf2114e
commit f9c44f2e47
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rtgui/cachemanager.cc
View File

@ -20,15 +20,16 @@
#include <memory> #include <memory>
#include <iostream> #include <iostream>
#include <glib/gstdio.h>
#include <dirent.h> #include <dirent.h>
#include <giomm.h> #include <giomm.h>
#include <glib/gstdio.h>
#ifdef WIN32 #ifdef WIN32
#include <windows.h> #include <windows.h>
#endif #endif
#include "cachemanager.h" #include "cachemanager.h"
#include "guiutils.h" #include "guiutils.h"
#include "options.h" #include "options.h"
#include "procparamchangers.h" #include "procparamchangers.h"
@ -352,7 +353,9 @@ void CacheManager::applyCacheSizeLimitation () const
} }
closedir(cachedir); closedir(cachedir);
if (numFiles > 2) {
numFiles -= 2; // because . and .. are counted numFiles -= 2; // because . and .. are counted
}
if (numFiles <= options.maxCacheEntries) { if (numFiles <= options.maxCacheEntries) {
return; return;
@ -363,7 +366,7 @@ void CacheManager::applyCacheSizeLimitation () const
std::vector<FNameMTime> files; std::vector<FNameMTime> files;
files.reserve(numFiles); files.reserve(numFiles);
constexpr auto md5_size = 32; constexpr std::size_t md5_size = 32;
// get filenames and timestamps // get filenames and timestamps
try { try {
const auto dir = Gio::File::create_for_path(Glib::build_filename(baseDir, "data")); const auto dir = Gio::File::create_for_path(Glib::build_filename(baseDir, "data"));
@ -383,15 +386,19 @@ void CacheManager::applyCacheSizeLimitation () const
return; return;
} }
constexpr auto reserve = 0.05f; // reserve 5% free cache space const std::size_t toDelete = files.size() - options.maxCacheEntries + options.maxCacheEntries * 100 / 5; // reserve 5% free cache space
const size_t toDelete = files.size() - options.maxCacheEntries + options.maxCacheEntries * reserve;
std::nth_element(files.begin(), files.begin() + toDelete, files.end(), [] (const FNameMTime& lhs, const FNameMTime& rhs) std::nth_element(
files.begin(),
files.begin() + toDelete,
files.end(),
[](const FNameMTime& lhs, const FNameMTime& rhs) -> bool
{ {
return lhs.second < rhs.second; return lhs.second < rhs.second;
}); }
);
for (auto entry = files.begin(); entry < files.begin() + toDelete; ++entry) { for (std::vector<FNameMTime>::const_iterator entry = files.begin(), end = files.begin() + toDelete; entry != end; ++entry) {
const auto& name = entry->first; const auto& name = entry->first;
const auto name_size = name.size() - md5_size; const auto name_size = name.size() - md5_size;
const auto fname = name.substr(0, name_size - 5); const auto fname = name.substr(0, name_size - 5);