Skip to content

driver_vive: fix infinite loop when closing HIDAPI devices #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
m-va wants to merge 1 commit into from
Closed

driver_vive: fix infinite loop when closing HIDAPI devices #369

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/driver_vive.hidapi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,20 @@ static inline void survive_close_usb_device(struct SurviveUSBInfo *usbInfo) {
}

free(usbInfo->handle);
usbInfo->handle = 0;

/* Unlike the libusb backend, HIDAPI has no transfer-completion callback to
raise request_close; it is otherwise only set from HAPIReceiver() when
hid_read() fails. Without setting it here the wait loop in
survive_vive_close() never terminates, so config_save() further down in
survive_close() is never reached and lighthouse calibration is lost.
Freeing the handle above is safe because survive_usb_handle_close() is a
no-op in this backend. */
for (size_t j = 0; j < usbInfo->interface_cnt; j++) {
usbInfo->interfaces[j].shutdown = 1;
usbInfo->interfaces[j].assoc_obj = 0;
}
usbInfo->request_close = true;
#ifndef HID_NONBLOCKING
for (int j = 0; j < MAX_INTERFACES_PER_DEVICE; j++) {
OGJoinThread(sv->udev[i].interfaces->servicethread);
Expand Down