diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-12-10 15:20:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-10 15:20:44 +0000 |
| commit | 177349fb1459039cc30cb8e3936af4117d038c16 (patch) | |
| tree | 34c1bc161daefb8e152212dfba02b98da8a777a5 /dev-qt/qtconcurrent | |
| parent | c15acf374d4b25ba5afcb52435da6090f2d98a20 (diff) | |
gentoo auto-resync : 10:12:2022 - 15:20:44
Diffstat (limited to 'dev-qt/qtconcurrent')
| -rw-r--r-- | dev-qt/qtconcurrent/Manifest | 1 | ||||
| -rw-r--r-- | dev-qt/qtconcurrent/files/qtconcurrent-5.15.5-fix-race-conditions.patch | 41 |
2 files changed, 0 insertions, 42 deletions
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest index 0a3f29a787e9..aa9258b063c4 100644 --- a/dev-qt/qtconcurrent/Manifest +++ b/dev-qt/qtconcurrent/Manifest @@ -1,4 +1,3 @@ -AUX qtconcurrent-5.15.5-fix-race-conditions.patch 1469 BLAKE2B 2504338fe36c1b2c4c8b82da124b2335db816342c63a42ce3d1c8933cbe0f945de18aeb7e014718f52974de6fb890424e6ec620e4664f4902d86740067e3f786 SHA512 ad1a6084d26b67e7135f78d09ca56da737ede6e587821d01527513e1a1f4759c5091e6357899b00a6c757502079af314899d082306a321726318d15303875887 DIST qtbase-5.15-gentoo-patchset-2.tar.xz 3844 BLAKE2B 6dcb69398cf8a6b1be737e8c7bf1041529c4e704ca892cef10ba3bc5ce435c903607b64e981cf8aa12c785b3e423aa1d52bce1f67ec1bd8dbb1421dfb6f62700 SHA512 b7fd7e17bcab2f9803c7bfc0473082ee4640299c23ce8da943ef80ed181e880ebc9157bcebde28077e80e6f907aa14a59c42416b3e32f49baebd54fbe5a37497 DIST qtbase-5.15.7-gentoo-kde-1.tar.xz 798056 BLAKE2B 3c7fefa65ab6de25c2c82261ad0f1371e32acd4bd4b3303f20a5ebf36d19690df94290d102c65e4941a6c51a5d5f2db0253bafca5ac85cf480f7434405cb2671 SHA512 20ab17220489009c98d7f783a02614507e157974c7cb16f47d50d3954ccd1cd065562effc393df6e07c9ba6ad8ccd4e6b3f0bf5b5b890183b8631b8b570bf064 DIST qtbase-everywhere-opensource-src-5.15.7.tar.xz 50260196 BLAKE2B 69029a910af0e3bfe742b5870334406e03274b0677ef47f9c7c10f730ff031bae49bd21a686497215505b19a183ca395c275d8afefaaa903125297f8e693bb4d SHA512 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343 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 <sona.kurazyan@qt.io> -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 <jaroslaw.kobus@qt.io> -Reviewed-by: Marc Mutz <marc.mutz@qt.io> -(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<QMutex> locker(mutex); - return (resultsMapSize > (ReduceQueueThrottleLimit * threadCount)); - } - - inline bool shouldStartThread() - { -+ std::lock_guard<QMutex> locker(mutex); - return (resultsMapSize <= (ReduceQueueStartLimit * threadCount)); - } - }; --- -GitLab - |