ShuriZma
/
FPPS4
mirror of https://github.com/red-prig/fpPS4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

+

This commit is contained in:
red-prig 2023-03-07 19:30:36 +03:00
parent f2bf574e21
commit 13d96a7142
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/ps4_pthread.pas
View File

@ -30,7 +30,7 @@ function ps4_pthread_equal(t1,t2:pthread):Integer; SysV_ABI_CDecl;
procedure ps4_scePthreadExit(value_ptr:Pointer); SysV_ABI_CDecl; procedure ps4_scePthreadExit(value_ptr:Pointer); SysV_ABI_CDecl;
procedure ps4_pthread_exit(value_ptr:Pointer); SysV_ABI_CDecl; procedure ps4_pthread_exit(value_ptr:Pointer); SysV_ABI_CDecl;
function ps4_scePthreadCancel(_pthread:pthread):Integer; SysV_ABI_CDecl; function ps4_scePthreadCancel(_pthread:pthread):Integer; SysV_ABI_CDecl;
function ps4_pthread_setcancelstate(state:Integer;oldstate:PInteger):Integer; SysV_ABI_CDecl; function ps4_pthread_setcancelstate(state:Integer;oldstate:PInteger):Integer; SysV_ABI_CDecl;
function ps4_pthread_setcanceltype (_type:Integer;oldtype:PInteger):Integer; SysV_ABI_CDecl; function ps4_pthread_setcanceltype (_type:Integer;oldtype:PInteger):Integer; SysV_ABI_CDecl;
@ -99,7 +99,10 @@ uses
procedure _free_pthread(data:pthread); procedure _free_pthread(data:pthread);
begin begin
_sig_lock; _sig_lock;
System.CloseThread(data^.handle); if (data^.handle<>0) then
begin
System.CloseThread(data^.handle);
end;
FreeMem(data); FreeMem(data);
_sig_unlock; _sig_unlock;
end; end;
@ -444,6 +447,7 @@ begin
if _pthread=nil then if _pthread=nil then
Exit(SCE_KERNEL_ERROR_ESRCH); Exit(SCE_KERNEL_ERROR_ESRCH);
Writeln(SysLogPrefix, 'scePthreadCancel'); Writeln(SysLogPrefix, 'scePthreadCancel');
//Dirty thread termination
if CAS(_pthread^.detachstate,PTHREAD_CREATE_DETACHED,_PREPARE_FREE) then if CAS(_pthread^.detachstate,PTHREAD_CREATE_DETACHED,_PREPARE_FREE) then
begin begin
_free_pthread(_pthread); _free_pthread(_pthread);
@ -451,8 +455,10 @@ begin
begin begin
CAS(_pthread^.detachstate,PTHREAD_CREATE_JOINABLE,_PREPARE_JOIN); CAS(_pthread^.detachstate,PTHREAD_CREATE_JOINABLE,_PREPARE_JOIN);
_sig_lock; _sig_lock;
System.CloseThread(_pthread^.handle); Windows.TerminateThread(_pthread^.handle,0);
_pthread^.handle:=0;
_sig_unlock; _sig_unlock;
_free_pthread(_pthread);
end; end;
Result:=0; Result:=0;
end; end;