vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add sikentKillAll, rename preload library

Browse source
This commit is contained in:
Mittorn 2016-02-26 18:03:44 +00:00
parent 3112adc305
commit c6d419594a
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/in/celest/xash3d/SteamService.java
View file

@ -124,6 +124,7 @@ public class SteamService extends Service
} }
public void onDestroy() { public void onDestroy() {
silentKillAll();
try try
{ {
if( mBgThread != null ) if( mBgThread != null )
@ -330,7 +331,7 @@ public class SteamService extends Service
boolean skipQemu = false; boolean skipQemu = false;
String lastID; String lastID;
Process process; Process process;
AtomicBoolean needDestroy; AtomicBoolean needDestroy = new AtomicBoolean();
void downloadFile( String strurl, String path ) throws IOException, CancelException void downloadFile( String strurl, String path ) throws IOException, CancelException
{ {
@ -626,12 +627,12 @@ public class SteamService extends Service
downloadDep( "lib/librt.so.1" ); downloadDep( "lib/librt.so.1" );
mkdirs( "linux32" ); mkdirs( "linux32" );
downloadDep( "linux32/ld-linux.so.2" ); downloadDep( "linux32/ld-linux.so.2" );
downloadDep( "resolvconf-override.so" ); downloadDep( "preload.so" );
mkdirs( "sources" ); mkdirs( "sources" );
downloadDep( "sources/debian.txt" ); downloadDep( "sources/debian.txt" );
downloadDep( "sources/qemu.patch" ); downloadDep( "sources/qemu.patch" );
downloadDep( "sources/qemu.txt" ); downloadDep( "sources/qemu.txt" );
downloadDep( "sources/resolvconf-override.c" ); downloadDep( "sources/preload.c" );
downloadDep( "tar" ); downloadDep( "tar" );
downloadDep( "killall" ); downloadDep( "killall" );
if( skipQemu ) if( skipQemu )
@ -725,12 +726,30 @@ public class SteamService extends Service
return; return;
try try
{ {
silentKillAll();
mBgThread.needDestroy.getAndSet(true); mBgThread.needDestroy.getAndSet(true);
mBgThread.interrupt(); mBgThread.interrupt();
// destroy process to cause exception // destroy process
mBgThread.process.destroy(); mBgThread.process.destroy();
}catch( Exception e ){ }catch( Exception e ){
e.printStackTrace(); e.printStackTrace();
} }
} }
public void silentKillAll()
{
try
{
if( System.getProperty("ro.product.cpu.abi") == "x86" )
Runtime.getRuntime().exec( "sh " + localPath + "start-x86.sh " + localPath + ' ' +
localPath + "killall -o5s -9 ld-linux.so.2" );
else
Runtime.getRuntime().exec( "sh " + localPath + "start-qemu.sh " + localPath + " " +
filesDir + "/qemu " + localPath + "killall -o5s -9 qemu" );
}
catch( Exception e ){
e.printStackTrace();
}
}
} }