tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-23 01:38:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make IoEngine#m_CpuBoundSemaphore unsigned

Browse Source
This commit is contained in:
Alexander A. Klimov 2025-08-25 15:04:17 +02:00
parent df899b6cfe
commit cb6d9d4d80
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/base/io-engine.cpp
View File

@ -77,10 +77,10 @@ bool CpuBoundWork::TryAcquireSlot()
auto& ie (IoEngine::Get()); auto& ie (IoEngine::Get());
auto freeSlots (ie.m_CpuBoundSemaphore.load()); auto freeSlots (ie.m_CpuBoundSemaphore.load());
while (freeSlots > 0) { while (freeSlots > 0u) {
// If ie.m_CpuBoundSemaphore was changed after the last load, // If ie.m_CpuBoundSemaphore was changed after the last load,
// compare_exchange_weak() will load its latest value into freeSlots for us to retry until... // compare_exchange_weak() will load its latest value into freeSlots for us to retry until...
if (ie.m_CpuBoundSemaphore.compare_exchange_weak(freeSlots, freeSlots - 1)) { if (ie.m_CpuBoundSemaphore.compare_exchange_weak(freeSlots, freeSlots - 1u)) {
// ... either we successfully decrement ie.m_CpuBoundSemaphore by one, ... // ... either we successfully decrement ie.m_CpuBoundSemaphore by one, ...
return true; return true;
} }
@ -106,7 +106,7 @@ void CpuBoundWork::Done()
// The constructor takes the slow path only if the semaphore is full, // The constructor takes the slow path only if the semaphore is full,
// so we only have to wake up constructors if the semaphore was full. // so we only have to wake up constructors if the semaphore was full.
// This works because after fetch_add(), TryAcquireSlot() (fast path) will succeed. // This works because after fetch_add(), TryAcquireSlot() (fast path) will succeed.
if (ie.m_CpuBoundSemaphore.fetch_add(1) == 0) { if (ie.m_CpuBoundSemaphore.fetch_add(1) == 0u) {
// So now there are only slow path subscribers from just before the fetch_add() to be woken up. // So now there are only slow path subscribers from just before the fetch_add() to be woken up.
// Precisely, only subscribers from just before the fetch_add() which turned 0 to 1. // Precisely, only subscribers from just before the fetch_add() which turned 0 to 1.

2
lib/base/io-engine.hpp
View File

@ -157,7 +157,7 @@ private:
std::vector<std::thread> m_Threads; std::vector<std::thread> m_Threads;
boost::asio::deadline_timer m_AlreadyExpiredTimer; boost::asio::deadline_timer m_AlreadyExpiredTimer;
std::atomic_int_fast32_t m_CpuBoundSemaphore; std::atomic_uint_fast32_t m_CpuBoundSemaphore;
std::mutex m_CpuBoundWaitingMutex; std::mutex m_CpuBoundWaitingMutex;
std::vector<std::pair<boost::asio::io_context::strand, Shared<AsioConditionVariable>::Ptr>> m_CpuBoundWaiting; std::vector<std::pair<boost::asio::io_context::strand, Shared<AsioConditionVariable>::Ptr>> m_CpuBoundWaiting;
}; };