Add thread safety annotations for SkMutex
Introduce SkAutoMutexExclusive for SkMutex RAII.
Unsubclass SkMutex from SkBaseMutex to allow annotations
for class field mutexes separate from global mutexes.
Leave SkAutoMutexAcquire for handling global mutexes using
SkBaseMutex.
Test using GrSingleOwner.h.
Change-Id: I19d9d0ae0d05206cbb6ef137dc362969048c9c07
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/213136
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Herb Derby <herb@google.com>
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index c0d0d3c..014efa4 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -1576,7 +1576,7 @@
// can be very slow. If we do need to compute a new glyphID, then
// access those freetype objects and continue the loop.
- SkAutoMutexAcquire ama(fC2GCacheMutex);
+ SkAutoMutexExclusive ama(fC2GCacheMutex);
int i;
for (i = 0; i < count; ++i) {
@@ -1824,7 +1824,7 @@
}
bool SkTypeface_FreeType::Scanner::recognizedFont(SkStreamAsset* stream, int* numFaces) const {
- SkAutoMutexAcquire libraryLock(fLibraryMutex);
+ SkAutoMutexExclusive libraryLock(fLibraryMutex);
FT_StreamRec streamRec;
FT_Face face = this->openFace(stream, -1, &streamRec);
@@ -1843,7 +1843,7 @@
SkStreamAsset* stream, int ttcIndex,
SkString* name, SkFontStyle* style, bool* isFixedPitch, AxisDefinitions* axes) const
{
- SkAutoMutexAcquire libraryLock(fLibraryMutex);
+ SkAutoMutexExclusive libraryLock(fLibraryMutex);
FT_StreamRec streamRec;
FT_Face face = this->openFace(stream, ttcIndex, &streamRec);
diff --git a/src/ports/SkFontMgr_FontConfigInterface.cpp b/src/ports/SkFontMgr_FontConfigInterface.cpp
index 52dba25..cdb5460 100644
--- a/src/ports/SkFontMgr_FontConfigInterface.cpp
+++ b/src/ports/SkFontMgr_FontConfigInterface.cpp
@@ -193,7 +193,7 @@
SkTypeface* onMatchFamilyStyle(const char requestedFamilyName[],
const SkFontStyle& requestedStyle) const override
{
- SkAutoMutexAcquire ama(fMutex);
+ SkAutoMutexExclusive ama(fMutex);
SkFontConfigInterface::FontIdentity identity;
SkString outFamilyName;
@@ -294,7 +294,7 @@
sk_sp<SkTypeface> onLegacyMakeTypeface(const char requestedFamilyName[],
SkFontStyle requestedStyle) const override
{
- SkAutoMutexAcquire ama(fMutex);
+ SkAutoMutexExclusive ama(fMutex);
// Check if this request is already in the request cache.
using Request = SkFontRequestCache::Request;
diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp
index 3355e5c..55dfb93 100644
--- a/src/ports/SkFontMgr_fontconfig.cpp
+++ b/src/ports/SkFontMgr_fontconfig.cpp
@@ -699,7 +699,7 @@
*/
sk_sp<SkTypeface> createTypefaceFromFcPattern(FcPattern* pattern) const {
FCLocker::AssertHeld();
- SkAutoMutexAcquire ama(fTFCacheMutex);
+ SkAutoMutexExclusive ama(fTFCacheMutex);
sk_sp<SkTypeface> face = fTFCache.findByProcAndRef(FindByFcPattern, pattern);
if (!face) {
FcPatternReference(pattern);
diff --git a/src/ports/SkFontMgr_fuchsia.cpp b/src/ports/SkFontMgr_fuchsia.cpp
index e3edbc5..05f95cf 100644
--- a/src/ports/SkFontMgr_fuchsia.cpp
+++ b/src/ports/SkFontMgr_fuchsia.cpp
@@ -388,7 +388,7 @@
sk_sp<SkTypeface> SkFontMgr_Fuchsia::GetOrCreateTypeface(TypefaceId id,
const fuchsia::mem::Buffer& buffer) const {
- SkAutoMutexAcquire mutexLock(fCacheMutex);
+ SkAutoMutexExclusive mutexLock(fCacheMutex);
sk_sp<SkTypeface> cached = fTypefaceCache.findByProcAndRef(FindByTypefaceId, &id);
if (cached) return cached;
diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp
index 33d7e5d..f7bce89 100644
--- a/src/ports/SkFontMgr_win_dw.cpp
+++ b/src/ports/SkFontMgr_win_dw.cpp
@@ -458,7 +458,7 @@
IDWriteFontFace* fontFace,
IDWriteFont* font,
IDWriteFontFamily* fontFamily) const {
- SkAutoMutexAcquire ama(fTFCacheMutex);
+ SkAutoMutexExclusive ama(fTFCacheMutex);
ProtoDWriteTypeface spec = { fontFace, font, fontFamily };
sk_sp<SkTypeface> face = fTFCache.findByProcAndRef(FindByDWriteFont, &spec);
if (nullptr == face) {
diff --git a/src/ports/SkRemotableFontMgr_win_dw.cpp b/src/ports/SkRemotableFontMgr_win_dw.cpp
index 64f0638..85f8b02 100644
--- a/src/ports/SkRemotableFontMgr_win_dw.cpp
+++ b/src/ports/SkRemotableFontMgr_win_dw.cpp
@@ -58,7 +58,7 @@
"Failed to re-convert to IDWriteFontFileLoader.",
SkFontIdentity::kInvalidDataId);
- SkAutoMutexAcquire ama(fDataIdCacheMutex);
+ SkAutoMutexExclusive ama(fDataIdCacheMutex);
int count = fDataIdCache.count();
int i;
for (i = 0; i < count; ++i) {
@@ -417,7 +417,7 @@
}
SkStreamAsset* getData(int dataId) const override {
- SkAutoMutexAcquire ama(fDataIdCacheMutex);
+ SkAutoMutexExclusive ama(fDataIdCacheMutex);
if (dataId >= fDataIdCache.count()) {
return nullptr;
}
diff --git a/src/ports/SkScalerContext_win_dw.cpp b/src/ports/SkScalerContext_win_dw.cpp
index 432356a..22d06fb 100644
--- a/src/ports/SkScalerContext_win_dw.cpp
+++ b/src/ports/SkScalerContext_win_dw.cpp
@@ -52,7 +52,7 @@
}
static bool is_hinted(DWriteFontTypeface* typeface) {
- SkAutoExclusive l(DWriteFactoryMutex);
+ SkAutoMutexAcquire l(DWriteFactoryMutex);
AutoTDWriteTable<SkOTTableMaximumProfile> maxp(typeface->fDWriteFontFace.get());
if (!maxp.fExists) {
return false;
@@ -123,7 +123,7 @@
}
static bool has_bitmap_strike(DWriteFontTypeface* typeface, GaspRange range) {
- SkAutoExclusive l(DWriteFactoryMutex);
+ SkAutoMutexAcquire l(DWriteFactoryMutex);
{
AutoTDWriteTable<SkOTTableEmbeddedBitmapLocation> eblc(typeface->fDWriteFontFace.get());
if (!eblc.fExists) {
@@ -384,7 +384,7 @@
if (DWRITE_MEASURING_MODE_GDI_CLASSIC == fMeasuringMode ||
DWRITE_MEASURING_MODE_GDI_NATURAL == fMeasuringMode)
{
- SkAutoExclusive l(DWriteFactoryMutex);
+ SkAutoMutexAcquire l(DWriteFactoryMutex);
HRBM(this->getDWriteTypeface()->fDWriteFontFace->GetGdiCompatibleGlyphMetrics(
fTextSizeMeasure,
1.0f, // pixelsPerDip
@@ -396,7 +396,7 @@
&gm),
"Could not get gdi compatible glyph metrics.");
} else {
- SkAutoExclusive l(DWriteFactoryMutex);
+ SkAutoMutexAcquire l(DWriteFactoryMutex);
HRBM(this->getDWriteTypeface()->fDWriteFontFace->GetDesignGlyphMetrics(&glyphId, 1, &gm),
"Could not get design metrics.");
}
@@ -452,7 +452,7 @@
SkTScopedComPtr<IDWriteGlyphRunAnalysis> glyphRunAnalysis;
{
- SkAutoExclusive l(DWriteFactoryMutex);
+ SkAutoMutexAcquire l(DWriteFactoryMutex);
// IDWriteFactory2::CreateGlyphRunAnalysis is very bad at aliased glyphs.
if (this->getDWriteTypeface()->fFactory2 &&
(fGridFitMode == DWRITE_GRID_FIT_MODE_DISABLED ||
@@ -575,7 +575,7 @@
HRVM(SkDWriteGeometrySink::Create(&path, &geometryToPath),
"Could not create geometry to path converter.");
{
- SkAutoExclusive l(DWriteFactoryMutex);
+ SkAutoMutexAcquire l(DWriteFactoryMutex);
HRVM(colorGlyph->glyphRun.fontFace->GetGlyphRunOutline(
colorGlyph->glyphRun.fontEmSize,
colorGlyph->glyphRun.glyphIndices,
@@ -927,7 +927,7 @@
{
SkTScopedComPtr<IDWriteGlyphRunAnalysis> glyphRunAnalysis;
{
- SkAutoExclusive l(DWriteFactoryMutex);
+ SkAutoMutexAcquire l(DWriteFactoryMutex);
// IDWriteFactory2::CreateGlyphRunAnalysis is very bad at aliased glyphs.
if (this->getDWriteTypeface()->fFactory2 &&
(fGridFitMode == DWRITE_GRID_FIT_MODE_DISABLED ||
@@ -1027,7 +1027,7 @@
HRVM(SkDWriteGeometrySink::Create(&path, &geometryToPath),
"Could not create geometry to path converter.");
{
- SkAutoExclusive l(DWriteFactoryMutex);
+ SkAutoMutexAcquire l(DWriteFactoryMutex);
HRVM(colorGlyph->glyphRun.fontFace->GetGlyphRunOutline(
colorGlyph->glyphRun.fontEmSize,
colorGlyph->glyphRun.glyphIndices,
@@ -1162,7 +1162,7 @@
"Could not create geometry to path converter.");
UINT16 glyphId = SkTo<UINT16>(glyph);
{
- SkAutoExclusive l(DWriteFactoryMutex);
+ SkAutoMutexAcquire l(DWriteFactoryMutex);
//TODO: convert to<->from DIUs? This would make a difference if hinting.
//It may not be needed, it appears that DirectWrite only hints at em size.
HRBM(this->getDWriteTypeface()->fDWriteFontFace->GetGlyphRunOutline(