Network overhaul : support for multiple NICs, performance improvement

- Add support for multiple NICs
- Switch from polling to an event loop for the host networking to avoid latency and locking issues

src/qt/qt_machinestatus.cpp

@@ -37,6 +37,7 @@ extern uint64_t		tsc;
 #include <86box/mo.h>
 #include <86box/plat.h>
 #include <86box/machine.h>
+#include <86box/thread.h>
 #include <86box/network.h>
 #include <86box/ui.h>
 #include <86box/machine_status.h>

src/qt/qt_settingsnetwork.cpp

@@ -21,20 +21,29 @@ extern "C" {
 #include <86box/86box.h>
 #include <86box/device.h>
 #include <86box/machine.h>
+#include <86box/timer.h>
+#include <86box/thread.h>
 #include <86box/network.h>
 }
 
 #include "qt_models_common.hpp"
 #include "qt_deviceconfig.hpp"
 
-static void enableElements(Ui::SettingsNetwork *ui) {
-    int netType = ui->comboBoxNetwork->currentData().toInt();
-    ui->comboBoxPcap->setEnabled(netType == NET_TYPE_PCAP);
+void SettingsNetwork::enableElements(Ui::SettingsNetwork *ui) {
+    for (int i = 0; i < NET_CARD_MAX; ++i) {
+        auto* nic_cbox = findChild<QComboBox*>(QString("comboBoxNIC%1").arg(i+1));
+        auto* net_type_cbox = findChild<QComboBox*>(QString("comboBoxNet%1").arg(i+1));
+        auto* intf_cbox = findChild<QComboBox*>(QString("comboBoxIntf%1").arg(i+1));
+        auto* conf_btn = findChild<QPushButton*>(QString("pushButtonConf%1").arg(i+1));
 
-    bool adaptersEnabled = netType == NET_TYPE_SLIRP ||
-                           (netType == NET_TYPE_PCAP && ui->comboBoxPcap->currentData().toInt() > 0);
-    ui->comboBoxAdapter->setEnabled(adaptersEnabled);
-    ui->pushButtonConfigure->setEnabled(adaptersEnabled && ui->comboBoxAdapter->currentIndex() > 0 && network_card_has_config(ui->comboBoxAdapter->currentData().toInt()));
+        int netType = net_type_cbox->currentData().toInt();
+        bool adaptersEnabled = netType == NET_TYPE_SLIRP ||
+            (netType == NET_TYPE_PCAP && intf_cbox->currentData().toInt() > 0);
+
+        intf_cbox->setEnabled(net_type_cbox->currentData().toInt() == NET_TYPE_PCAP);
+        nic_cbox->setEnabled(adaptersEnabled);
+        conf_btn->setEnabled(adaptersEnabled && network_card_has_config(nic_cbox->currentData().toInt()));
+    }
 }
 
 SettingsNetwork::SettingsNetwork(QWidget *parent) :
@@ -43,27 +52,16 @@ SettingsNetwork::SettingsNetwork(QWidget *parent) :
 {
     ui->setupUi(this);
 
-    auto* model = ui->comboBoxNetwork->model();
-    Models::AddEntry(model, tr("None"), NET_TYPE_NONE);
-    Models::AddEntry(model, "PCap", NET_TYPE_PCAP);
-    Models::AddEntry(model, "SLiRP", NET_TYPE_SLIRP);
-    ui->comboBoxNetwork->setCurrentIndex(network_type);
-
-    int selectedRow = 0;
-    model = ui->comboBoxPcap->model();
-    QString currentPcapDevice = network_host;
-    for (int c = 0; c < network_ndev; c++) {
-
-        Models::AddEntry(model, tr(network_devs[c].description), c);
-        if (QString(network_devs[c].device) == currentPcapDevice) {
-            selectedRow = c;
-        }
-    }
-    ui->comboBoxPcap->setCurrentIndex(-1);
-    ui->comboBoxPcap->setCurrentIndex(selectedRow);
-
     onCurrentMachineChanged(machine);
     enableElements(ui);
+    for (int i = 0; i < NET_CARD_MAX; i++) {
+        auto* nic_cbox = findChild<QComboBox*>(QString("comboBoxNIC%1").arg(i+1));
+        auto* net_type_cbox = findChild<QComboBox*>(QString("comboBoxNet%1").arg(i+1));
+        auto* intf_cbox = findChild<QComboBox*>(QString("comboBoxIntf%1").arg(i+1));
+        connect(nic_cbox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &SettingsNetwork::on_comboIndexChanged);
+        connect(net_type_cbox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &SettingsNetwork::on_comboIndexChanged);
+        connect(intf_cbox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &SettingsNetwork::on_comboIndexChanged);
+    }
 }
 
 SettingsNetwork::~SettingsNetwork()
@@ -72,41 +70,75 @@ SettingsNetwork::~SettingsNetwork()
 }
 
 void SettingsNetwork::save() {
-    network_type = ui->comboBoxNetwork->currentData().toInt();
-    memset(network_host, '\0', sizeof(network_host));
-    strcpy(network_host, network_devs[ui->comboBoxPcap->currentData().toInt()].device);
-    network_card = ui->comboBoxAdapter->currentData().toInt();
+    for (int i = 0; i < NET_CARD_MAX; ++i) {
+        auto* cbox = findChild<QComboBox*>(QString("comboBoxNIC%1").arg(i+1));
+        net_cards_conf[i].device_num = cbox->currentData().toInt();
+        cbox = findChild<QComboBox*>(QString("comboBoxNet%1").arg(i+1));
+        net_cards_conf[i].net_type = cbox->currentData().toInt();
+        cbox = findChild<QComboBox*>(QString("comboBoxIntf%1").arg(i+1));
+        memset(net_cards_conf[i].host_dev_name, '\0', sizeof(net_cards_conf[i].host_dev_name));
+        strncpy(net_cards_conf[i].host_dev_name, network_devs[cbox->currentData().toInt()].device, sizeof(net_cards_conf[i].host_dev_name) - 1);
+    }
 }
 
 void SettingsNetwork::onCurrentMachineChanged(int machineId) {
     this->machineId = machineId;
 
-    auto* model = ui->comboBoxAdapter->model();
-    auto removeRows = model->rowCount();
     int c = 0;
     int selectedRow = 0;
-    while (true) {
-        auto name = DeviceConfig::DeviceName(network_card_getdevice(c), network_card_get_internal_name(c), 1);
-        if (name.isEmpty()) {
-            break;
+
+    for (int i = 0; i < NET_CARD_MAX; ++i) {
+        auto* cbox = findChild<QComboBox*>(QString("comboBoxNIC%1").arg(i+1));
+        auto *model = cbox->model();
+        auto removeRows = model->rowCount();
+        c = 0;
+        selectedRow = 0;
+
+        while (true) {
+            auto name = DeviceConfig::DeviceName(network_card_getdevice(c), network_card_get_internal_name(c), 1);
+            if (name.isEmpty()) {
+                break;
+            }
+
+            if (network_card_available(c) && device_is_valid(network_card_getdevice(c), machineId)) {
+                int row = Models::AddEntry(model, name, c);
+                if (c == net_cards_conf[i].device_num) {
+                    selectedRow = row - removeRows;
+                }
+            }
+            c++;
         }
 
-        if (network_card_available(c) && device_is_valid(network_card_getdevice(c), machineId)) {
-            int row = Models::AddEntry(model, name, c);
-            if (c == network_card) {
-                selectedRow = row - removeRows;
+        model->removeRows(0, removeRows);
+        cbox->setEnabled(model->rowCount() > 0);
+        cbox->setCurrentIndex(-1);
+        cbox->setCurrentIndex(selectedRow);
+
+        cbox = findChild<QComboBox*>(QString("comboBoxNet%1").arg(i+1));
+        model = cbox->model();
+        Models::AddEntry(model, tr("None"), NET_TYPE_NONE);
+        Models::AddEntry(model, "SLiRP", NET_TYPE_SLIRP);
+        if (network_ndev > 1) {
+            Models::AddEntry(model, "PCap", NET_TYPE_PCAP);
+        }
+        cbox->setCurrentIndex(net_cards_conf[i].net_type);
+
+        selectedRow = 0;
+
+        QString currentPcapDevice = net_cards_conf[i].host_dev_name;
+        cbox = findChild<QComboBox*>(QString("comboBoxIntf%1").arg(i+1));
+        model = cbox->model();
+        for (int c = 0; c < network_ndev; c++) {
+            Models::AddEntry(model, tr(network_devs[c].description), c);
+            if (QString(network_devs[c].device) == currentPcapDevice) {
+                selectedRow = c;
             }
         }
-
-        c++;
+        cbox->setCurrentIndex(selectedRow);
     }
-    model->removeRows(0, removeRows);
-    ui->comboBoxAdapter->setEnabled(model->rowCount() > 0);
-    ui->comboBoxAdapter->setCurrentIndex(-1);
-    ui->comboBoxAdapter->setCurrentIndex(selectedRow);
 }
 
-void SettingsNetwork::on_comboBoxNetwork_currentIndexChanged(int index) {
+void SettingsNetwork::on_comboIndexChanged(int index) {
     if (index < 0) {
         return;
     }
@@ -114,24 +146,18 @@ void SettingsNetwork::on_comboBoxNetwork_currentIndexChanged(int index) {
     enableElements(ui);
 }
 
-void SettingsNetwork::on_comboBoxAdapter_currentIndexChanged(int index) {
-    if (index < 0) {
-        return;
-    }
-
-    enableElements(ui);
+void SettingsNetwork::on_pushButtonConf1_clicked() {
+    DeviceConfig::ConfigureDevice(network_card_getdevice(ui->comboBoxNIC1->currentData().toInt()), 0, qobject_cast<Settings*>(Settings::settings));
 }
 
-void SettingsNetwork::on_pushButtonConfigure_clicked() {
-    DeviceConfig::ConfigureDevice(network_card_getdevice(ui->comboBoxAdapter->currentData().toInt()), 0, qobject_cast<Settings*>(Settings::settings));
+void SettingsNetwork::on_pushButtonConf2_clicked() {
+    DeviceConfig::ConfigureDevice(network_card_getdevice(ui->comboBoxNIC2->currentData().toInt()), 0, qobject_cast<Settings*>(Settings::settings));
 }
 
-
-void SettingsNetwork::on_comboBoxPcap_currentIndexChanged(int index)
-{
-    if (index < 0) {
-        return;
-    }
-
-    enableElements(ui);
+void SettingsNetwork::on_pushButtonConf3_clicked() {
+    DeviceConfig::ConfigureDevice(network_card_getdevice(ui->comboBoxNIC3->currentData().toInt()), 0, qobject_cast<Settings*>(Settings::settings));
+}
+
+void SettingsNetwork::on_pushButtonConf4_clicked() {
+    DeviceConfig::ConfigureDevice(network_card_getdevice(ui->comboBoxNIC4->currentData().toInt()), 0, qobject_cast<Settings*>(Settings::settings));
 }

src/qt/qt_settingsnetwork.hpp

@@ -21,11 +21,13 @@ public slots:
     void onCurrentMachineChanged(int machineId);
 
 private slots:
-    void on_pushButtonConfigure_clicked();
-    void on_comboBoxAdapter_currentIndexChanged(int index);
-    void on_comboBoxNetwork_currentIndexChanged(int index);
+    void on_pushButtonConf1_clicked();
+    void on_pushButtonConf2_clicked();
+    void on_pushButtonConf3_clicked();
+    void on_pushButtonConf4_clicked();
+    void on_comboIndexChanged(int index);
 
-    void on_comboBoxPcap_currentIndexChanged(int index);
+    void enableElements(Ui::SettingsNetwork *ui);
 
 private:
     Ui::SettingsNetwork *ui;

src/qt/qt_settingsnetwork.ui

@@ -6,14 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>548</width>
+    <height>458</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -26,7 +26,291 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item row="6" column="0">
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Network Interface Contollers</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="4">
+       <widget class="QLabel" name="label_7">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Adapter</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="3">
+       <widget class="QComboBox" name="comboBoxIntf4">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="3">
+       <widget class="QComboBox" name="comboBoxIntf3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="5">
+       <widget class="QPushButton" name="pushButtonConf3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Configure</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QComboBox" name="comboBoxNet1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Card 3:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="4">
+       <widget class="QComboBox" name="comboBoxNIC4">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="sizeAdjustPolicy">
+         <enum>QComboBox::AdjustToContents</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Card 1:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QLabel" name="label_2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Interface</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="4">
+       <widget class="QComboBox" name="comboBoxNIC1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="sizeAdjustPolicy">
+         <enum>QComboBox::AdjustToContents</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="5">
+       <widget class="QPushButton" name="pushButtonConf1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Configure</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="4">
+       <widget class="QComboBox" name="comboBoxNIC3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="sizeAdjustPolicy">
+         <enum>QComboBox::AdjustToContents</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="2">
+       <widget class="QComboBox" name="comboBoxNet4">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Card 4:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QLabel" name="label">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Mode</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Card 2:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2">
+       <widget class="QComboBox" name="comboBoxNet3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QComboBox" name="comboBoxNet2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="5">
+       <widget class="QPushButton" name="pushButtonConf2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Configure</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="5">
+       <widget class="QPushButton" name="pushButtonConf4">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Configure</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QComboBox" name="comboBoxIntf1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="3">
+       <widget class="QComboBox" name="comboBoxIntf2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="4">
+       <widget class="QComboBox" name="comboBoxNIC2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="sizeAdjustPolicy">
+         <enum>QComboBox::AdjustToContents</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -39,57 +323,6 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>PCap device:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Network type:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QComboBox" name="comboBoxAdapter">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Network adapter:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2">
-    <widget class="QPushButton" name="pushButtonConfigure">
-     <property name="text">
-      <string>Configure</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="2">
-    <widget class="QComboBox" name="comboBoxNetwork">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" colspan="2">
-    <widget class="QComboBox" name="comboBoxPcap"/>
-   </item>
   </layout>
  </widget>
  <resources/>