Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(200)

Unified Diff: tools/skpdiff/SkDifferentPixelsMetric_cpu.cpp

Issue 60833002: fix multithread related crashes in skpdiff (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/skpdiff/SkDifferentPixelsMetric_cpu.cpp
diff --git a/tools/skpdiff/SkDifferentPixelsMetric_cpu.cpp b/tools/skpdiff/SkDifferentPixelsMetric_cpu.cpp
index 4e5e93969c3f743ecc6024bbba9576a06a3791ef..ddc36eae21ab4ed078e8bfb6e847f6c389afb5bf 100644
--- a/tools/skpdiff/SkDifferentPixelsMetric_cpu.cpp
+++ b/tools/skpdiff/SkDifferentPixelsMetric_cpu.cpp
@@ -24,8 +24,14 @@ const char* SkDifferentPixelsMetric::getName() {
int SkDifferentPixelsMetric::queueDiff(SkBitmap* baseline, SkBitmap* test) {
double startTime = get_seconds();
+
+ // since we currently synchronously do the diff within queueDiff we only need
+ // to protect the createion of the ID and queuedDiff object.
+ SkAutoMutexAcquire queueLock(fQueueMutex);
int diffID = fQueuedDiffs.count();
QueuedDiff* diff = fQueuedDiffs.push();
+ queueLock.release();
+
SkTDArray<SkIPoint>* poi = diff->poi = new SkTDArray<SkIPoint>();
// If we never end up running the kernel, include some safe defaults in the result.

Powered by Google App Engine
This is Rietveld 408576698