parkerlreed
commented
5 months ago I realized I was looking at the goto done immediately below the fd close not realizing it doesnt get called. Ill add some more more prints below this.
EDIT: So it doesnt hit the goto because doesnt print FALLBACK MaybeAddDevice fd lt 0 done but doesnt hit the rest? I added a bunch more prints but they never got hit
[2024-03-25 17:29:01.363295] INFO: FALLBACK MaybeAddDevice Begin
[2024-03-25 17:29:01.363305] INFO: FALLBACK MaybeAddDevice SDL_LockJoysticks
[2024-03-25 17:29:01.363316] INFO: FALLBACK MaybeAddDevice SDL_joylist check
[2024-03-25 17:29:01.363327] INFO: FALLBACK MaybeAddDevice Sensor List
[2024-03-25 17:29:01.363338] INFO: FALLBACK MaybeAddDevice fd open
[2024-03-25 17:29:01.363352] INFO: FALLBACK MaybeAddDevice fd close
[2024-03-25 17:29:01.432286] INFO: FALLBACK SDL_UnlockJoysticks SDL_Log("FALLBACK MaybeAddDevice fd open");
fd = open(path, O_RDONLY | O_CLOEXEC, 0);
SDL_Log("FALLBACK MaybeAddDevice fd close");
if (fd < 0) {
SDL_Log("FALLBACK MaybeAddDevice fd lt 0 done");
goto done;
}
#ifdef DEBUG_INPUT_EVENTS
SDL_Log("Checking %s\n", path);
#endif
if (IsJoystick(path, fd, &name, &vendor, &product, &guid)) {
#ifdef DEBUG_INPUT_EVENTS
SDL_Log("found joystick: %s\n", path);
#endif
SDL_Log("FALLBACK MaybeAddDevice item eq SDL_joylist_item");
item = (SDL_joylist_item *)SDL_calloc(1, sizeof(SDL_joylist_item));
SDL_Log("FALLBACK MaybeAddDevice item ne");
if (!item) {
SDL_Log("FALLBACK MaybeAddDevice item SDL_free");
SDL_free(name);
goto done;
}
item->devnum = sb.st_rdev;
item->steam_virtual_gamepad_slot = -1;
item->path = SDL_strdup(path);
item->name = name;
item->guid = guid;
SDL_Log("FALLBACK MaybeAddDevice Valve Virtual Check");
if (vendor == USB_VENDOR_VALVE &&
product == USB_PRODUCT_STEAM_VIRTUAL_GAMEPAD) {
GetSteamVirtualGamepadSlot(fd, &item->steam_virtual_gamepad_slot);
}
SDL_Log("FALLBACK MaybeAddDevice not item path or not item name");
if ((!item->path) || (!item->name)) {
SDL_Log("FALLBACK MaybeAddDevice FreeJoylistItem");
FreeJoylistItem(item);
goto done;
}
SDL_Log("FALLBACK MaybeAddDevice not SDL joylist tail");
item->device_instance = SDL_GetNextJoystickInstanceID();
if (!SDL_joylist_tail) {
SDL_joylist = SDL_joylist_tail = item;
} else {
SDL_Log("FALLBACK MaybeAddDevice tail next");
SDL_joylist_tail->next = item;
SDL_joylist_tail = item;
}
/* Need to increment the joystick count before we post the event */
SDL_Log("FALLBACK MaybeAddDevice Increment Joystick");
++numjoysticks;
SDL_Log("FALLBACK MaybeAddDevice PrivateJoystickAdded");
SDL_PrivateJoystickAdded(item->device_instance);
goto done;
}
twhitehead
slouken
radgeRayden
This is on Linux.
When calling
SDL_Init(SDL_INIT_GAMECONTROLLER), 2.30 is noticeably slower for me than 2.28: 3 seconds vs 0.5 seconds.I've bisected it to commit 3b1e0e16.
From what I can tell, the slowness is due to
SDL_UDEV_GetProductInfo(). Prior to the bisected commit, this function was only called when aJSIOCGNAMEioctl was successful, i.e. if a Joystick name could be obtained; so at most it's called as many times as there are connected joysticks. Now it's called unconditionally, presumably at least as many times as there are input devices attached, and on my system, it takes around 100ms to run. I have 21/dev/input/event*files, so that's 2100ms.