From 05775a927ccad195001b7154f857f49d89d9dcf5 Mon Sep 17 00:00:00 2001 From: James Babcock Date: Sat, 2 May 2026 00:48:08 -0700 Subject: [PATCH] Improve connection resiliency Remove some spurious locking around NativeScript/Java interfaces that were added while debugging something that turned out to be unrelated. Don't send messages to the left lens while a heartbeat is pending on the right lens. --- .../faceclaw/app/FaceclawBleCommunicator.java | 162 ++++-------------- .../com/faceclaw/app/FaceclawBleManager.java | 1 + app/native/faceclaw-communicator.ts | 37 ++-- 3 files changed, 46 insertions(+), 154 deletions(-) diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleCommunicator.java b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleCommunicator.java index 9b0bc5d0..444188f5 100644 --- a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleCommunicator.java +++ b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleCommunicator.java @@ -23,8 +23,6 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.locks.ReentrantLock; @SuppressLint("MissingPermission") public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable { @@ -54,10 +52,6 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable { private static final int IDLE_SLEEP_MS = 100; private static final int RECONNECT_DELAY_MS = 5_000; - private interface NativeBridgeOperation { - T run(); - } - private static final BleProtocol.ImageTileOptions[] DASHBOARD_TILES = new BleProtocol.ImageTileOptions[] { new BleProtocol.ImageTileOptions("img00", 10, 0, 0, 288, 144), new BleProtocol.ImageTileOptions("img10", 11, 288, 0, 288, 144), @@ -69,8 +63,6 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable { private final FaceclawBleManager bleManager; private final InterruptibleSleep interruptibleSleep = new InterruptibleSleep(); private final Object lock = new Object(); - private final ReentrantLock nativeBridgeLock = new ReentrantLock(); - private final AtomicInteger nativeBridgeOperationSeq = new AtomicInteger(); private final Handler mainHandler = new Handler(Looper.getMainLooper()); private final String rightAddress; private final String leftAddress; @@ -241,55 +233,6 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable { } - public void submitDashboardImage(List tileBmps, String fingerprint) { - submitDashboardImage(tileBmps, fingerprint, false, -1); - } - - public void submitDashboardImage(List tileBmps, String fingerprint, boolean forceTiledCommit) { - submitDashboardImage(tileBmps, fingerprint, forceTiledCommit, -1); - } - - public void submitDashboardImage(List tileBmps, String fingerprint, boolean forceTiledCommit, int paintMs) { - if (tileBmps == null || tileBmps.size() != DASHBOARD_TILES.length) { - throw new IllegalArgumentException("exactly 4 tile bitmaps are required"); - } - withNativeBridgeLock("submitDashboardImage", () -> { - synchronized (desiredTilesLock) { - desiredTileBmps = emptyTileSet(); - for (int i = 0; i < DASHBOARD_TILES.length; i++) { - byte[] bmp = tileBmps.get(i); - desiredTileBmps[i] = bmp == null ? new byte[0] : Arrays.copyOf(bmp, bmp.length); - } - desiredFingerprint = fingerprint == null ? "" : fingerprint; - desiredForceTiledCommit = forceTiledCommit; - desiredPaintMs = paintMs; - } - return null; - }); - interruptibleSleep.interrupt(); - } - - public void submitDashboardImage4( - byte[] tile0Bmp, - byte[] tile1Bmp, - byte[] tile2Bmp, - byte[] tile3Bmp, - String fingerprint - ) { - submitDashboardImage4(tile0Bmp, tile1Bmp, tile2Bmp, tile3Bmp, fingerprint, false, -1); - } - - public void submitDashboardImage4( - byte[] tile0Bmp, - byte[] tile1Bmp, - byte[] tile2Bmp, - byte[] tile3Bmp, - String fingerprint, - boolean forceTiledCommit - ) { - submitDashboardImage4(tile0Bmp, tile1Bmp, tile2Bmp, tile3Bmp, fingerprint, forceTiledCommit, -1); - } - public void submitDashboardImage4( byte[] tile0Bmp, byte[] tile1Bmp, @@ -299,19 +242,17 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable { boolean forceTiledCommit, int paintMs ) { - withNativeBridgeLock("submitDashboardImage4", () -> { - synchronized (desiredTilesLock) { - desiredTileBmps = emptyTileSet(); - desiredTileBmps[0] = tile0Bmp == null ? new byte[0] : Arrays.copyOf(tile0Bmp, tile0Bmp.length); - desiredTileBmps[1] = tile1Bmp == null ? new byte[0] : Arrays.copyOf(tile1Bmp, tile1Bmp.length); - desiredTileBmps[2] = tile2Bmp == null ? new byte[0] : Arrays.copyOf(tile2Bmp, tile2Bmp.length); - desiredTileBmps[3] = tile3Bmp == null ? new byte[0] : Arrays.copyOf(tile3Bmp, tile3Bmp.length); - desiredFingerprint = fingerprint == null ? "" : fingerprint; - desiredForceTiledCommit = forceTiledCommit; - desiredPaintMs = paintMs; - } - return null; - }); + Log.i(TAG, "Received an updated frame "); + synchronized (desiredTilesLock) { + desiredTileBmps = emptyTileSet(); + desiredTileBmps[0] = tile0Bmp == null ? new byte[0] : Arrays.copyOf(tile0Bmp, tile0Bmp.length); + desiredTileBmps[1] = tile1Bmp == null ? new byte[0] : Arrays.copyOf(tile1Bmp, tile1Bmp.length); + desiredTileBmps[2] = tile2Bmp == null ? new byte[0] : Arrays.copyOf(tile2Bmp, tile2Bmp.length); + desiredTileBmps[3] = tile3Bmp == null ? new byte[0] : Arrays.copyOf(tile3Bmp, tile3Bmp.length); + desiredFingerprint = fingerprint == null ? "" : fingerprint; + desiredForceTiledCommit = forceTiledCommit; + desiredPaintMs = paintMs; + } interruptibleSleep.interrupt(); } @@ -322,27 +263,7 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable { if (width <= 0 || height <= 0 || colors.length < width * height) { throw new IllegalArgumentException("invalid preview bitmap dimensions"); } - return withNativeBridgeLock("createPreviewBitmap " + width + "x" + height, () -> - Bitmap.createBitmap(colors, width, height, Bitmap.Config.ARGB_8888)); - } - - public void acquireNativeBridgeLock(String operation) { - String label = operation == null || operation.isEmpty() ? "external" : operation; - String threadName = Thread.currentThread().getName(); - long waitStartedAtMs = SystemClock.elapsedRealtime(); - Log.i(TAG, "nativeBridge wait external " + label + " thread=" + threadName); - nativeBridgeLock.lock(); - long enteredAtMs = SystemClock.elapsedRealtime(); - Log.i(TAG, "nativeBridge enter external " + label - + " thread=" + threadName - + " waitedMs=" + (enteredAtMs - waitStartedAtMs)); - } - - public void releaseNativeBridgeLock(String operation) { - String label = operation == null || operation.isEmpty() ? "external" : operation; - String threadName = Thread.currentThread().getName(); - Log.i(TAG, "nativeBridge exit external " + label + " thread=" + threadName); - nativeBridgeLock.unlock(); + return Bitmap.createBitmap(colors, width, height, Bitmap.Config.ARGB_8888); } public boolean sendShutdown(int exitMode) { @@ -667,14 +588,19 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable { } long deadline = SystemClock.elapsedRealtime() + PRELUDE_TIMEOUT_MS; - synchronized (lock) { - while (running && !userDisconnectRequested && !inFlightMessages.isEmpty()) { - long remaining = deadline - SystemClock.elapsedRealtime(); - if (remaining <= 0) { + while (running && !userDisconnectRequested && !inFlightMessages.isEmpty()) { + synchronized (lock) { + if (!running || userDisconnectRequested || inFlightMessages.isEmpty()) { break; } - lock.wait(Math.min(remaining, 100)); } + long remaining = deadline - SystemClock.elapsedRealtime(); + if (remaining <= 0) { + break; + } + interruptibleSleep.sleep(Math.min(remaining, 100)); + } + synchronized (lock) { if (!inFlightMessages.isEmpty()) { clearInFlightMessagesLocked("prelude timeout"); throw new IllegalStateException("prelude ack timeout"); @@ -724,6 +650,10 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable { lastHeartbeatQueuedAtMs = now; } else if (heartbeatUrgent) { return IDLE_SLEEP_MS; + } else if (heartbeatPending) { + // Don't send other message types while a heartbeat is pending because that + // can lead to inter-lens sync issues + return IDLE_SLEEP_MS; } else if (sessionReady && inFlightMessages.size() < WINDOW_SIZE && !pendingMessages.isEmpty()) { OutboundMessage pending = pendingMessages.peekFirst(); if (heartbeatBlocksLeftWrites && pending != null && isLeftArmMessage(pending)) { @@ -782,14 +712,13 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable { private boolean writeMessageFrames(OutboundMessage message) { String writeAddress = isLeftArmMessage(message) ? leftAddress : rightAddress; - return withNativeBridgeLock("writeFrames " + message.label + " frames=" + message.frames.size(), () -> - bleManager.writeFrames( - writeAddress, - BleProtocol.WRITE_CHAR_UUID, - message.frames, - WRITE_TYPE, - WRITE_TIMEOUT_MS - )); + return bleManager.writeFrames( + writeAddress, + BleProtocol.WRITE_CHAR_UUID, + message.frames, + WRITE_TYPE, + WRITE_TIMEOUT_MS + ); } private boolean isLeftArmMessage(OutboundMessage message) { @@ -824,6 +753,7 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable { while (iterator.hasNext()) { OutboundMessage message = iterator.next(); if (message.sid == sid && message.magic == magic) { + Log.i(TAG, "Got ACK for " + message.label); iterator.remove(); message.ackPayload = pb == null ? new byte[0] : Arrays.copyOf(pb, pb.length); releaseMagicLocked(message, "ack"); @@ -1608,30 +1538,6 @@ public class FaceclawBleCommunicator implements FaceclawBleListener, Runnable { || line.startsWith("communicator loop error"); } - private T withNativeBridgeLock(String operation, NativeBridgeOperation callback) { - int operationId = nativeBridgeOperationSeq.incrementAndGet(); - String threadName = Thread.currentThread().getName(); - long waitStartedAtMs = SystemClock.elapsedRealtime(); - Log.i(TAG, "nativeBridge wait op#" + operationId + " " + operation + " thread=" + threadName); - nativeBridgeLock.lock(); - try { - long enteredAtMs = SystemClock.elapsedRealtime(); - Log.i(TAG, "nativeBridge enter op#" + operationId + " " + operation - + " thread=" + threadName - + " waitedMs=" + (enteredAtMs - waitStartedAtMs)); - try { - return callback.run(); - } finally { - long exitedAtMs = SystemClock.elapsedRealtime(); - Log.i(TAG, "nativeBridge exit op#" + operationId + " " + operation - + " thread=" + threadName - + " heldMs=" + (exitedAtMs - enteredAtMs)); - } - } finally { - nativeBridgeLock.unlock(); - } - } - private static String timestamp(long elapsedMs) { long wallMs = System.currentTimeMillis(); return String.format(Locale.US, "%tF %tT.%tL elapsed=%dms", wallMs, wallMs, wallMs, elapsedMs); diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleManager.java b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleManager.java index 6240e3b1..a7705072 100644 --- a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleManager.java +++ b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleManager.java @@ -385,6 +385,7 @@ public class FaceclawBleManager { private final BluetoothGattCallback gattCallback = new BluetoothGattCallback() { @Override public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) { + Log.i(TAG, "onConnectionStateChange: status=" + status + " newState=" + newState); String address = gatt.getDevice().getAddress(); if (newState == BluetoothProfile.STATE_CONNECTED && status == BluetoothGatt.GATT_SUCCESS) { diff --git a/app/native/faceclaw-communicator.ts b/app/native/faceclaw-communicator.ts index cf283a81..6874b287 100644 --- a/app/native/faceclaw-communicator.ts +++ b/app/native/faceclaw-communicator.ts @@ -177,15 +177,6 @@ export class FaceclawCommunicatorBridge { return result; } - private withNativeBridgeLock(operation: string, callback: () => T): T { - this.communicator.acquireNativeBridgeLock(operation); - try { - return callback(); - } finally { - this.communicator.releaseNativeBridgeLock(operation); - } - } - onLog(listener: (line: string) => void): () => void { this.logListeners.add(listener); return () => this.logListeners.delete(listener); @@ -250,25 +241,21 @@ export class FaceclawCommunicatorBridge { } const tileSnapshots = tileBmps.map((tile) => new Uint8Array(tile)); await this.enqueueJavaCall(() => { - this.withNativeBridgeLock("submitDashboardImage4 bridge arrays", () => { - this.communicator.submitDashboardImage4( - toJavaByteArray(tileSnapshots[0]!), - toJavaByteArray(tileSnapshots[1]!), - toJavaByteArray(tileSnapshots[2]!), - toJavaByteArray(tileSnapshots[3]!), - fingerprint, - forceTiledCommit, - Math.round(nonNegativeNumber(paintMs)), - ); - }); + this.communicator.submitDashboardImage4( + toJavaByteArray(tileSnapshots[0]!), + toJavaByteArray(tileSnapshots[1]!), + toJavaByteArray(tileSnapshots[2]!), + toJavaByteArray(tileSnapshots[3]!), + fingerprint, + forceTiledCommit, + Math.round(nonNegativeNumber(paintMs)), + ); }); } async createPreviewBitmap(colors: number[], width: number, height: number): Promise { return this.enqueueJavaCall(() => - this.withNativeBridgeLock("createPreviewBitmap bridge", () => - this.communicator.createPreviewBitmap(colors, width, height), - ), + this.communicator.createPreviewBitmap(colors, width, height), ); } @@ -278,9 +265,7 @@ export class FaceclawCommunicatorBridge { height: number, ): Promise { return this.enqueueJavaCall(() => - this.withNativeBridgeLock("createPreviewBitmap bridge colors", () => - this.communicator.createPreviewBitmap(createColors(), width, height), - ), + this.communicator.createPreviewBitmap(createColors(), width, height), ); }