From ad2ee34f56f2d14bf0ccfbc43dce72a5add661a9 Mon Sep 17 00:00:00 2001
From: Michael Van Canneyt <michael@freepascal.org>
Date: Wed, 12 Feb 2025 09:19:11 +0100
Subject: [PATCH] * Sendcommandtothread

---
 packages/wasi/src/rtl.threadcontroller.pas | 31 +++++++++-------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/packages/wasi/src/rtl.threadcontroller.pas b/packages/wasi/src/rtl.threadcontroller.pas
index 63163f9..a3eb281 100644
--- a/packages/wasi/src/rtl.threadcontroller.pas
+++ b/packages/wasi/src/rtl.threadcontroller.pas
@@ -27,12 +27,10 @@ Type
     function GetLoaded: Boolean;
     function GetLoadSent: Boolean;
     function GetThreadID: Integer;
-    function GetThreadIDRange: Integer;
     function GetThreadInfo: TThreadinfo;
     procedure SetLoaded(AValue: Boolean);
     procedure SetLoadSent(AValue: Boolean);
     procedure SetThreadID(AValue: Integer);
-    procedure SetThreadIDRange(AValue: Integer);
     procedure SetThreadInfo(AValue: TThreadinfo);
   Public
     Class function Create(aScript : String) : TWasmThread; reintroduce; static;
@@ -41,7 +39,6 @@ Type
     Property Loaded : Boolean Read GetLoaded Write SetLoaded;
     Property ThreadInfo : TThreadinfo Read GetThreadInfo Write SetThreadInfo;
     Property ThreadID : Integer Read GetThreadID Write SetThreadID;
-    Property ThreadIDRange : Integer Read GetThreadIDRange Write SetThreadIDRange;
   end;
 
 
@@ -113,6 +110,8 @@ Type
     procedure SendLoadCommands;
     // Send a command to all workers
     procedure SendCommandToAllWorkers(aCommand : TWorkerCommand);
+    // Send a command to a specific thread. TWorkerCommand has the thread ID.
+    procedure SendCommandToThread(aCommand : TWorkerCommand);
     // Name of worker script
     Property WorkerScript : String Read FWorkerScript;
     // Initial number of threads, set by constructor
@@ -140,7 +139,6 @@ begin
   Result.ThreadID:=-1;
   Result.Loaded:=False;
   Result.LoadSent:=False;
-  Result.ThreadIDRange:=-1;
   Result.ThreadInfo:=Default(TThreadInfo);
 end;
 
@@ -172,16 +170,6 @@ begin
   Result:=ThreadInfo.ThreadID;
 end;
 
-function TWasmThreadHelper.GetThreadIDRange: Integer;
-Var
-  S : JSValue;
-begin
-  S:=Properties['FThreadIDRange'];
-  if isNumber(S) then
-    Result:=Integer(S)
-  else
-    Result:=0;
-end;
 
 function TWasmThreadHelper.GetThreadInfo: TThreadinfo;
 Var
@@ -211,10 +199,6 @@ begin
   ThreadInfo.ThreadID:=aValue;
 end;
 
-procedure TWasmThreadHelper.SetThreadIDRange(AValue: Integer);
-begin
-  Properties['FThreadIDRange']:=aValue
-end;
 
 procedure TWasmThreadHelper.SetThreadInfo(AValue: TThreadinfo);
 begin
@@ -278,7 +262,7 @@ Var
   WLC: TWorkerLoadCommand;
 
 begin
-  WLC:=TWorkerLoadCommand.Create(aThreadWorker.ThreadIDRange, Host.PreparedStartDescriptor.Module, Host.PreparedStartDescriptor.Memory);
+  WLC:=TWorkerLoadCommand.Create(Host.PreparedStartDescriptor.Module, Host.PreparedStartDescriptor.Memory);
   aThreadWorker.SendCommand(WLC);
   aThreadWorker.LoadSent:=True;
 end;
@@ -379,6 +363,15 @@ begin
     WT.postMessage(aCommand);
 end;
 
+procedure TThreadController.SendCommandToThread(aCommand: TWorkerCommand);
+var
+  W : TJSWorker;
+begin
+  W:=TJSWorker(FThreads[aCommand.ThreadID]);
+  if Assigned(W) then
+    W.postMessage(aCommand);
+end;
+
 procedure TThreadController.RunTimeOut(aInfo: TThreadInfo; aInterval: Integer);
 
 var