mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move libusb hotplug registration to polling thread.

Browse Source 
* libusb polling thread now is responsible for hotplug registration
  and removal as well as cleanup.
* Only register hotplug callback on systems with support.
This commit is contained in:
Armin Novak 2020-03-06 09:00:12 +01:00 committed by akallabeth
parent ebdaea6f3b
commit 95522923ba
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
channels/urbdrc/client/libusb/libusb_udevman.c
View File

@ -72,7 +72,6 @@ struct _UDEVMAN
HANDLE devman_loading;
libusb_context* context;
libusb_hotplug_callback_handle handle;
HANDLE thread;
BOOL running;
};
@ -487,15 +486,9 @@ static void udevman_free(IUDEVMAN* idevman)
if (!udevman)
return;
libusb_hotplug_deregister_callback(udevman->context, udevman->handle);
udevman->running = FALSE;
WaitForSingleObject(udevman->thread, INFINITE);
/* Process remaining usb events */
while (poll_libusb_events(udevman))
;
udevman_unregister_all_udevices(idevman);
CloseHandle(udevman->devman_loading);
CloseHandle(udevman->thread);
@ -828,13 +821,38 @@ static BOOL poll_libusb_events(UDEVMAN* udevman)
static DWORD poll_thread(LPVOID lpThreadParameter)
{
libusb_hotplug_callback_handle handle;
UDEVMAN* udevman = (UDEVMAN*)lpThreadParameter;
BOOL hasHotplug = libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG);
if (hasHotplug)
{
int rc = libusb_hotplug_register_callback(
udevman->context,
LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT,
LIBUSB_HOTPLUG_NO_FLAGS, LIBUSB_HOTPLUG_MATCH_ANY, LIBUSB_HOTPLUG_MATCH_ANY,
LIBUSB_HOTPLUG_MATCH_ANY, hotplug_callback, udevman, &handle);
if (rc != LIBUSB_SUCCESS)
udevman->running = FALSE;
}
else
WLog_WARN(TAG, "Platform does not support libusb hotplug. USB devices plugged in later "
"will not be detected.");
while (udevman->running)
{
poll_libusb_events(udevman);
}
if (hasHotplug)
libusb_hotplug_deregister_callback(udevman->context, handle);
/* Process remaining usb events */
while (poll_libusb_events(udevman))
;
ExitThread(0);
return 0;
}
@ -893,14 +911,6 @@ int freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS p
if (!udevman->thread)
goto fail;
rc = libusb_hotplug_register_callback(
udevman->context, LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT,
LIBUSB_HOTPLUG_NO_FLAGS, LIBUSB_HOTPLUG_MATCH_ANY, LIBUSB_HOTPLUG_MATCH_ANY,
LIBUSB_HOTPLUG_MATCH_ANY, hotplug_callback, udevman, &udevman->handle);
if (rc != LIBUSB_SUCCESS)
goto fail;
if (!pEntryPoints->pRegisterUDEVMAN(pEntryPoints->plugin, (IUDEVMAN*)udevman))
goto fail;