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

improve stability for Cache Manager and avoid race conditions.

Browse Source 
preparation step 2 for making dcraw multithread safe.
This commit is contained in:
Steve Herrell
2010-10-28 17:33:11 +02:00
parent d22d77c507
commit 3c747f1d77
5 changed files with 102 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rtgui/cachemanager.h
View File

@@ -29,14 +29,21 @@ class Thumbnail;
class CacheManager {
std::map<std::string, Thumbnail*> openEntries;
Glib::ustring baseDir;
typedef std::pair<std::string, Thumbnail*> string_thumb_pair;
typedef std::map<std::string, Thumbnail*> string_thumb_map;
string_thumb_map openEntries;
Glib::ustring baseDir;
Glib::Mutex mutex_;
void deleteDir (const Glib::ustring& dirName);
public:
CacheManager () {}
public:
static CacheManager* getInstance(void);
void init ();
Thumbnail* getEntry (const Glib::ustring& fname);
void deleteEntry (const Glib::ustring& fname);
@@ -44,7 +51,7 @@ class CacheManager {
void closeThumbnail (Thumbnail* t);
const Glib::ustring& getBaseDir () { return baseDir; }
const Glib::ustring& getBaseDir () { Glib::Mutex::Lock lock(mutex_); return baseDir; }
void closeCache ();
static std::string getMD5 (const Glib::ustring& fname);
@@ -58,7 +65,7 @@ class CacheManager {
Glib::ustring getCacheFileName (const Glib::ustring& subdir, const Glib::ustring& fname, const Glib::ustring& md5);
};
extern CacheManager cacheMgr;
#define cacheMgr CacheManager::getInstance()
#endif