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

* Correct main/self thread functions

Browse Source
This commit is contained in:
Michael Van Canneyt 2025-02-07 16:44:23 +01:00
parent 665d91db48
commit b2adae02ca
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/wasi/src/rtl.threadcontroller.pas
View File

@ -74,7 +74,6 @@ Type
function thread_spawn(start_arg : longint) : longint; override; function thread_spawn(start_arg : longint) : longint; override;
Function thread_detach(thread_id : longint) : Integer; override; Function thread_detach(thread_id : longint) : Integer; override;
Function thread_cancel(thread_id : longint) : Integer; override; Function thread_cancel(thread_id : longint) : Integer; override;
Function thread_self() : Integer; override;
Protected Protected
FIdleWorkers : Array of TWasmThread; FIdleWorkers : Array of TWasmThread;
FBusyWorkers : Array of TWasmThread; FBusyWorkers : Array of TWasmThread;
@ -354,12 +353,6 @@ begin
Result:=-1; Result:=-1;
end; end;
function TThreadController.thread_self: Integer;
begin
Result:=-1;
end;
procedure TThreadController.SendLoadCommands; procedure TThreadController.SendLoadCommands;
Var Var

32
packages/wasi/src/rtl.webthreads.pas
View File

@ -292,9 +292,11 @@ Type
// Proposed WASI standard, modeled after POSIX pthreads. // Proposed WASI standard, modeled after POSIX pthreads.
function thread_spawn(start_arg : longint) : longint; virtual; abstract; function thread_spawn(start_arg : longint) : longint; virtual; abstract;
// These are extensions
Function thread_detach(thread_id : longint) : Integer; virtual; abstract; Function thread_detach(thread_id : longint) : Integer; virtual; abstract;
Function thread_cancel(thread_id : longint) : Integer; virtual; abstract; Function thread_cancel(thread_id : longint) : Integer; virtual; abstract;
Function thread_self() : Integer; virtual; abstract; Function thread_self() : Integer; virtual;
Function thread_main() : Integer; virtual;
Public Public
Function ImportName : String; override; Function ImportName : String; override;
procedure FillImportObject(aObject: TJSObject); override; procedure FillImportObject(aObject: TJSObject); override;
@ -498,6 +500,34 @@ end;
{ TWasmThreadSupport } { TWasmThreadSupport }
function TWasmThreadSupport.thread_self(): Integer;
Type
TGetThreadIDFunction = Function : Longint;
var
F : TGetThreadIDFunction;
begin
F:=TGetThreadIDFunction(InstanceExports['GetSelfThread']);
if Assigned(F) then
Result:=F()
else
Result:=0;
end;
function TWasmThreadSupport.thread_main: Integer;
Type
TGetThreadIDFunction = Function : Longint;
var
F : TGetThreadIDFunction;
begin
F:=TGetThreadIDFunction(InstanceExports['GetMainThread']);
if Assigned(F) then
Result:=F()
else
Result:=0;
end;
function TWasmThreadSupport.ImportName: String; function TWasmThreadSupport.ImportName: String;
begin begin
Result:='wasi'; Result:='wasi';

5
packages/wasi/src/wasiworkerthreadhost.pas
View File

@ -77,7 +77,6 @@ Type
function thread_spawn(start_arg : longint) : longint; override; function thread_spawn(start_arg : longint) : longint; override;
Function thread_detach(thread_id : Integer) : Integer; override; Function thread_detach(thread_id : Integer) : Integer; override;
Function thread_cancel(thread_id : Integer) : Integer; override; Function thread_cancel(thread_id : Integer) : Integer; override;
Function thread_self() : Integer; override;
Public Public
// Handle incoming command // Handle incoming command
Procedure HandleCommand(aCommand : TWorkerCommand); override; Procedure HandleCommand(aCommand : TWorkerCommand); override;
@ -332,10 +331,6 @@ begin
if thread_id=0 then ; if thread_id=0 then ;
end; end;
function TWorkerThreadSupport.thread_self: Integer;
begin
Result:=0;
end;
procedure TWorkerThreadSupport.SendLoaded; procedure TWorkerThreadSupport.SendLoaded;