From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 53B34158020 for ; Sat, 10 Dec 2022 12:25:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 31D81E0843; Sat, 10 Dec 2022 12:25:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 18437E0837 for ; Sat, 10 Dec 2022 12:25:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 08F5D340DFB for ; Sat, 10 Dec 2022 12:25:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 407BA77D for ; Sat, 10 Dec 2022 12:25:12 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1670675030.33a2735a8a6e04a7f7a739c036cfbbc655e2b286.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtconcurrent/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtconcurrent/files/qtconcurrent-5.15.5-fix-race-conditions.patch X-VCS-Directories: dev-qt/qtconcurrent/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 33a2735a8a6e04a7f7a739c036cfbbc655e2b286 X-VCS-Branch: master Date: Sat, 10 Dec 2022 12:25:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 637ffc52-eb20-4e8c-a4d7-4fcd086abe71 X-Archives-Hash: 892ddf3918fb578c2a467e68b5ffabc7 commit: 33a2735a8a6e04a7f7a739c036cfbbc655e2b286 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 10 12:17:23 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 10 12:23:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33a2735a dev-qt/qtconcurrent: Drop obsolete patch Signed-off-by: Andreas Sturmlechner gentoo.org> .../qtconcurrent-5.15.5-fix-race-conditions.patch | 41 ---------------------- 1 file changed, 41 deletions(-) diff --git a/dev-qt/qtconcurrent/files/qtconcurrent-5.15.5-fix-race-conditions.patch b/dev-qt/qtconcurrent/files/qtconcurrent-5.15.5-fix-race-conditions.patch deleted file mode 100644 index c16da19a507d..000000000000 --- a/dev-qt/qtconcurrent/files/qtconcurrent-5.15.5-fix-race-conditions.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 33ed9a414da190ffa8099856901df792ff9150d5 Mon Sep 17 00:00:00 2001 -From: Sona Kurazyan -Date: Mon, 18 Jul 2022 14:46:24 +0200 -Subject: [PATCH] QtConcurrent::ReduceKernel: fix race conditions - -resultsMapSize is modified inside the runReduce() method, and the -writes are protected via mutex lock. However, reads of resultsMapSize -through shouldThrottle()/shouldStartThread() (that can be called by -multiple threads) are done without a lock. Added the missing locks. - -Task-number: QTBUG-104787 -Pick-to: 6.4 6.3 6.2 5.15 -Change-Id: I700e7b66e67025bc7f570bc8ad69409b82675049 -Reviewed-by: Jarek Kobus -Reviewed-by: Marc Mutz -(cherry picked from commit 7afb093dd77f0ed9a1b4145d2d279810aba411c7) ---- - src/concurrent/qtconcurrentreducekernel.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/concurrent/qtconcurrentreducekernel.h b/src/concurrent/qtconcurrentreducekernel.h -index 8f9a938952..a98dedef2e 100644 ---- a/src/concurrent/qtconcurrentreducekernel.h -+++ b/src/concurrent/qtconcurrentreducekernel.h -@@ -212,11 +212,13 @@ public: - - inline bool shouldThrottle() - { -+ std::lock_guard locker(mutex); - return (resultsMapSize > (ReduceQueueThrottleLimit * threadCount)); - } - - inline bool shouldStartThread() - { -+ std::lock_guard locker(mutex); - return (resultsMapSize <= (ReduceQueueStartLimit * threadCount)); - } - }; --- -GitLab -