octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-01-10 08:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #232 from andrewgaul/stat-cache-locking

Browse Source 
Always hold stat_cache_lock when using stat_cache
This commit is contained in:
Takeshi Nakatani 2015-08-20 00:28:57 +09:00
commit ea99603b58
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/cache.cpp
View File

@ -247,10 +247,17 @@ bool StatCache::AddStat(std::string& key, headers_t& meta, bool forcedir)
} }
DPRNNN("add stat cache entry[path=%s]", key.c_str()); DPRNNN("add stat cache entry[path=%s]", key.c_str());
if(stat_cache.end() != stat_cache.find(key)){ pthread_mutex_lock(&StatCache::stat_cache_lock);
bool found = stat_cache.end() != stat_cache.find(key);
bool do_truncate = stat_cache.size() > CacheSize;
pthread_mutex_unlock(&StatCache::stat_cache_lock);
if(found){
DelStat(key.c_str()); DelStat(key.c_str());
}else{ }else{
if(stat_cache.size() > CacheSize){ if(do_truncate){
if(!TruncateCache()){ if(!TruncateCache()){
return false; return false;
} }
@ -302,10 +309,17 @@ bool StatCache::AddNoObjectCache(string& key)
} }
DPRNNN("add no object cache entry[path=%s]", key.c_str()); DPRNNN("add no object cache entry[path=%s]", key.c_str());
if(stat_cache.end() != stat_cache.find(key)){ pthread_mutex_lock(&StatCache::stat_cache_lock);
bool found = stat_cache.end() != stat_cache.find(key);
bool do_truncate = stat_cache.size() > CacheSize;
pthread_mutex_unlock(&StatCache::stat_cache_lock);
if(found){
DelStat(key.c_str()); DelStat(key.c_str());
}else{ }else{
if(stat_cache.size() > CacheSize){ if(do_truncate){
if(!TruncateCache()){ if(!TruncateCache()){
return false; return false;
} }
@ -330,12 +344,12 @@ bool StatCache::AddNoObjectCache(string& key)
bool StatCache::TruncateCache(void) bool StatCache::TruncateCache(void)
{ {
pthread_mutex_lock(&StatCache::stat_cache_lock);
if(stat_cache.empty()){ if(stat_cache.empty()){
return true; return true;
} }
pthread_mutex_lock(&StatCache::stat_cache_lock);
time_t lowest_time = time(NULL) + 1; time_t lowest_time = time(NULL) + 1;
stat_cache_t::iterator iter_to_delete = stat_cache.end(); stat_cache_t::iterator iter_to_delete = stat_cache.end();
stat_cache_t::iterator iter; stat_cache_t::iterator iter;