[*] WaitMultipleLoopSourcesEx (any) fixes
This commit is contained in:
parent
634eb35959
commit
e62a99777f
@ -126,15 +126,27 @@ namespace Aurora::IO::Loop
|
||||
AuUInt lastHandle {};
|
||||
bool wasTriggered {};
|
||||
|
||||
// first handle in group
|
||||
for (const auto &handle : source->GetHandles())
|
||||
if (source->Singular())
|
||||
{
|
||||
auto handle = source->GetHandle();
|
||||
if ((firstTriggered == handle) ||
|
||||
(bAllowOthers && WaitForSingleObject(reinterpret_cast<HANDLE>(handle), 0) == WAIT_OBJECT_0))
|
||||
{
|
||||
lastHandle = handle;
|
||||
wasTriggered = true;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (const auto &handle : source->GetHandles())
|
||||
{
|
||||
if ((firstTriggered == handle) ||
|
||||
(bAllowOthers && WaitForSingleObject(reinterpret_cast<HANDLE>(handle), 0) == WAIT_OBJECT_0))
|
||||
{
|
||||
lastHandle = handle;
|
||||
wasTriggered = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -375,46 +375,50 @@ namespace Aurora::IO::Loop
|
||||
{
|
||||
bZeroTick |= bool(signalTemp.size());
|
||||
AuUInt32 uTimeoutMS {};
|
||||
|
||||
if (uTimeoutEnd)
|
||||
{
|
||||
auto uStartTime = Time::SteadyClockNS();
|
||||
if (uStartTime >= uTimeoutEnd)
|
||||
{
|
||||
bZeroTick = true;
|
||||
}
|
||||
|
||||
uTimeoutMS = AuNSToMS<AuInt64>(uTimeoutEnd - uStartTime);
|
||||
if (!uTimeoutMS)
|
||||
{
|
||||
bZeroTick = true;
|
||||
}
|
||||
}
|
||||
|
||||
bool bTooMany {};
|
||||
#if defined(AURORA_IS_MODERNNT_DERIVED)
|
||||
if (AuBuild::kCurrentVendor == AuBuild::EVendor::eGenericMicrosoft &&
|
||||
lsList2.size() < MAXIMUM_WAIT_OBJECTS)
|
||||
|
||||
do
|
||||
{
|
||||
signaled = WaitMultipleOrObjects(lsList2, bZeroTick, uTimeoutMS, bAllowOthers, bTooMany);
|
||||
bTimedout = uTimeoutEnd && uTimeoutMS && !bZeroTick ?
|
||||
Time::SteadyClockNS() >= uTimeoutEnd :
|
||||
false;
|
||||
}
|
||||
else
|
||||
#elif defined(AURORA_IS_POSIX_DERIVED)
|
||||
if (true)
|
||||
{
|
||||
signaled = WaitMultipleOrObjects(lsList2, bZeroTick, uTimeoutMS, bAllowOthers, bTooMany);
|
||||
bTimedout = uTimeoutEnd && uTimeoutMS && !bZeroTick ?
|
||||
Time::SteadyClockNS() >= uTimeoutEnd :
|
||||
false;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
bTooMany = true;
|
||||
if (uTimeoutEnd)
|
||||
{
|
||||
auto uStartTime = Time::SteadyClockNS();
|
||||
if (uStartTime >= uTimeoutEnd)
|
||||
{
|
||||
bZeroTick = true;
|
||||
}
|
||||
|
||||
uTimeoutMS = AuNSToMS<AuInt64>(uTimeoutEnd - uStartTime);
|
||||
if (!uTimeoutMS)
|
||||
{
|
||||
bZeroTick = true;
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(AURORA_IS_MODERNNT_DERIVED)
|
||||
if (AuBuild::kCurrentVendor == AuBuild::EVendor::eGenericMicrosoft &&
|
||||
lsList2.size() < MAXIMUM_WAIT_OBJECTS)
|
||||
{
|
||||
signaled = WaitMultipleOrObjects(lsList2, bZeroTick, uTimeoutMS, bAllowOthers, bTooMany);
|
||||
bTimedout = uTimeoutEnd && uTimeoutMS && !bZeroTick ?
|
||||
Time::SteadyClockNS() >= uTimeoutEnd :
|
||||
false;
|
||||
}
|
||||
else
|
||||
#elif defined(AURORA_IS_POSIX_DERIVED)
|
||||
if (true)
|
||||
{
|
||||
signaled = WaitMultipleOrObjects(lsList2, bZeroTick, uTimeoutMS, bAllowOthers, bTooMany);
|
||||
bTimedout = uTimeoutEnd && uTimeoutMS && !bZeroTick ?
|
||||
Time::SteadyClockNS() >= uTimeoutEnd :
|
||||
false;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
bTooMany = true;
|
||||
}
|
||||
}
|
||||
while (!bTimedout && !bTooMany && signaled.empty());
|
||||
|
||||
if (bTooMany)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user