paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-07 01:48:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

* simplify TThread.RemoveQueuedEvent - decide what to delete and not what to leave (better corresponds with the docs)

Browse Source 
git-svn-id: trunk@47011 -
This commit is contained in:
ondrej 2020-09-30 06:56:27 +00:00
parent 69fcacc948
commit 192bbc07f5
1 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
rtl/objpas/classes/classes.inc
View File

@ -602,42 +602,35 @@ begin
lastentry := Nil;
entry := ThreadQueueHead;
while Assigned(entry) do begin
{ first check for the thread }
if Assigned(aThread) and (entry^.Thread <> aThread) and (entry^.ThreadID <> aThread.ThreadID) then begin
lastentry := entry;
entry := entry^.Next;
Continue;
end;
{ then check for the method }
if Assigned(aMethod) and
if
{ only entries not added by Synchronize }
not Assigned(entry^.SyncEvent)
{ check for the thread }
and (not Assigned(aThread) or (entry^.Thread = aThread) or (entry^.ThreadID = aThread.ThreadID))
{ check for the method }
and (not Assigned(aMethod) or
(
(TMethod(entry^.Method).Code <> TMethod(aMethod).Code) or
(TMethod(entry^.Method).Data <> TMethod(aMethod).Data)
) then begin
(TMethod(entry^.Method).Code = TMethod(aMethod).Code) and
(TMethod(entry^.Method).Data = TMethod(aMethod).Data)
))
then begin
{ ok, we need to remove this entry }
tmpentry := entry;
if Assigned(lastentry) then
lastentry^.Next := entry^.Next;
entry := entry^.Next;
if ThreadQueueHead = tmpentry then
ThreadQueueHead := entry;
if ThreadQueueTail = tmpentry then
ThreadQueueTail := lastentry;
{ only dispose events added by Queue }
if not Assigned(tmpentry^.SyncEvent) then
Dispose(tmpentry);
end else begin
{ leave this entry }
lastentry := entry;
entry := entry^.Next;
Continue;
end;
{ skip entries added by Synchronize }
if Assigned(entry^.SyncEvent) then begin
lastentry := entry;
entry := entry^.Next;
Continue;
end;
{ ok, we need to remove this entry }
tmpentry := entry;
if Assigned(lastentry) then
lastentry^.Next := entry^.Next;
entry := entry^.Next;
if ThreadQueueHead = tmpentry then
ThreadQueueHead := entry;
if ThreadQueueTail = tmpentry then
ThreadQueueTail := lastentry;
{ only dispose events added by Queue }
if not Assigned(tmpentry^.SyncEvent) then
Dispose(tmpentry);
end;
{$ifdef FPC_HAS_FEATURE_THREADING}
finally