Skip to content
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

Jump to bottom

device: Fix macOS 10.15 segfault on USB hotplug #847

Closed
wants to merge 2 commits into from
Closed

device: Fix macOS 10.15 segfault on USB hotplug #847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43c4379
device: Fix 10.15 segfault on USB hotplug
treamology Jan 15, 2020
857cb3b
device: Remove unnecessary PTs
treamology Jan 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 0 additions & 35 deletions panda/src/device/ioKitInputDevice.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,6 @@
#include "gamepadButton.h"
#include "mouseButton.h"

static void removal_callback(void *ctx, IOReturn result, void *sender) {
// We need to hold a reference to this because it may otherwise be destroyed
// during the call to on_remove().
PT(IOKitInputDevice) input_device = (IOKitInputDevice *)ctx;
nassertv(input_device != nullptr);
nassertv(input_device->test_ref_count_integrity());
input_device->on_remove();
}

/**
* Protected constructor.
*/
Expand Down Expand Up @@ -137,7 +128,6 @@ IOKitInputDevice(IOHIDDeviceRef device) :
}

_is_connected = true;
IOHIDDeviceRegisterRemovalCallback(device, removal_callback, this);
}

/**
Expand All @@ -147,31 +137,6 @@ IOKitInputDevice::
~IOKitInputDevice() {
}

/**
* The nonstatic version of on_remove_device.
*/
void IOKitInputDevice::
on_remove() {
{
LightMutexHolder holder(_lock);
if (!_is_connected) {
return;
}
_is_connected = false;
}

if (device_cat.is_debug()) {
device_cat.debug()
<< "Removed input device " << *this << "\n";
}

IOHIDDeviceClose(_device, kIOHIDOptionsTypeNone);

InputDeviceManager *mgr = InputDeviceManager::get_global_ptr();
nassertv(mgr != nullptr);
mgr->remove_device(this);
}

/**
*
*/
Expand Down
2 changes: 0 additions & 2 deletions panda/src/device/ioKitInputDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ class EXPCL_PANDA_DEVICE IOKitInputDevice final : public InputDevice {
IOKitInputDevice(IOHIDDeviceRef device);
~IOKitInputDevice();

void on_remove();

private:
void parse_element(IOHIDElementRef element);

Expand Down
32 changes: 30 additions & 2 deletions panda/src/device/ioKitInputDeviceManager.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ IOKitInputDeviceManager() {
CFRelease(match);

IOHIDManagerRegisterDeviceMatchingCallback(_hid_manager, on_match_device, this);
IOHIDManagerRegisterDeviceRemovalCallback(_hid_manager, on_remove_device, this);
IOHIDManagerScheduleWithRunLoop(_hid_manager, CFRunLoopGetMain(), kCFRunLoopCommonModes);
IOHIDManagerOpen(_hid_manager, kIOHIDOptionsTypeNone);
}
Expand All @@ -78,16 +79,43 @@ IOKitInputDeviceManager::
*/
void IOKitInputDeviceManager::
on_match_device(void *ctx, IOReturn result, void *sender, IOHIDDeviceRef device) {
InputDeviceManager *mgr = (InputDeviceManager *)ctx;
IOKitInputDeviceManager *mgr = (IOKitInputDeviceManager *)ctx;
nassertv(mgr != nullptr);
nassertv(device);

PT(InputDevice) input_device = new IOKitInputDevice(device);
IOKitInputDevice *input_device = new IOKitInputDevice(device);
if (device_cat.is_debug()) {
device_cat.debug()
<< "Discovered input device " << *input_device << "\n";
}
mgr->add_device(input_device);
mgr->_devices_by_hidref[device] = input_device;
}

/**
* Called by IOKit when an input device has disappeared.
*/
void IOKitInputDeviceManager::
on_remove_device(void *ctx, IOReturn result, void *sender, IOHIDDeviceRef device) {
IOKitInputDeviceManager *mgr = (IOKitInputDeviceManager *)ctx;
nassertv(mgr != nullptr);
nassertv(device);

auto it = mgr->_devices_by_hidref.find(device);
nassertv(it != mgr->_devices_by_hidref.end());
IOKitInputDevice *input_device = it->second;

input_device->set_connected(false);

mgr->_devices_by_hidref.erase(device);

IOHIDDeviceClose(device, kIOHIDOptionsTypeNone);

if (device_cat.is_debug()) {
device_cat.debug()
<< "Removed input device " << *input_device << "\n";
}

mgr->remove_device(input_device);
}
#endif
11 changes: 11 additions & 0 deletions panda/src/device/ioKitInputDeviceManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
#if defined(__APPLE__) && !defined(CPPPARSER)
#include <IOKit/hid/IOHIDManager.h>

class IOKitInputDevice;

/**
* The macOS implementation of InputDeviceManager.
*/
Expand All @@ -30,7 +32,16 @@ class EXPCL_PANDA_DEVICE IOKitInputDeviceManager final : public InputDeviceManag
protected:
IOHIDManagerRef _hid_manager;

// The device removal callback method we need to use requires us to remember
// which IOKitInputDevice corresponds to which IOHIDDeviceRef. This is the
// same strategy used by winInputDevice and friends.
//
// We can make this a mapping to raw pointers since we know _devices will be
// holding a reference until remove_device is called.
pmap<IOHIDDeviceRef, IOKitInputDevice *> _devices_by_hidref;

static void on_match_device(void *ctx, IOReturn result, void *sender, IOHIDDeviceRef device);
static void on_remove_device(void *ctx, IOReturn result, void *sender, IOHIDDeviceRef device);

friend class InputDeviceManager;
};
Expand Down