Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1050)

Unified Diff: third_party/WebKit/Source/wtf/ThreadingPrimitives.h

Issue 1611343002: wtf reformat test Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pydent Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/wtf/Threading.h ('k') | third_party/WebKit/Source/wtf/ThreadingPthreads.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/wtf/ThreadingPrimitives.h
diff --git a/third_party/WebKit/Source/wtf/ThreadingPrimitives.h b/third_party/WebKit/Source/wtf/ThreadingPrimitives.h
index f5b8d75bed6e4feb7f5f369c469cbf3ebd21357c..95c557ed0d54fdfac18a8a5dd369de76b8aa6ca1 100644
--- a/third_party/WebKit/Source/wtf/ThreadingPrimitives.h
+++ b/third_party/WebKit/Source/wtf/ThreadingPrimitives.h
@@ -49,27 +49,27 @@ namespace WTF {
#if OS(POSIX)
struct PlatformMutex {
- pthread_mutex_t m_internalMutex;
+ pthread_mutex_t m_internalMutex;
#if ENABLE(ASSERT)
- size_t m_recursionCount;
+ size_t m_recursionCount;
#endif
};
typedef pthread_cond_t PlatformCondition;
#elif OS(WIN)
struct PlatformMutex {
- CRITICAL_SECTION m_internalMutex;
- size_t m_recursionCount;
+ CRITICAL_SECTION m_internalMutex;
+ size_t m_recursionCount;
};
struct PlatformCondition {
- size_t m_waitersGone;
- size_t m_waitersBlocked;
- size_t m_waitersToUnblock;
- HANDLE m_blockLock;
- HANDLE m_blockQueue;
- HANDLE m_unblockLock;
-
- bool timedWait(PlatformMutex&, DWORD durationMilliseconds);
- void signal(bool unblockAll);
+ size_t m_waitersGone;
+ size_t m_waitersBlocked;
+ size_t m_waitersToUnblock;
+ HANDLE m_blockLock;
+ HANDLE m_blockQueue;
+ HANDLE m_unblockLock;
+
+ bool timedWait(PlatformMutex&, DWORD durationMilliseconds);
+ void signal(bool unblockAll);
};
#else
typedef void* PlatformMutex;
@@ -77,73 +77,76 @@ typedef void* PlatformCondition;
#endif
class WTF_EXPORT MutexBase {
- WTF_MAKE_NONCOPYABLE(MutexBase); USING_FAST_MALLOC(MutexBase);
-public:
- ~MutexBase();
+ WTF_MAKE_NONCOPYABLE(MutexBase);
+ USING_FAST_MALLOC(MutexBase);
- void lock();
- void unlock();
+ public:
+ ~MutexBase();
+
+ void lock();
+ void unlock();
#if ENABLE(ASSERT)
- bool locked() { return m_mutex.m_recursionCount > 0; }
+ bool locked() { return m_mutex.m_recursionCount > 0; }
#endif
-public:
- PlatformMutex& impl() { return m_mutex; }
+ public:
+ PlatformMutex& impl() { return m_mutex; }
-protected:
- MutexBase(bool recursive);
+ protected:
+ MutexBase(bool recursive);
- PlatformMutex m_mutex;
+ PlatformMutex m_mutex;
};
class WTF_EXPORT Mutex : public MutexBase {
-public:
- Mutex() : MutexBase(false) { }
- bool tryLock();
+ public:
+ Mutex() : MutexBase(false) {}
+ bool tryLock();
};
class WTF_EXPORT RecursiveMutex : public MutexBase {
-public:
- RecursiveMutex() : MutexBase(true) { }
- bool tryLock();
+ public:
+ RecursiveMutex() : MutexBase(true) {}
+ bool tryLock();
};
typedef Locker<MutexBase> MutexLocker;
class MutexTryLocker final {
- STACK_ALLOCATED();
- WTF_MAKE_NONCOPYABLE(MutexTryLocker);
-public:
- MutexTryLocker(Mutex& mutex) : m_mutex(mutex), m_locked(mutex.tryLock()) { }
- ~MutexTryLocker()
- {
- if (m_locked)
- m_mutex.unlock();
- }
-
- bool locked() const { return m_locked; }
-
-private:
- Mutex& m_mutex;
- bool m_locked;
+ STACK_ALLOCATED();
+ WTF_MAKE_NONCOPYABLE(MutexTryLocker);
+
+ public:
+ MutexTryLocker(Mutex& mutex) : m_mutex(mutex), m_locked(mutex.tryLock()) {}
+ ~MutexTryLocker() {
+ if (m_locked)
+ m_mutex.unlock();
+ }
+
+ bool locked() const { return m_locked; }
+
+ private:
+ Mutex& m_mutex;
+ bool m_locked;
};
class WTF_EXPORT ThreadCondition final {
- USING_FAST_MALLOC(ThreadCondition); // Only HeapTest.cpp requires.
- WTF_MAKE_NONCOPYABLE(ThreadCondition);
-public:
- ThreadCondition();
- ~ThreadCondition();
-
- void wait(MutexBase&);
- // Returns true if the condition was signaled before absoluteTime, false if the absoluteTime was reached or is in the past.
- // The absoluteTime is in seconds, starting on January 1, 1970. The time is assumed to use the same time zone as WTF::currentTime().
- bool timedWait(MutexBase&, double absoluteTime);
- void signal();
- void broadcast();
-
-private:
- PlatformCondition m_condition;
+ USING_FAST_MALLOC(ThreadCondition); // Only HeapTest.cpp requires.
+ WTF_MAKE_NONCOPYABLE(ThreadCondition);
+
+ public:
+ ThreadCondition();
+ ~ThreadCondition();
+
+ void wait(MutexBase&);
+ // Returns true if the condition was signaled before absoluteTime, false if the absoluteTime was reached or is in the past.
+ // The absoluteTime is in seconds, starting on January 1, 1970. The time is assumed to use the same time zone as WTF::currentTime().
+ bool timedWait(MutexBase&, double absoluteTime);
+ void signal();
+ void broadcast();
+
+ private:
+ PlatformCondition m_condition;
};
#if OS(WIN)
@@ -152,7 +155,7 @@ private:
DWORD absoluteTimeToWaitTimeoutInterval(double absoluteTime);
#endif
-} // namespace WTF
+} // namespace WTF
using WTF::MutexBase;
using WTF::Mutex;
@@ -165,4 +168,4 @@ using WTF::ThreadCondition;
using WTF::absoluteTimeToWaitTimeoutInterval;
#endif
-#endif // ThreadingPrimitives_h
+#endif // ThreadingPrimitives_h
« no previous file with comments | « third_party/WebKit/Source/wtf/Threading.h ('k') | third_party/WebKit/Source/wtf/ThreadingPthreads.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698