paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-28 22:20:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

rtl: fix compilation under windows

Browse Source 
git-svn-id: trunk@14590 -
This commit is contained in:
paul 2010-01-10 06:28:50 +00:00
parent f52e88dfe8
commit 538cf8667b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rtl/objpas/sysutils/sysuthrd.inc
View File

@ -59,7 +59,7 @@ end;
destructor TMultiReadExclusiveWriteSynchronizer.Destroy; destructor TMultiReadExclusiveWriteSynchronizer.Destroy;
begin begin
InterlockedExchange(fwritelocked,0); System.InterlockedExchange(fwritelocked,0);
RtlEventDestroy(fwritelock); RtlEventDestroy(fwritelock);
RtlEventDestroy(fwaitingwriterlock); RtlEventDestroy(fwaitingwriterlock);
BasicEventDestroy(freaderqueue); BasicEventDestroy(freaderqueue);
@ -81,14 +81,14 @@ begin
concurrent readers) } concurrent readers) }
BasicEventResetEvent(freaderqueue); BasicEventResetEvent(freaderqueue);
{ for quick checking by candidate-readers } { for quick checking by candidate-readers }
InterlockedExchange(fwritelocked,1); System.InterlockedExchange(fwritelocked,1);
{ wait until all readers are gone -- freadercount and fwritelocked are only { wait until all readers are gone -- freadercount and fwritelocked are only
accessed using atomic operations (that's why we use accessed using atomic operations (that's why we use
InterLockedExchangeAdd(x,0) below) -> always in-order. The writer always InterLockedExchangeAdd(x,0) below) -> always in-order. The writer always
first sets fwritelocked and then checks freadercount, while the readers first sets fwritelocked and then checks freadercount, while the readers
always first increase freadercount and then check fwritelocked } always first increase freadercount and then check fwritelocked }
while (InterLockedExchangeAdd(freadercount,0)<>0) do while (System.InterLockedExchangeAdd(freadercount,0)<>0) do
RTLEventWaitFor(fwaitingwriterlock); RTLEventWaitFor(fwaitingwriterlock);
{ we have the writer lock, and all readers are gone } { we have the writer lock, and all readers are gone }
@ -103,7 +103,7 @@ begin
WriteBarrier; WriteBarrier;
{ signal potential readers that the coast is clear } { signal potential readers that the coast is clear }
InterlockedExchange(fwritelocked,0); System.InterlockedExchange(fwritelocked,0);
{ wake up waiting readers (if any); do not check first whether freadercount { wake up waiting readers (if any); do not check first whether freadercount
is <> 0, because the InterlockedDecrement in the while loop of BeginRead is <> 0, because the InterlockedDecrement in the while loop of BeginRead
can have already occurred, so a single reader may be about to wait on can have already occurred, so a single reader may be about to wait on
@ -122,20 +122,20 @@ Const
wrAbandoned= 2; wrAbandoned= 2;
wrError = 3; wrError = 3;
begin begin
InterlockedIncrement(freadercount); System.InterlockedIncrement(freadercount);
{ wait until there is no more writer } { wait until there is no more writer }
while InterLockedExchangeAdd(fwritelocked,0)<>0 do while System.InterLockedExchangeAdd(fwritelocked,0)<>0 do
begin begin
{ there's a writer busy or wanting to start -> wait until it's { there's a writer busy or wanting to start -> wait until it's
finished; a writer may already be blocked in the mean time, so finished; a writer may already be blocked in the mean time, so
wake it up if we're the last to go to sleep } wake it up if we're the last to go to sleep }
if InterlockedDecrement(freadercount)=0 then if System.InterlockedDecrement(freadercount)=0 then
RTLEventSetEvent(fwaitingwriterlock); RTLEventSetEvent(fwaitingwriterlock);
if (BasicEventWaitFor(high(cardinal),freaderqueue) in [wrAbandoned,wrError]) then if (BasicEventWaitFor(high(cardinal),freaderqueue) in [wrAbandoned,wrError]) then
raise Exception.create('BasicEventWaitFor failed in TMultiReadExclusiveWriteSynchronizer.Beginread'); raise Exception.create('BasicEventWaitFor failed in TMultiReadExclusiveWriteSynchronizer.Beginread');
{ and try again: first increase freadercount, only then check { and try again: first increase freadercount, only then check
fwritelocked } fwritelocked }
InterlockedIncrement(freadercount); System.InterlockedIncrement(freadercount);
end; end;
end; end;
@ -152,7 +152,7 @@ begin
the freadercount, first modifying freadercount and then checking fwritelock the freadercount, first modifying freadercount and then checking fwritelock
ensures that we cannot miss one of the events regardless of execution ensures that we cannot miss one of the events regardless of execution
order. } order. }
if (InterlockedDecrement(freadercount)=0) and if (System.InterlockedDecrement(freadercount)=0) and
(InterLockedExchangeAdd(fwritelocked,0)<>0) then (System.InterLockedExchangeAdd(fwritelocked,0)<>0) then
RTLEventSetEvent(fwaitingwriterlock); RTLEventSetEvent(fwaitingwriterlock);
end; end;