77083c7d74
This reverts commit cfdc07aa0e.
Reason for revert: nope, flutter windows bots don't have it. we got caught.
Original change's description:
> replace SkSharedMutex
>
> I am debugging an issue with SkSharedMutex and noticed
> how sparsely it is used. That got me curious to see if
> we can replace it with a std::shared_mutex (from C++17).
>
> Bug: skia:10177
> Change-Id: I1ce4d2a5897af198d6ae5fb850548ff917a58f50
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/285691
> Reviewed-by: Ben Wagner <bungeman@google.com>
> Commit-Queue: Mike Klein <mtklein@google.com>
TBR=mtklein@google.com,bungeman@google.com,herb@google.com
Change-Id: Iab4e55d749e386233ff0e2ba2c1cd10d5e6f1615
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:10177
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/286124
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
55 lines
1.4 KiB
C++
55 lines
1.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.
|
|
*/
|
|
|
|
#include "src/core/SkSharedMutex.h"
|
|
#include "src/core/SkTaskGroup.h"
|
|
|
|
#include "tests/Test.h"
|
|
|
|
DEF_TEST(SkSharedMutexBasic, r) {
|
|
SkSharedMutex sm;
|
|
sm.acquire();
|
|
sm.assertHeld();
|
|
sm.release();
|
|
sm.acquireShared();
|
|
sm.assertHeldShared();
|
|
sm.releaseShared();
|
|
}
|
|
|
|
DEF_TEST(SkSharedMutexMultiThreaded, r) {
|
|
SkSharedMutex sm;
|
|
static const int kSharedSize = 10;
|
|
int shared[kSharedSize];
|
|
int value = 0;
|
|
for (int i = 0; i < kSharedSize; ++i) {
|
|
shared[i] = 0;
|
|
}
|
|
SkTaskGroup().batch(8, [&](int threadIndex) {
|
|
if (threadIndex % 4 != 0) {
|
|
for (int c = 0; c < 100000; ++c) {
|
|
sm.acquireShared();
|
|
sm.assertHeldShared();
|
|
int v = shared[0];
|
|
for (int i = 1; i < kSharedSize; ++i) {
|
|
REPORTER_ASSERT(r, v == shared[i]);
|
|
}
|
|
sm.releaseShared();
|
|
}
|
|
} else {
|
|
for (int c = 0; c < 100000; ++c) {
|
|
sm.acquire();
|
|
sm.assertHeld();
|
|
value += 1;
|
|
for (int i = 0; i < kSharedSize; ++i) {
|
|
shared[i] = value;
|
|
}
|
|
sm.release();
|
|
}
|
|
}
|
|
});
|
|
}
|