Skip to content

Commit 60a47af

Browse files
committed
Deregister transfer on exception (macOS)
1 parent f700ebb commit 60a47af

2 files changed

Lines changed: 23 additions & 3 deletions

File tree

‎java-does-usb/src/main/java/net/codecrete/usb/macos/MacosAsyncTask.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,20 @@ synchronized void prepareForSubmission(MacosTransfer transfer) {
187187
transfersById.put(lastTransferId, transfer);
188188
}
189189

190+
/**
191+
* Undoes the registration performed by {@link #prepareForSubmission(MacosTransfer)}.
192+
* <p>
193+
* Must be called if the native submission of a prepared transfer fails. In that case,
194+
* no completion callback will ever fire for the transfer, so its map entry would leak
195+
* unless it is removed here.
196+
* </p>
197+
*
198+
* @param transfer transfer whose submission failed
199+
*/
200+
synchronized void submissionFailed(MacosTransfer transfer) {
201+
transfersById.remove(transfer.id());
202+
}
203+
190204
/**
191205
* Callback function called when an asynchronous transfer has completed.
192206
*

‎java-does-usb/src/main/java/net/codecrete/usb/macos/MacosUsbDevice.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -527,8 +527,10 @@ synchronized void submitTransferIn(int endpointNumber, MacosTransfer transfer, i
527527
transfer.dataSize(), timeout, timeout, asyncTask.nativeCompletionCallback(),
528528
MemorySegment.ofAddress(transfer.id()));
529529

530-
if (ret != 0)
530+
if (ret != 0) {
531+
asyncTask.submissionFailed(transfer);
531532
throwException(ret, "error occurred while reading from endpoint %d", endpointNumber);
533+
}
532534
}
533535

534536
/**
@@ -557,8 +559,10 @@ synchronized void submitTransferOut(int endpointNumber, MacosTransfer transfer,
557559
transfer.dataSize(), timeout, timeout, asyncTask.nativeCompletionCallback(),
558560
MemorySegment.ofAddress(transfer.id()));
559561

560-
if (ret != 0)
562+
if (ret != 0) {
563+
asyncTask.submissionFailed(transfer);
561564
throwException(ret, "error occurred while transmitting to endpoint %d", endpointNumber);
565+
}
562566
}
563567

564568
/**
@@ -576,8 +580,10 @@ synchronized void submitControlTransfer(MemorySegment deviceRequest, MacosTransf
576580
var ret = IoKitUsb.DeviceRequestAsync(device, deviceRequest, asyncTask.nativeCompletionCallback(),
577581
MemorySegment.ofAddress(transfer.id()));
578582

579-
if (ret != 0)
583+
if (ret != 0) {
584+
asyncTask.submissionFailed(transfer);
580585
throwException(ret, "control transfer failed");
586+
}
581587
}
582588

583589
@Override

0 commit comments

Comments
 (0)