Skip to content

usbdmx: Move widget deletion to main thread #1712

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

Merged
merged 1 commit into from
Dec 6, 2021
Merged

usbdmx: Move widget deletion to main thread #1712

Show file tree
Hide file tree
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
38 changes: 20 additions & 18 deletions plugins/usbdmx/AsyncPluginImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,16 +264,9 @@ void AsyncPluginImpl::DeviceEvent(HotplugAgent::EventType event,
// Sunlite plugin, if we make the f/w load async we'll need to let the
// factory cancel the load.

// Unregister & delete the device in the main thread.
if (state->ola_device) {
Future<void> f;
m_plugin_adaptor->Execute(
NewSingleCallback(this, &AsyncPluginImpl::ShutdownDevice,
state->ola_device, &f));
f.Get();
state->ola_device = NULL;
}
state->DeleteWidget();
// Unregister & delete the device and widget in the main thread.
m_plugin_adaptor->Execute(
NewSingleCallback(this, &AsyncPluginImpl::ShutdownDeviceState, state));
}
}

Expand Down Expand Up @@ -353,17 +346,26 @@ bool AsyncPluginImpl::StartAndRegisterDevice(Widget *widget, Device *device) {

/*
* @brief Signal widget removal.
* @param device_id The device id to remove.
* @param state The DeviceState owning the widget to be removed.
*
* This is run within the main thread.
* This must be run within the main thread. The Device destructor below may
* cause libusb_close() to be called, which would deadlock if the hotplug
* event thread were to wait for it, say in AsyncPluginImpl::DeviceEvent().
*/
void AsyncPluginImpl::ShutdownDevice(Device *device, Future<void> *f) {
m_plugin_adaptor->UnregisterDevice(device);
device->Stop();
delete device;
if (f) {
f->Set();
void AsyncPluginImpl::ShutdownDeviceState(DeviceState *state) {
if (state->ola_device) {
Device *device = state->ola_device;
m_plugin_adaptor->UnregisterDevice(device);
device->Stop();
delete device;
state->ola_device = NULL;
} else {
/* This case can be legitimate when the widget setup through the
* widget factory is delayed and an unplug event happens before
* that is completed. */
OLA_DEBUG << "ola_device was NULL at shutdown";
}
state->DeleteWidget();
}
} // namespace usbdmx
} // namespace plugin
Expand Down
3 changes: 1 addition & 2 deletions plugins/usbdmx/AsyncPluginImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
#include "libs/usb/HotplugAgent.h"

#include "ola/base/Macro.h"
#include "ola/thread/Future.h"
#include "olad/Preferences.h"
#include "plugins/usbdmx/PluginImplInterface.h"
#include "plugins/usbdmx/SynchronizedWidgetObserver.h"
Expand Down Expand Up @@ -111,7 +110,7 @@ class AsyncPluginImpl: public PluginImplInterface, public WidgetObserver {
template <typename Widget>
bool StartAndRegisterDevice(Widget *widget, Device *device);

void ShutdownDevice(Device *device, ola::thread::Future<void> *f);
void ShutdownDeviceState(DeviceState *state);

DISALLOW_COPY_AND_ASSIGN(AsyncPluginImpl);
};
Expand Down