086eea93b1
Reason for revert: broken the Mac and Linux builders, e.g.: https://build.chromium.org/p/chromium/builders/Mac/builds/15151 https://build.chromium.org/p/chromium/builders/Linux%20x64/builds/19052 Original issue's description: > SK_DECLARE_STATIC_MUTEX -> static SkMutex > > There's no need to use a macro to declare static SkMutexes any more > (and there's likewise no need to restrict them to global scope). > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1948193002 > > Committed: https://skia.googlesource.com/skia/+/5e56cfd3fa1041dbb83899844fb92fa9a2ef1009 TBR=mtklein@google.com,mtklein@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/1945353003
102 lines
2.4 KiB
C++
102 lines
2.4 KiB
C++
/*
|
|
* Copyright 2015 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef SkMutex_DEFINED
|
|
#define SkMutex_DEFINED
|
|
|
|
#include "../private/SkSemaphore.h"
|
|
#include "../private/SkThreadID.h"
|
|
#include "SkTypes.h"
|
|
|
|
// TODO: no need for this anymore.
|
|
#define SK_DECLARE_STATIC_MUTEX(name) static SkMutex name;
|
|
|
|
class SkMutex {
|
|
public:
|
|
constexpr SkMutex() = default;
|
|
|
|
SkMutex(const SkMutex&) = delete;
|
|
SkMutex& operator=(const SkMutex&) = delete;
|
|
|
|
void acquire() {
|
|
fSemaphore.wait();
|
|
SkDEBUGCODE(fOwner = SkGetThreadID();)
|
|
}
|
|
|
|
void release() {
|
|
this->assertHeld();
|
|
SkDEBUGCODE(fOwner = kIllegalThreadID;)
|
|
fSemaphore.signal();
|
|
}
|
|
|
|
void assertHeld() {
|
|
SkASSERT(fOwner == SkGetThreadID());
|
|
}
|
|
|
|
private:
|
|
SkSemaphore fSemaphore{1};
|
|
SkDEBUGCODE(SkThreadID fOwner{kIllegalThreadID};)
|
|
};
|
|
|
|
template <typename Lock>
|
|
class SkAutoTAcquire : SkNoncopyable {
|
|
public:
|
|
explicit SkAutoTAcquire(Lock& mutex) : fMutex(&mutex) {
|
|
SkASSERT(fMutex != nullptr);
|
|
mutex.acquire();
|
|
}
|
|
|
|
explicit SkAutoTAcquire(Lock* mutex) : fMutex(mutex) {
|
|
if (mutex) {
|
|
mutex->acquire();
|
|
}
|
|
}
|
|
|
|
/** If the mutex has not been released, release it now. */
|
|
~SkAutoTAcquire() {
|
|
if (fMutex) {
|
|
fMutex->release();
|
|
}
|
|
}
|
|
|
|
/** If the mutex has not been released, release it now. */
|
|
void release() {
|
|
if (fMutex) {
|
|
fMutex->release();
|
|
fMutex = nullptr;
|
|
}
|
|
}
|
|
|
|
/** Assert that we're holding the mutex. */
|
|
void assertHeld() {
|
|
SkASSERT(fMutex);
|
|
fMutex->assertHeld();
|
|
}
|
|
|
|
private:
|
|
Lock* fMutex;
|
|
};
|
|
|
|
// SkAutoTExclusive is a lighter weight version of SkAutoTAcquire. It assumes that there is a valid
|
|
// mutex, thus removing the check for the null pointer.
|
|
template <typename Lock>
|
|
class SkAutoTExclusive {
|
|
public:
|
|
SkAutoTExclusive(Lock& lock) : fLock(lock) { lock.acquire(); }
|
|
~SkAutoTExclusive() { fLock.release(); }
|
|
private:
|
|
Lock &fLock;
|
|
};
|
|
|
|
typedef SkAutoTAcquire<SkMutex> SkAutoMutexAcquire;
|
|
#define SkAutoMutexAcquire(...) SK_REQUIRE_LOCAL_VAR(SkAutoMutexAcquire)
|
|
|
|
typedef SkAutoTExclusive<SkMutex> SkAutoMutexExclusive;
|
|
#define SkAutoMutexExclusive(...) SK_REQUIRE_LOCAL_VAR(SkAutoMutexExclusive)
|
|
|
|
#endif//SkMutex_DEFINED
|