system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-05 17:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapted to event synchronization changes.

Browse source
This commit is contained in:
Ulrich Weigand 1999-05-22 18:58:36 +00:00 committed by Alexandre Julliard
parent 7581f85617
commit 8c2dc8b1b8
2 changed files with 20 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
loader/task.c
View file

@ -682,7 +682,6 @@ BOOL TASK_Reschedule(void)
TDB *pOldTask = NULL, *pNewTask;
HTASK16 hTask = 0;
STACK16FRAME *newframe16;
BOOL pending = FALSE;
/* Get the initial task up and running */
if (!hCurrentTask && GetCurrentTask())
@ -743,10 +742,6 @@ BOOL TASK_Reschedule(void)
pOldTask->hYieldTo = 0;
}
/* extract hardware events only! */
if (!hTask) pending = EVENT_WaitNetEvent( FALSE, TRUE );
while (!hTask)
{
/* Find a task that has an event pending */
@ -764,10 +759,6 @@ BOOL TASK_Reschedule(void)
if (hLockedTask && (hTask != hLockedTask)) hTask = 0;
if (hTask) break;
/* If a non-hardware event is pending, return to TASK_YieldToSystem
temporarily to process it safely */
if (pending) return TRUE;
/* No task found, wait for some events to come in */
/* NOTE: We release the Win16Lock while waiting for events. This is to enable
@ -776,7 +767,7 @@ BOOL TASK_Reschedule(void)
TASK_Reschedule anyway, there should be no re-entrancy problem ... */
SYSLEVEL_ReleaseWin16Lock();
pending = EVENT_WaitNetEvent( TRUE, TRUE );
EVENT_WaitNetEvent( );
SYSLEVEL_RestoreWin16Lock();
}
@ -850,24 +841,9 @@ static void TASK_YieldToSystem( void )
return;
}
if ( Callbacks->CallTaskRescheduleProc() )
{
/* NOTE: We get here only when no task has an event. This means also
the current task, so we shouldn't actually return to the
caller here. But, we need to do so, as the EVENT_WaitNetEvent
call could lead to a complex series of inter-task SendMessage
calls which might leave this task in a state where it again
has no event, but where its queue's wakeMask is also reset
to zero. Reentering TASK_Reschedule in this state would be
suicide. Hence, we do return to the caller after processing
non-hardware events. Actually, this should not hurt anyone,
as the caller must be WaitEvent, and thus the QUEUE_WaitBits
loop in USER. Should there actually be no message pending
for this task after processing non-hardware events, that loop
will simply return to WaitEvent. */
EVENT_WaitNetEvent( FALSE, FALSE );
}
EVENT_Synchronize( FALSE );
Callbacks->CallTaskRescheduleProc();
}

16
scheduler/synchro.c
View file

@ -13,6 +13,8 @@
#include "thread.h"
#include "winerror.h"
#include "syslevel.h"
#include "message.h"
#include "x11drv.h"
#include "server.h"
#include "debug.h"
@ -84,6 +86,20 @@ DWORD WINAPI WaitForMultipleObjectsEx( DWORD count, const HANDLE *handles,
return WAIT_FAILED;
}
/* FIXME: This is extremely ugly, but needed to avoid endless
* recursion due to EVENT_Synchronize itself using
* EnterCriticalSection( &X11DRV_CritSection ) ...
*/
if ( count == 0 || handles[0] != X11DRV_CritSection.LockSemaphore )
{
/* Before we might possibly block, we need to push outstanding
* graphics output to the X server ... This needs to be done
* here so that it also works with native USER.
*/
if ( timeout != 0 )
EVENT_Synchronize( FALSE );
}
for (i = 0; i < count; i++) server_handle[i] = handles[i];
req.count = count;