From 4095882662ef31cb3c40791045cc4d7fe21b74b9 Mon Sep 17 00:00:00 2001 From: Michael Van Canneyt Date: Thu, 23 Jan 2025 11:35:23 +0100 Subject: [PATCH] * Fix compiler warnings/hints --- packages/wasi/src/rtl.threadcontroller.pas | 39 +++++----------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/packages/wasi/src/rtl.threadcontroller.pas b/packages/wasi/src/rtl.threadcontroller.pas index a430f74..a491bb2 100644 --- a/packages/wasi/src/rtl.threadcontroller.pas +++ b/packages/wasi/src/rtl.threadcontroller.pas @@ -8,9 +8,9 @@ interface uses {$IFDEF FPC_DOTTEDUNITS} - JSApi.JS, System.Classes, System.SysUtils, System.WebThreads, Wasi.Env, BrowserApi.WebOrWorker; + JSApi.JS, System.SysUtils, System.WebThreads, Wasi.Env, BrowserApi.WebOrWorker; {$ELSE} - JS, Classes, SysUtils, Rtl.WebThreads, wasienv, weborworker; + JS, SysUtils, Rtl.WebThreads, wasienv, weborworker; {$ENDIF} @@ -130,9 +130,6 @@ implementation Resourcestring SErrMaxWorkersReached = 'Cannot create thread worker, Maximum number of workers (%d) reached.'; -var - Self_ : TWindowOrWorkerGlobalScope; external name 'self'; - { TWasmThread } @@ -343,11 +340,13 @@ end; function TThreadController.thread_detach(thread_id: longint): Integer; begin + if thread_id=-1 then; Result:=-1; end; function TThreadController.thread_cancel(thread_id: longint): Integer; begin + if thread_id=-1 then; Result:=-1; end; @@ -388,36 +387,10 @@ function TThreadController.SpawnThread(aInfo: TThreadInfo): Integer; Var WT : TWasmThread; - lInterval : NativeInt; - TryCount : Integer; - - Procedure TryRunCommand; - - var - E : Exception; - - begin - Writeln('TryRunCommand called'); - if WT.Loaded then - begin - self_.clearInterval(lInterval); - SendRunCommand(WT); - end - else - begin - inc(TryCount); - if TryCount>20 then - begin - self_.clearInterval(lInterval); - RunTimeOut(aInfo,100*TryCount); - end; - end; - end; begin // Writeln('Enter TThreadController.SpawnThread for ID ',aInfo.ThreadID); - TryCount:=0; WT:=GetNewWorker; if WT=nil then begin @@ -468,12 +441,14 @@ end; procedure TThreadController.HandleKillCommand(aWorker : TWasmThread; aCommand: TWorkerKillCommand); begin + if (aWorker<>Nil) and (aCommand<>Nil) then ; // todo end; procedure TThreadController.HandleCancelCommand(aWorker : TWasmThread; aCommand: TWorkerCancelCommand); begin + if (aWorker<>Nil) and (aCommand<>Nil) then ; // todo end; @@ -486,6 +461,7 @@ begin if aWorker.ThreadID>0 then SendRunCommand(aWorker); // Writeln('Host: exiting TThreadController.HandleLoadedCommand'); + if (aCommand<>Nil) then ; end; procedure TThreadController.HandleCleanupCommand(aWorker : TWasmThread; aCommand: TWorkerCleanupCommand); @@ -501,6 +477,7 @@ begin Idx:=TJSarray(FIdleWorkers).indexOf(aWorker); if Idx=-1 then FIdleWorkers:=Concat(FIdleWorkers,[aWorker]); + if (aCommand<>Nil) then ; end; procedure TThreadController.HandleConsoleCommand(aWorker : TWasmThread; aCommand: TWorkerConsoleCommand);