aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar halcanary <halcanary@google.com>2014-06-20 09:05:56 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-06-20 09:05:56 -0700
commite486ec48b1dbdc6e8276a765abeb8eabcbf5c22e (patch)
tree68a4ce7f7cc41e05b533dfafea669c457ec8bbdb
parent912d809a85f9992c9c2eff988b2b8e78be691c41 (diff)
In Debug, SkMutex(pthread) crashes on re-entrant aquire from same thread.
R=mtklein@google.com Author: halcanary@google.com Review URL: https://codereview.chromium.org/338973006
-rw-r--r--src/ports/SkMutex_pthread.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ports/SkMutex_pthread.h b/src/ports/SkMutex_pthread.h
index 1904140c4c..662e549f12 100644
--- a/src/ports/SkMutex_pthread.h
+++ b/src/ports/SkMutex_pthread.h
@@ -19,6 +19,7 @@
// a corresponding static finalizer).
struct SkBaseMutex {
void acquire() {
+ SkASSERT(fOwner != pthread_self()); // SkMutex is not re-entrant
pthread_mutex_lock(&fMutex);
SkDEBUGCODE(fOwner = pthread_self();)
}