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

* Call InitHeap before InitSystemThreads in TLS callback (necessary because InitSystemThreads calls RelocateHeap), and skip both of them in initialization section of system.pp if they have been called from TLS callback. This restores correct initialization sequence which was broken by r19779, resulting in lots of debug messages about corrupted heap when running tests/test/theapthread.pp

Browse Source 
git-svn-id: trunk@19836 -
This commit is contained in:
sergei 2011-12-13 07:40:02 +00:00
parent 470adb22e1
commit bcbd25568e
4 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/inc/heap.inc
View File

@ -1510,7 +1510,7 @@ begin
end;
{$endif}
procedure InitHeap;
procedure InitHeap; public name '_FPC_InitHeap';
var
loc_freelists: pfreelists;
begin

6
rtl/win/systlsdir.inc
View File

@ -47,6 +47,7 @@ function TlsGetValue(dwTlsIndex : DWord) : pointer; stdcall;
procedure InitSystemThreads; external name '_FPC_InitSystemThreads';
procedure SysAllocateThreadVars; external name '_FPC_SysAllocateThreadVars';
procedure InitHeap; external name '_FPC_InitHeap';
{$endif FPC_INSSIDE_SYSINIT}
procedure Exec_Tls_callback(Handle : pointer; reason : Dword; Reserved : pointer);
@ -68,7 +69,10 @@ procedure Exec_Tls_callback(Handle : pointer; reason : Dword; Reserved : pointer
Exec_Tls_Callback is now part of sysinit unit for win32
and the EntryInformation is a constant which sholud prevent troubles }
EXEC_PROCESS_ATTACH:
InitSystemThreads;
begin
InitHeap;
InitSystemThreads;
end;
EXEC_THREAD_ATTACH :
begin

10
rtl/win32/system.pp
View File

@ -686,8 +686,12 @@ begin
StackBottom := StackTop - StackLength;
cmdshow:=startupinfo.wshowwindow;
{ Setup heap }
InitHeap;
{ Setup heap and threading, these may be already initialized from TLS callback }
if not Assigned(CurrentTM.BeginThread) then
begin
InitHeap;
InitSystemThreads;
end;
SysInitExceptions;
{ setup fastmove stuff }
fpc_cpucodeinit;
@ -700,8 +704,6 @@ begin
{ Reset IO Error }
InOutRes:=0;
ProcessID := GetCurrentProcessID;
{ threading }
InitSystemThreads;
{ Reset internal error variable }
errno:=0;
initvariantmanager;

10
rtl/win64/system.pp
View File

@ -584,8 +584,12 @@ begin
SysInstance:=getmodulehandle(nil);
MainInstance:=SysInstance;
cmdshow:=startupinfo.wshowwindow;
{ Setup heap }
InitHeap;
{ Setup heap and threading, these may be already initialized from TLS callback }
if not Assigned(CurrentTM.BeginThread) then
begin
InitHeap;
InitSystemThreads;
end;
SysInitExceptions;
{ setup fastmove stuff }
fpc_cpucodeinit;
@ -598,8 +602,6 @@ begin
{ Reset IO Error }
InOutRes:=0;
ProcessID := GetCurrentProcessID;
{ threading }
InitSystemThreads;
{ Reset internal error variable }
errno:=0;
initvariantmanager;