1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNetworkInterface (Unix): port two local tracker (QSet/QLVA) to QDuplicateTracker

Browse Source 
Apart from a more fitting, minimal, API, QDuplicateTracker also
transparently uses C++17 pmr::monotonic_buffer_resource to avoid, or
at least reduce, memory allocations.

Change-Id: I025504c7d22fb7a8c943e3968e4613d45c08d0b3
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Marc Mutz 2020-06-04 17:39:20 +02:00
parent fffaffb439
commit f19522a1b3
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/network/kernel/qnetworkinterface_unix.cpp
View File

@ -45,6 +45,8 @@
#include "qnetworkinterface_unix_p.h" #include "qnetworkinterface_unix_p.h"
#include "qalgorithms.h" #include "qalgorithms.h"
#include <QtCore/private/qduplicatetracker_p.h>
#ifndef QT_NO_NETWORKINTERFACE #ifndef QT_NO_NETWORKINTERFACE
#if defined(QT_NO_CLOCK_MONOTONIC) #if defined(QT_NO_CLOCK_MONOTONIC)
@ -344,8 +346,8 @@ static QList<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList)
{ {
Q_UNUSED(getMtu) Q_UNUSED(getMtu)
QList<QNetworkInterfacePrivate *> interfaces; QList<QNetworkInterfacePrivate *> interfaces;
QSet<QString> seenInterfaces; QDuplicateTracker<QString> seenInterfaces;
QVarLengthArray<int, 16> seenIndexes; // faster than QSet<int> QDuplicateTracker<int> seenIndexes;
// On Linux, glibc, uClibc and MUSL obtain the address listing via two // On Linux, glibc, uClibc and MUSL obtain the address listing via two
// netlink calls: first an RTM_GETLINK to obtain the interface listing, // netlink calls: first an RTM_GETLINK to obtain the interface listing,
@ -364,9 +366,9 @@ static QList<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList)
iface->flags = convertFlags(ptr->ifa_flags); iface->flags = convertFlags(ptr->ifa_flags);
iface->hardwareAddress = iface->makeHwAddress(sll->sll_halen, (uchar*)sll->sll_addr); iface->hardwareAddress = iface->makeHwAddress(sll->sll_halen, (uchar*)sll->sll_addr);
Q_ASSERT(!seenIndexes.contains(iface->index)); const bool sawIfaceIndex = seenIndexes.hasSeen(iface->index);
seenIndexes.append(iface->index); Q_ASSERT(!sawIfaceIndex);
seenInterfaces.insert(iface->name); (void)seenInterfaces.hasSeen(iface->name);
} }
} }
@ -376,16 +378,13 @@ static QList<QNetworkInterfacePrivate *> createInterfaces(ifaddrs *rawList)
for (ifaddrs *ptr = rawList; ptr; ptr = ptr->ifa_next) { for (ifaddrs *ptr = rawList; ptr; ptr = ptr->ifa_next) {
if (!ptr->ifa_addr || ptr->ifa_addr->sa_family != AF_PACKET) { if (!ptr->ifa_addr || ptr->ifa_addr->sa_family != AF_PACKET) {
QString name = QString::fromLatin1(ptr->ifa_name); QString name = QString::fromLatin1(ptr->ifa_name);
if (seenInterfaces.contains(name)) if (seenInterfaces.hasSeen(name))
continue; continue;
int ifindex = if_nametoindex(ptr->ifa_name); int ifindex = if_nametoindex(ptr->ifa_name);
if (seenIndexes.contains(ifindex)) if (seenIndexes.hasSeen(ifindex))
continue; continue;
seenInterfaces.insert(name);
seenIndexes.append(ifindex);
QNetworkInterfacePrivate *iface = new QNetworkInterfacePrivate; QNetworkInterfacePrivate *iface = new QNetworkInterfacePrivate;
interfaces << iface; interfaces << iface;
iface->name = name; iface->name = name;