forked from Blendman974/faceclaw
Optimize phone CPU usage
This commit is contained in:
1 parent
449cb0bf73
commit
45d2ece0d2
19 files changed
+485
-103
No files matched your search
@@ -536,6 +536,14 @@ export class FaceclawCommunicatorBridge {
|
||||
await this.enqueueNativeCall(() => { this.communicator.setScreenBlankedBlanked(Boolean(blanked)); });
|
||||
}
|
||||
|
||||
/**
|
||||
* See the Android bridge. Not wired to the shared compositor's check on iOS
|
||||
* yet, so every repaint is submitted as before.
|
||||
*/
|
||||
isSurfaceCurrent(_surfaceId: string, _fingerprint: string): boolean {
|
||||
return false;
|
||||
}
|
||||
|
||||
async submitSurfaceFrame(
|
||||
surfaceId: string,
|
||||
pixels8bpp: Uint8Array,
|
||||
|
||||
@@ -133,6 +133,8 @@ export class FaceclawCommunicatorBridge {
|
||||
private javaCallQueue: Promise<void> = Promise.resolve();
|
||||
/** Calls waiting on javaCallQueue; 0 means enqueueJavaCall's fast path is safe. */
|
||||
private queuedJavaCalls = 0;
|
||||
/** Queued calls that may change what a surface holds; see isSurfaceCurrent. */
|
||||
private queuedSurfaceChanges = 0;
|
||||
// Reused Java-side buffers for byte payloads; passing a JS ArrayBuffer to
|
||||
// Java leaks it (see java-direct-buffer.ts). Loaded inside the queued call,
|
||||
// immediately before the synchronous Java call that consumes them.
|
||||
@@ -267,8 +269,12 @@ export class FaceclawCommunicatorBridge {
|
||||
* the frame timings), which is pure latency on a call the caller is already
|
||||
* awaiting. Off by default: a call that might block for a while should keep
|
||||
* yielding to the main looper first.
|
||||
*
|
||||
* preservesSurfaces marks a call that neither changes a surface's retained
|
||||
* content nor leaves a change waiting for a later composite (it composites
|
||||
* itself), so having it queued does not make isSurfaceCurrent answer false.
|
||||
*/
|
||||
private enqueueJavaCall<T>(operation: () => T, inlineWhenIdle = false): Promise<T> {
|
||||
private enqueueJavaCall<T>(operation: () => T, inlineWhenIdle = false, preservesSurfaces = false): Promise<T> {
|
||||
if (inlineWhenIdle && this.queuedJavaCalls === 0) {
|
||||
try {
|
||||
return Promise.resolve(operation());
|
||||
@@ -277,10 +283,12 @@ export class FaceclawCommunicatorBridge {
|
||||
}
|
||||
}
|
||||
this.queuedJavaCalls++;
|
||||
if (!preservesSurfaces) this.queuedSurfaceChanges++;
|
||||
const run = () =>
|
||||
new Promise<T>((resolve, reject) => {
|
||||
setTimeout(() => {
|
||||
this.queuedJavaCalls--;
|
||||
if (!preservesSurfaces) this.queuedSurfaceChanges--;
|
||||
try {
|
||||
resolve(operation());
|
||||
} catch (error) {
|
||||
@@ -549,6 +557,7 @@ export class FaceclawCommunicatorBridge {
|
||||
await this.enqueueJavaCall(
|
||||
() => this.communicator.submitShellScene(this.shellSceneBuffer.load(snapshot), paintMs, frameId),
|
||||
true,
|
||||
true,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -562,7 +571,19 @@ export class FaceclawCommunicatorBridge {
|
||||
async setSurfaceVisible(id: string, visible: boolean): Promise<void> {
|
||||
await this.enqueueJavaCall(() => {
|
||||
this.communicator.setSurfaceVisible(id, Boolean(visible));
|
||||
});
|
||||
}, false, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether submitting a full-surface frame with this fingerprint would
|
||||
* change nothing: Java already holds that content for the surface, and no
|
||||
* queued or not-yet-composited change is waiting on a composite. Lets a
|
||||
* repaint that came out identical (a window re-rendered when it comes to
|
||||
* the foreground, say) skip flattening and submitting its frame.
|
||||
*/
|
||||
isSurfaceCurrent(surfaceId: string, fingerprint: string): boolean {
|
||||
if (this.queuedSurfaceChanges > 0) return false;
|
||||
return Boolean(this.communicator.isSurfaceCurrent(surfaceId, fingerprint));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -7,7 +7,25 @@ export type PhoneBatteryState = {
|
||||
charging: boolean | null;
|
||||
};
|
||||
|
||||
// The Android read is a sticky-broadcast binder round trip, and the top bar
|
||||
// asks on every shell paint; the level moves far slower than that.
|
||||
const ANDROID_CACHE_MS = 5000;
|
||||
let cachedState: PhoneBatteryState | null = null;
|
||||
let cachedAtMs = 0;
|
||||
|
||||
export function readPhoneBatteryState(): PhoneBatteryState {
|
||||
if (global.isAndroid) {
|
||||
const now = Date.now();
|
||||
if (cachedState === null || now - cachedAtMs >= ANDROID_CACHE_MS || now < cachedAtMs) {
|
||||
cachedState = readPhoneBatteryStateUncached();
|
||||
cachedAtMs = now;
|
||||
}
|
||||
return { ...cachedState };
|
||||
}
|
||||
return readPhoneBatteryStateUncached();
|
||||
}
|
||||
|
||||
function readPhoneBatteryStateUncached(): PhoneBatteryState {
|
||||
if (global.isIOS) {
|
||||
const device = UIDevice.currentDevice
|
||||
const level = device.batteryLevel
|
||||
|
||||
@@ -18,6 +18,7 @@ export type DisplayTarget = Pick<
|
||||
| "setUnderlayDim"
|
||||
| "setScreenBlanked"
|
||||
| "submitSurfaceFrame"
|
||||
| "isSurfaceCurrent"
|
||||
| "submitShellScene"
|
||||
| "waitForFrameFinished"
|
||||
| "getCompositePreview"
|
||||
@@ -109,6 +110,11 @@ export class PreviewDisplayTarget implements DisplayTarget {
|
||||
this.composited();
|
||||
}
|
||||
|
||||
/** Never skips: preview frames are cheap and nothing is transmitted. */
|
||||
isSurfaceCurrent(_surfaceId: string, _fingerprint: string): boolean {
|
||||
return false;
|
||||
}
|
||||
|
||||
async submitShellScene(bytes: Uint8Array, _paintMs = 0, _frameId = 0): Promise<void> {
|
||||
this.compositor.setShellScene(bytes);
|
||||
this.composited();
|
||||
|
||||
@@ -24,6 +24,7 @@ export type DisplayTarget = Pick<
|
||||
| "setUnderlayDim"
|
||||
| "setScreenBlanked"
|
||||
| "submitSurfaceFrame"
|
||||
| "isSurfaceCurrent"
|
||||
| "submitShellScene"
|
||||
| "waitForFrameFinished"
|
||||
| "getCompositePreview"
|
||||
@@ -109,6 +110,11 @@ export class PreviewDisplayTarget implements DisplayTarget {
|
||||
this.compositor.setSurfaceDepth(id, Math.round(depth));
|
||||
}
|
||||
|
||||
/** Never skips: preview frames are cheap and nothing is transmitted. */
|
||||
isSurfaceCurrent(_surfaceId: string, _fingerprint: string): boolean {
|
||||
return false;
|
||||
}
|
||||
|
||||
async submitShellScene(bytes: Uint8Array, paintMs = 0, frameId = 0): Promise<void> {
|
||||
this.compositor.submitShellScene(this.shellSceneBuffer.load(bytes), paintMs, frameId);
|
||||
}
|
||||
|
||||
@@ -8,17 +8,35 @@
|
||||
import { Utils } from "@nativescript/core";
|
||||
|
||||
declare const com: any;
|
||||
declare const android: any;
|
||||
|
||||
let javaInstance: any = null;
|
||||
// The Java-side listener proxy must stay referenced or it gets GC'd.
|
||||
let retainedListenerProxy: any = null;
|
||||
const changeListeners = new Set<(key: string) => void>();
|
||||
|
||||
// Values already read through JNI, which cost a bridge call each and are read
|
||||
// many times per paint (display mode, fonts, clock format). Only used while
|
||||
// this isolate's Java listener is registered on a thread with a Looper: every
|
||||
// write, from any isolate, notifies that listener, which drops the key before
|
||||
// any other change listener runs. A write from another isolate is visible here
|
||||
// once its notification has been dispatched (one message-loop tick), the same
|
||||
// point at which change listeners hear about it.
|
||||
// Strings are cached without a default (null = unset). Booleans are cached per
|
||||
// default, since the Java getter cannot report "unset", except after a write
|
||||
// from this isolate (defaultValue null: stored, so any default reads it).
|
||||
const stringCache = new Map<string, string | null>();
|
||||
const booleanCache = new Map<string, { defaultValue: boolean | null; value: boolean }>();
|
||||
let cachingEnabled: boolean | null = null;
|
||||
|
||||
/** Release this isolate's native observer before its worker is terminated. */
|
||||
export function disposeSettingsStore(): void {
|
||||
changeListeners.clear();
|
||||
if (retainedListenerProxy !== null) getJava().unregisterListener(retainedListenerProxy);
|
||||
retainedListenerProxy = null;
|
||||
cachingEnabled = false;
|
||||
stringCache.clear();
|
||||
booleanCache.clear();
|
||||
}
|
||||
|
||||
function getJava(): any {
|
||||
@@ -31,20 +49,80 @@ function getJava(): any {
|
||||
return javaInstance;
|
||||
}
|
||||
|
||||
function canCache(): boolean {
|
||||
if (cachingEnabled === null) {
|
||||
cachingEnabled = false;
|
||||
try {
|
||||
// FaceclawSettings dispatches notifications through the registering
|
||||
// thread's Looper; without one this isolate would never hear of writes.
|
||||
if (android.os.Looper.myLooper() !== null) {
|
||||
ensureJavaListener();
|
||||
cachingEnabled = true;
|
||||
}
|
||||
} catch {
|
||||
cachingEnabled = false;
|
||||
}
|
||||
}
|
||||
return cachingEnabled;
|
||||
}
|
||||
|
||||
export function getStringSetting(key: string, defaultValue: string): string {
|
||||
return String(getJava().getString(key, defaultValue));
|
||||
if (!canCache()) return String(getJava().getString(key, defaultValue));
|
||||
let value = stringCache.get(key);
|
||||
if (value === undefined) {
|
||||
const raw = getJava().getString(key, null);
|
||||
value = raw === null || raw === undefined ? null : String(raw);
|
||||
stringCache.set(key, value);
|
||||
}
|
||||
return value ?? defaultValue;
|
||||
}
|
||||
|
||||
export function setStringSetting(key: string, value: string): void {
|
||||
getJava().setString(key, value);
|
||||
if (cachingEnabled) stringCache.set(key, value === null || value === undefined ? null : String(value));
|
||||
}
|
||||
|
||||
export function getBooleanSetting(key: string, defaultValue: boolean): boolean {
|
||||
return Boolean(getJava().getBoolean(key, defaultValue));
|
||||
if (!canCache()) return Boolean(getJava().getBoolean(key, defaultValue));
|
||||
const cached = booleanCache.get(key);
|
||||
if (cached !== undefined && (cached.defaultValue === null || cached.defaultValue === defaultValue)) {
|
||||
return cached.value;
|
||||
}
|
||||
const value = Boolean(getJava().getBoolean(key, defaultValue));
|
||||
booleanCache.set(key, { defaultValue, value });
|
||||
return value;
|
||||
}
|
||||
|
||||
export function setBooleanSetting(key: string, value: boolean): void {
|
||||
getJava().setBoolean(key, value);
|
||||
if (cachingEnabled) booleanCache.set(key, { defaultValue: null, value: Boolean(value) });
|
||||
}
|
||||
|
||||
function forgetCachedSetting(key: string | null | undefined): void {
|
||||
if (key === null || key === undefined) {
|
||||
stringCache.clear();
|
||||
booleanCache.clear();
|
||||
return;
|
||||
}
|
||||
stringCache.delete(key);
|
||||
booleanCache.delete(key);
|
||||
}
|
||||
|
||||
function ensureJavaListener(): void {
|
||||
if (retainedListenerProxy !== null) return;
|
||||
retainedListenerProxy = new com.faceclaw.app.FaceclawSettingsListener({
|
||||
onSettingChanged: (key: string) => {
|
||||
forgetCachedSetting(key === null || key === undefined ? key : String(key));
|
||||
for (const registered of Array.from(changeListeners)) {
|
||||
try {
|
||||
registered(String(key));
|
||||
} catch (error) {
|
||||
console.warn("settings change listener failed", error);
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
getJava().registerListener(retainedListenerProxy);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -53,20 +131,7 @@ export function setBooleanSetting(key: string, value: boolean): void {
|
||||
* change.
|
||||
*/
|
||||
export function onSettingsStoreChanged(listener: (key: string) => void): () => void {
|
||||
if (retainedListenerProxy === null) {
|
||||
retainedListenerProxy = new com.faceclaw.app.FaceclawSettingsListener({
|
||||
onSettingChanged: (key: string) => {
|
||||
for (const registered of Array.from(changeListeners)) {
|
||||
try {
|
||||
registered(String(key));
|
||||
} catch (error) {
|
||||
console.warn("settings change listener failed", error);
|
||||
}
|
||||
}
|
||||
},
|
||||
});
|
||||
getJava().registerListener(retainedListenerProxy);
|
||||
}
|
||||
ensureJavaListener();
|
||||
changeListeners.add(listener);
|
||||
return () => {
|
||||
changeListeners.delete(listener);
|
||||
|
||||
Reference in new issue
Block a user