diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2016-03-26 17:12:52 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2016-03-26 17:20:27 +0900 |
| commit | d64089632e82a2548752c7a6baaa68365a795a74 (patch) | |
| tree | 57fc7b85a8c1290975d58fa4761b04a7695bf7e3 /src/Lock.h | |
| parent | c81b1321122e8509b55c94c0cbca0d8d6d319f0c (diff) | |
| parent | a7cd943a06b1a5ff4515b57060b84037f8d01f9f (diff) | |
Merge branch 'master' into random-webseeding
Diffstat (limited to 'src/Lock.h')
| -rw-r--r-- | src/Lock.h | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -41,7 +41,6 @@ #include <pthread.h> #endif - namespace aria2 { class Lock { @@ -53,7 +52,8 @@ private: #endif public: - Lock() { + Lock() + { #if defined(_WIN32) ::InitializeCriticalSection(§ion_); #elif defined(ENABLE_PTHREAD) @@ -61,7 +61,8 @@ public: #endif } - ~Lock() { + ~Lock() + { #if defined(_WIN32) ::DeleteCriticalSection(§ion_); #elif defined(ENABLE_PTHREAD) @@ -69,7 +70,8 @@ public: #endif } - inline void aquire() { + inline void aquire() + { #if defined(_WIN32) ::EnterCriticalSection(§ion_); #elif defined(ENABLE_PTHREAD) @@ -77,7 +79,8 @@ public: #endif } - inline bool tryAquire() { + inline bool tryAquire() + { #if defined(_WIN32) return ::TryEnterCriticalSection(§ion_) == TRUE; #elif defined(ENABLE_PTHREAD) @@ -87,26 +90,23 @@ public: #endif } - inline void release() { + inline void release() + { #if defined(_WIN32) ::LeaveCriticalSection(§ion_); #elif defined(ENABLE_PTHREAD) ::pthread_mutex_unlock(&mutex_); #endif } - }; class LockGuard { private: Lock& lock_; + public: - inline LockGuard(Lock& lock) : lock_(lock) { - lock_.aquire(); - } - inline ~LockGuard() { - lock_.release(); - } + inline LockGuard(Lock& lock) : lock_(lock) { lock_.aquire(); } + inline ~LockGuard() { lock_.release(); } }; } // namespace aria2 |
