Merge pull request #983 from lukaszstolarczuk/merge-stable-1.9-into-stable-1.10

Merge stable-1.9 into stable-1.10

Author: Szymon Romik

.github/workflows/gha.yml

@@ -69,8 +69,7 @@ jobs:
         CONFIG: [Debug, Release]
     steps:
        - name: Update PATH
-         run: |
-           echo "::add-path::$Env:MSBUILD"
+         run: echo "${env:MSBUILD}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
        - name: Cache vcpkg packages
          uses: actions/cache@v1

tests/common/thread_helpers.hpp

@@ -35,13 +35,14 @@ parallel_xexec(size_t concurrency, Function f)
 {
 	std::condition_variable cv;
 	std::mutex m;
-	size_t counter = 0;
+	std::unique_ptr<size_t> counter =
+		std::unique_ptr<size_t>(new size_t(0));
 
 	auto syncthreads = [&] {
 		std::unique_lock<std::mutex> lock(m);
-		counter++;
-		if (counter < concurrency)
-			cv.wait(lock);
+		(*counter)++;
+		if (*counter < concurrency)
+			cv.wait(lock, [&] { return *counter >= concurrency; });
 		else
 			/*
 			 * notify_call could be called outside of a lock