aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-21 15:22:18 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-21 15:22:18 +0000
commit32f40ee8b001d7b7c5f1247d4baa5c32eb0c846f (patch)
tree389d9b29247356f02f8af5696ccce4b308180031 /tools
parent75a22954453f4c0e3c0cb2ec0a46f32a473622f9 (diff)
Remove mutex around image decoding in skpdiff.
I removed the mutex to investigate BUG=skia:1803, and I get no crashes. The crashes may have been related to other multithreading issues. Removing the mutex will allow skpdiff to run faster. R=djsollen@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/61603008 git-svn-id: http://skia.googlecode.com/svn/trunk@12339 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools')
-rw-r--r--tools/skpdiff/SkDiffContext.cpp2
-rw-r--r--tools/skpdiff/SkDiffContext.h6
2 files changed, 0 insertions, 8 deletions
diff --git a/tools/skpdiff/SkDiffContext.cpp b/tools/skpdiff/SkDiffContext.cpp
index c4a125864a..2bd1694a08 100644
--- a/tools/skpdiff/SkDiffContext.cpp
+++ b/tools/skpdiff/SkDiffContext.cpp
@@ -69,7 +69,6 @@ void SkDiffContext::addDiff(const char* baselinePath, const char* testPath) {
// Load the images at the paths
SkBitmap baselineBitmap;
SkBitmap testBitmap;
- SkAutoMutexAcquire imageLock(fImageMutex);
if (!SkImageDecoder::DecodeFile(baselinePath, &baselineBitmap)) {
SkDebugf("Failed to load bitmap \"%s\"\n", baselinePath);
return;
@@ -78,7 +77,6 @@ void SkDiffContext::addDiff(const char* baselinePath, const char* testPath) {
SkDebugf("Failed to load bitmap \"%s\"\n", testPath);
return;
}
- imageLock.release();
// Setup a record for this diff
fRecordMutex.acquire();
diff --git a/tools/skpdiff/SkDiffContext.h b/tools/skpdiff/SkDiffContext.h
index 2d971059c2..c036c2ef6c 100644
--- a/tools/skpdiff/SkDiffContext.h
+++ b/tools/skpdiff/SkDiffContext.h
@@ -124,12 +124,6 @@ private:
SkTArray<DiffData> fDiffs;
};
- // This is needed to work around a bug in the multithreaded case where the
- // image decoders are crashing when large numbers of threads are invoking
- // the decoder at the same time.
- // see https://code.google.com/p/skia/issues/detail?id=1803
- SkMutex fImageMutex;
-
// Used to protect access to fRecords and ensure only one thread is
// adding new entries at a time.
SkMutex fRecordMutex;