GLES: Fix race in Renderer destruction

The clipper and blitter were being destructed before the worker threads were stopped. Also nullify after deleting other fields - this would have been much harder to detect if the clipper and blitter were not already being nullified after destruction. Tested with: ./unittests --gtest_repeat=100 --gtest_filter=SwiftShaderTest.TransformFeedback_DrawArraysInstanced Bug: b/124288179 Change-Id: Iefea829dfb8556c877c0a086253c5924c54aa638 Reviewed-on: https://swiftshader-review.googlesource.com/c/24748Reviewed-by: Nicolas Capens <nicolascapens@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Tested-by: Ben Clayton <bclayton@google.com>

GLES: Fix race in Renderer destruction
3fc635ac · Ben Clayton · 0eee3325 · 3fc635ac · 3fc635ac
Commit 3fc635ac authored Feb 12, 2019 by Ben Clayton
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

Renderer.cpp src/Device/Renderer.cpp +6 -1

Renderer.cpp src/Renderer/Renderer.cpp +6 -1

No files found.
--- a/src/Device/Renderer.cpp
+++ b/src/Device/Renderer.cpp
@@ -175,7 +175,10 @@ namespace sw
 	Renderer::~Renderer()
 	{
+		sync->lock(EXCLUSIVE);
 		sync->destruct();
+		terminateThreads();
+		sync->unlock();
 		delete clipper;
 		clipper = nullptr;
@@ -183,15 +186,17 @@ namespace sw
 		delete blitter;
 		blitter = nullptr;
-		terminateThreads();
 		delete resumeApp;
+		resumeApp = nullptr;
 		for(int draw = 0; draw < DRAW_COUNT; draw++)
 		{
 			delete drawCall[draw];
+			drawCall[draw] = nullptr;
 		}
 		delete swiftConfig;
+		swiftConfig = nullptr;
 	}
 	// This object has to be mem aligned

--- a/src/Renderer/Renderer.cpp
+++ b/src/Renderer/Renderer.cpp
@@ -209,7 +209,10 @@ namespace sw
 	Renderer::~Renderer()
 	{
+		sync->lock(EXCLUSIVE);
 		sync->destruct();
+		terminateThreads();
+		sync->unlock();
 		delete clipper;
 		clipper = nullptr;
@@ -217,15 +220,17 @@ namespace sw
 		delete blitter;
 		blitter = nullptr;
-		terminateThreads();
 		delete resumeApp;
+		resumeApp = nullptr;
 		for(int draw = 0; draw < DRAW_COUNT; draw++)
 		{
 			delete drawCall[draw];
+			drawCall[draw] = nullptr;
 		}
 		delete swiftConfig;
+		swiftConfig = nullptr;
 	}
 	// This object has to be mem aligned