Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Log a warning if the wake lock expires before it's renewed.

Browse Source
This commit is contained in:
akwizgran
2020-08-04 17:36:55 +01:00
parent 286f6f492c
commit 7cdd05fd67
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bramble-android/src/main/java/org/briarproject/bramble/system/RenewableWakeLock.java
View File

@@ -15,6 +15,7 @@ import javax.annotation.concurrent.ThreadSafe;
import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.logging.Level.INFO; import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static java.util.logging.Logger.getLogger; import static java.util.logging.Logger.getLogger;
import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
@@ -40,6 +41,8 @@ class RenewableWakeLock implements SharedWakeLock {
private Future<?> future; private Future<?> future;
@GuardedBy("lock") @GuardedBy("lock")
private int refCount = 0; private int refCount = 0;
@GuardedBy("lock")
private long acquired = 0;
RenewableWakeLock(PowerManager powerManager, TaskScheduler scheduler, RenewableWakeLock(PowerManager powerManager, TaskScheduler scheduler,
int levelAndFlags, String tag, long durationMs, int levelAndFlags, String tag, long durationMs,
@@ -68,6 +71,7 @@ class RenewableWakeLock implements SharedWakeLock {
wakeLock.acquire(durationMs + safetyMarginMs); wakeLock.acquire(durationMs + safetyMarginMs);
future = scheduler.schedule(this::renew, durationMs, future = scheduler.schedule(this::renew, durationMs,
MILLISECONDS); MILLISECONDS);
acquired = android.os.SystemClock.elapsedRealtime();
} }
} }
} }
@@ -79,12 +83,18 @@ class RenewableWakeLock implements SharedWakeLock {
LOG.info("Already released"); LOG.info("Already released");
return; return;
} }
long now = android.os.SystemClock.elapsedRealtime();
long expiry = acquired + durationMs + safetyMarginMs;
if (now > expiry && LOG.isLoggable(WARNING)) {
LOG.warning("Wake lock expired " + (now - expiry) + " ms ago");
}
WakeLock oldWakeLock = wakeLock; WakeLock oldWakeLock = wakeLock;
wakeLock = powerManager.newWakeLock(levelAndFlags, tag); wakeLock = powerManager.newWakeLock(levelAndFlags, tag);
wakeLock.setReferenceCounted(false); wakeLock.setReferenceCounted(false);
wakeLock.acquire(durationMs + safetyMarginMs); wakeLock.acquire(durationMs + safetyMarginMs);
oldWakeLock.release(); oldWakeLock.release();
future = scheduler.schedule(this::renew, durationMs, MILLISECONDS); future = scheduler.schedule(this::renew, durationMs, MILLISECONDS);
acquired = now;
} }
} }
@@ -100,6 +110,7 @@ class RenewableWakeLock implements SharedWakeLock {
future = null; future = null;
requireNonNull(wakeLock).release(); requireNonNull(wakeLock).release();
wakeLock = null; wakeLock = null;
acquired = 0;
} }
} }
} }