Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

android: longer interval for graceful client shutdown.

This commit is contained in:
Joachim Fritzsch 2013-05-07 12:42:41 +02:00
parent d50d0f9495
commit 9c23a48792
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
android/BOINC/src/edu/berkeley/boinc/client/Monitor.java
View File

@ -405,9 +405,9 @@ public class Monitor extends Service {
// //
android.os.Process.sendSignal(clientPid, android.os.Process.SIGNAL_QUIT); android.os.Process.sendSignal(clientPid, android.os.Process.SIGNAL_QUIT);
// Wait for up to 30 seconds for the client to shutdown gracefully // Wait for up to 60 seconds for the client to shutdown gracefully
Integer loopCounter = 0; Integer loopCounter = 0;
while((loopCounter < 6) && (getPidForProcessName(processName) != null)) { while((loopCounter < 12) && (getPidForProcessName(processName) != null)) {
loopCounter++; loopCounter++;
try { try {
Thread.sleep(5000); Thread.sleep(5000);
@ -417,13 +417,13 @@ public class Monitor extends Service {
// Process is still alive, sind SIGKILL // Process is still alive, sind SIGKILL
clientPid = getPidForProcessName(processName); clientPid = getPidForProcessName(processName);
if(clientPid != null) { if(clientPid != null) {
Log.d(TAG, "SIGQUIT failed. SIGKILL pid: " + clientPid); Log.w(TAG, "SIGQUIT failed. SIGKILL pid: " + clientPid);
android.os.Process.killProcess(clientPid); android.os.Process.killProcess(clientPid);
} }
clientPid = getPidForProcessName(processName); clientPid = getPidForProcessName(processName);
if(clientPid != null) { if(clientPid != null) {
Log.d(TAG, "SIGKILL failed. still living pid: " + clientPid); Log.w(TAG, "SIGKILL failed. still living pid: " + clientPid);
} }
} }
@ -582,6 +582,11 @@ public class Monitor extends Service {
// close sockets in a synchronized way // close sockets in a synchronized way
rpc.close(); rpc.close();
// give client 10 seconds to shutdown gracefully
try {
Thread.sleep(10000);
} catch (Exception e) {}
// there are now more RPCs going on // there are now more RPCs going on
quitProcessOsLevel(clientPath + clientName); quitProcessOsLevel(clientPath + clientName);