ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Reimplement condition variables on top of RtlWaitOnAddress(). 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46208
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-02-07 12:39:46 -06:00 committed by Alexandre Julliard
parent 9bbe5c3613
commit 954ed39584
1 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/ntdll/sync.c
View File

@ -1909,8 +1909,8 @@ void WINAPI RtlInitializeConditionVariable( RTL_CONDITION_VARIABLE *variable )
*/ */
void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable ) void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable )
{ {
if (interlocked_dec_if_nonzero( (int *)&variable->Ptr )) interlocked_xchg_add( (int *)&variable->Ptr, 1 );
NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL ); RtlWakeAddressSingle( variable );
} }
/*********************************************************************** /***********************************************************************
@ -1920,9 +1920,8 @@ void WINAPI RtlWakeConditionVariable( RTL_CONDITION_VARIABLE *variable )
*/ */
void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable ) void WINAPI RtlWakeAllConditionVariable( RTL_CONDITION_VARIABLE *variable )
{ {
int val = interlocked_xchg( (int *)&variable->Ptr, 0 ); interlocked_xchg_add( (int *)&variable->Ptr, 1 );
while (val-- > 0) RtlWakeAddressAll( variable );
NtReleaseKeyedEvent( 0, &variable->Ptr, FALSE, NULL );
} }
/*********************************************************************** /***********************************************************************
@ -1944,17 +1943,14 @@ NTSTATUS WINAPI RtlSleepConditionVariableCS( RTL_CONDITION_VARIABLE *variable, R
const LARGE_INTEGER *timeout ) const LARGE_INTEGER *timeout )
{ {
NTSTATUS status; NTSTATUS status;
interlocked_xchg_add( (int *)&variable->Ptr, 1 ); int val = *(int *)&variable->Ptr;
RtlLeaveCriticalSection( crit ); RtlLeaveCriticalSection( crit );
status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout ); status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout );
if (status != STATUS_SUCCESS)
{
if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr ))
status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL );
}
RtlEnterCriticalSection( crit ); RtlEnterCriticalSection( crit );
return status; return status;
} }
@ -1981,19 +1977,14 @@ NTSTATUS WINAPI RtlSleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable,
const LARGE_INTEGER *timeout, ULONG flags ) const LARGE_INTEGER *timeout, ULONG flags )
{ {
NTSTATUS status; NTSTATUS status;
interlocked_xchg_add( (int *)&variable->Ptr, 1 ); int val = *(int *)&variable->Ptr;
if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED)
RtlReleaseSRWLockShared( lock ); RtlReleaseSRWLockShared( lock );
else else
RtlReleaseSRWLockExclusive( lock ); RtlReleaseSRWLockExclusive( lock );
status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, timeout ); status = RtlWaitOnAddress( &variable->Ptr, &val, sizeof(int), timeout );
if (status != STATUS_SUCCESS)
{
if (!interlocked_dec_if_nonzero( (int *)&variable->Ptr ))
status = NtWaitForKeyedEvent( 0, &variable->Ptr, FALSE, NULL );
}
if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED) if (flags & RTL_CONDITION_VARIABLE_LOCKMODE_SHARED)
RtlAcquireSRWLockShared( lock ); RtlAcquireSRWLockShared( lock );