paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-10 23:49:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

* check once more whether we can lock after we've waited

Browse Source 
for the entire timeout in IntbasiceventWaitFor

git-svn-id: trunk@8259 -
This commit is contained in:
Jonas Maebe 2007-08-11 08:07:44 +00:00
parent 5bcda6d18a
commit ef801ba3a3
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rtl/unix/cthreads.pp
View File

@ -735,6 +735,7 @@ var
timespec, timetemp, timeleft: ttimespec;
nanores, nanoerr: cint;
twres: TTryWaitResult;
lastloop: boolean;
begin
{ safely check whether we are being destroyed, if so immediately return. }
{ otherwise (under the same mutex) increase the number of waiters }
@ -780,6 +781,7 @@ begin
if (i = loopcnt) then
timespec.tv_nsec:=(timeout mod 500) * 1000000;
timetemp:=timespec;
lastloop:=false;
{ every time our sleep is interrupted for whatever reason, }
{ also check whether the semaphore has been posted in the }
{ mean time }
@ -806,12 +808,16 @@ begin
break;
end;
end;
if (lastloop) then
break;
nanores:=fpnanosleep(@timetemp,@timeleft);
nanoerr:=fpgeterrno;
timetemp:=timeleft;
{ loop until 1) we slept complete interval; 2) an error occurred; }
{ 3) we're being destroyed }
until (nanores=0) or ((nanores<>0) and (nanoerr<>ESysEINTR)) or plocaleventstate(state)^.FDestroying;
lastloop:=(i=loopcnt);
{ loop until 1) we slept complete interval (except if last for-loop }
{ in which case we try to lock once more); 2) an error occurred; }
{ 3) we're being destroyed }
until ((nanores=0) and not lastloop) or ((nanores<>0) and (nanoerr<>ESysEINTR)) or plocaleventstate(state)^.FDestroying;
{ adjust result for error or being destroyed }
if (nanores <> 0) then
result := wrError