octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-02-13 15:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #231 from andrewgaul/autolock

Browse Source 
Rewrite AutoLock
This commit is contained in:
Takeshi Nakatani 2015-08-20 00:24:05 +09:00
commit 036612dbb0
2 changed files with 4 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/s3fs_util.cpp
View File

@ -425,51 +425,14 @@ void free_mvnodes(MVNODE *head)
//------------------------------------------------------------------- //-------------------------------------------------------------------
// Class AutoLock // Class AutoLock
//------------------------------------------------------------------- //-------------------------------------------------------------------
AutoLock::AutoLock(pthread_mutex_t* pmutex) : auto_mutex(pmutex), is_locked(false) AutoLock::AutoLock(pthread_mutex_t* pmutex) : auto_mutex(pmutex)
{ {
Lock(); pthread_mutex_lock(auto_mutex);
} }
AutoLock::~AutoLock() AutoLock::~AutoLock()
{ {
Unlock(); pthread_mutex_unlock(auto_mutex);
}
bool AutoLock::Lock(void)
{
if(!auto_mutex){
return false;
}
if(is_locked){
// already locked
return true;
}
try{
pthread_mutex_lock(auto_mutex);
is_locked = true;
}catch(exception& e){
is_locked = false;
return false;
}
return true;
}
bool AutoLock::Unlock(void)
{
if(!auto_mutex){
return false;
}
if(!is_locked){
// already unlocked
return true;
}
try{
pthread_mutex_unlock(auto_mutex);
is_locked = false;
}catch(exception& e){
return false;
}
return true;
} }
//------------------------------------------------------------------- //-------------------------------------------------------------------

6
src/s3fs_util.h
View File

@ -88,14 +88,10 @@ class AutoLock
{ {
private: private:
pthread_mutex_t* auto_mutex; pthread_mutex_t* auto_mutex;
bool is_locked;
public: public:
explicit AutoLock(pthread_mutex_t* pmutex = NULL); explicit AutoLock(pthread_mutex_t* pmutex);
~AutoLock(); ~AutoLock();
bool Lock(void);
bool Unlock(void);
}; };
//------------------------------------------------------------------- //-------------------------------------------------------------------