moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-21 03:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Decrease polling period and increase polls before declaring the machine offline. Try requesting the app list again every 2 seconds if the app list has not been received yet.

Browse Source
This commit is contained in:
Cameron Gutman 2015-10-28 01:36:35 -07:00
parent 54eaee3f79
commit 5ef20aba21
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/limelight/computers/ComputerManagerService.java
View File

@ -31,11 +31,12 @@ import android.os.IBinder;
import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlPullParserException;
public class ComputerManagerService extends Service { public class ComputerManagerService extends Service {
private static final int SERVERINFO_POLLING_PERIOD_MS = 3000; private static final int SERVERINFO_POLLING_PERIOD_MS = 1500;
private static final int APPLIST_POLLING_PERIOD_MS = 30000; private static final int APPLIST_POLLING_PERIOD_MS = 30000;
private static final int APPLIST_FAILED_POLLING_RETRY_MS = 2000;
private static final int MDNS_QUERY_PERIOD_MS = 1000; private static final int MDNS_QUERY_PERIOD_MS = 1000;
private static final int FAST_POLL_TIMEOUT = 500; private static final int FAST_POLL_TIMEOUT = 500;
private static final int OFFLINE_POLL_TRIES = 3; private static final int OFFLINE_POLL_TRIES = 5;
private final ComputerManagerBinder binder = new ComputerManagerBinder(); private final ComputerManagerBinder binder = new ComputerManagerBinder();
@ -139,7 +140,7 @@ public class ComputerManagerService extends Service {
} }
// Wait until the next polling interval // Wait until the next polling interval
Thread.sleep(SERVERINFO_POLLING_PERIOD_MS / ((offlineCount > 0) ? 2 : 1)); Thread.sleep(SERVERINFO_POLLING_PERIOD_MS);
} catch (InterruptedException e) { } catch (InterruptedException e) {
break; break;
} }
@ -612,6 +613,7 @@ public class ComputerManagerService extends Service {
private Thread thread; private Thread thread;
private final ComputerDetails computer; private final ComputerDetails computer;
private final Object pollEvent = new Object(); private final Object pollEvent = new Object();
private boolean receivedAppList = false;
public ApplistPoller(ComputerDetails computer) { public ApplistPoller(ComputerDetails computer) {
this.computer = computer; this.computer = computer;
@ -626,7 +628,15 @@ public class ComputerManagerService extends Service {
private boolean waitPollingDelay() { private boolean waitPollingDelay() {
try { try {
synchronized (pollEvent) { synchronized (pollEvent) {
pollEvent.wait(APPLIST_POLLING_PERIOD_MS); if (receivedAppList) {
// If we've already reported an app list successfully,
// wait the full polling period
pollEvent.wait(APPLIST_POLLING_PERIOD_MS);
}
else {
// If we've failed to get an app list so far, retry much earlier
pollEvent.wait(APPLIST_FAILED_POLLING_RETRY_MS);
}
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
return false; return false;
@ -713,6 +723,7 @@ public class ComputerManagerService extends Service {
// Update the computer // Update the computer
computer.rawAppList = appList; computer.rawAppList = appList;
receivedAppList = true;
// Notify that the app list has been updated // Notify that the app list has been updated
// and ensure that the thread is still active // and ensure that the thread is still active