Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-24 02:42:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

solid: UdevQt::Client::monitorReadyRead() optimization

Browse source 
because the string returned by udev_device_get_action() is valid for as
long as the device is storing it in QByteArray is redundant

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-09-08 07:12:22 +03:00
parent ccfd17a401
commit d519e61cb5
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
solid/solid/backends/udev/udevqtclient.cpp
View file

@ -66,13 +66,11 @@ DeviceList Client::allDevices()
struct udev_list_entry *list = udev_enumerate_get_list_entry(en); struct udev_list_entry *list = udev_enumerate_get_list_entry(en);
udev_list_entry_foreach(entry, list) { udev_list_entry_foreach(entry, list) {
struct udev_device *ud = udev_device_new_from_syspath(m_udev, udev_list_entry_get_name(entry)); struct udev_device *ud = udev_device_new_from_syspath(m_udev, udev_list_entry_get_name(entry));
if (!ud) { if (!ud) {
continue; continue;
} }
ret << Device(ud, false); ret << Device(ud, false);
} }
udev_enumerate_unref(en); udev_enumerate_unref(en);
return ret; return ret;
@ -88,7 +86,6 @@ Device Client::deviceBySysfsPath(const QString &sysfsPath)
return Device(ud, false); return Device(ud, false);
} }
void Client::monitorReadyRead(int fd) void Client::monitorReadyRead(int fd)
{ {
Q_UNUSED(fd); Q_UNUSED(fd);
@ -99,23 +96,23 @@ void Client::monitorReadyRead(int fd)
if (!dev) { if (!dev) {
return; return;
} }
Device device(dev, false);
QByteArray action(udev_device_get_action(dev)); const Device device(dev, false);
if (action == "add") { const char* action = udev_device_get_action(dev);
if (qstrcmp(action, "add") == 0) {
emit deviceAdded(device); emit deviceAdded(device);
} else if (action == "remove") { } else if (qstrcmp(action, "remove") == 0) {
emit deviceRemoved(device); emit deviceRemoved(device);
} else if (action == "change") { } else if (qstrcmp(action, "change") == 0) {
emit deviceChanged(device); emit deviceChanged(device);
} else if (action == "online" || action == "offline") { } else if (qstrcmp(action, "online") == 0 || qstrcmp(action, "offline") == 0) {
; // nada ; // nada
} else if (Q_UNLIKELY(action != "bind" && action != "unbind")) { } else if (qstrcmp(action, "bind") != 0 && qstrcmp(action, "unbind") != 0) {
/* /*
bind/unbind are driver changing for device type of event, on some systems it appears to be bind/unbind are driver changing for device type of event, on some systems it appears to be
broken and doing it all the time thus ignore the actions broken and doing it all the time thus ignore the actions
*/ */
qWarning("UdevQt: unhandled device action \"%s\"", action.constData()); qWarning("UdevQt: unhandled device action \"%s\"", action);
} }
} }