network: FairQueueTrafficPolicing→FairQueueing

This never made into a release, so we can change the name with impunity.
Suggested by Davide Pesavento.

I opted to add the "ing" ending. "Fair queuing" is the name of the general
concept and algorithm, and "Fair queue" is mostly used for the implementation
name.

diff --git a/NEWS b/NEWS
index 169c97f430139b15286c8c08b2ee6bb02d6d2f09..7ec0057e685089a5fd4095c73167ee4798c93fc5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -128,7 +128,7 @@ CHANGES WITH 245 in spe:
         * systemd-networkd gained support for configuring Token Bucket Filter
           (TBF) parameters in its qdisc configuration support. Similar, support
           for Stochastic Fairness Queuing (SFQ), Controlled-Delay Active
-          Queue Management (CoDel), Fair Queue (FQ) has been added.
+          Queue Management (CoDel), Fair Queueing (FQ) has been added.
 
         * systemd-networkd gained support for Intermediate Functional Block
           (IFB) network devices.

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index ad03be6db71b53c1c277109d2b84bedebb4834ce..37c5cfb485ecdcfae35389bd06d3c091353d1d9d 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -2561,8 +2561,8 @@
   </refsect1>
 
   <refsect1>
-    <title>[FairQueueTrafficPolicing] Section Options</title>
-    <para>The <literal>[FairQueueTrafficPolicing]</literal> section manages the queueing discipline
+    <title>[FairQueueing] Section Options</title>
+    <para>The <literal>[FairQueueing]</literal> section manages the queueing discipline
     (qdisc) of fair queue traffic policing (FQ).</para>
 
     <variablelist class='network-directives'>

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index d29814820d17f8003c5a0eadfe8825b73905489c..80500332e6ebd49db741b04a13037e0cf7c4fb17 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -257,16 +257,16 @@ ControlledDelay.TargetSec,                   config_parse_controlled_delay_usec,
 ControlledDelay.IntervalSec,                 config_parse_controlled_delay_usec,                       QDISC_KIND_CODEL,              0
 ControlledDelay.CEThresholdSec,              config_parse_controlled_delay_usec,                       QDISC_KIND_CODEL,              0
 ControlledDelay.ECN,                         config_parse_controlled_delay_bool,                       QDISC_KIND_CODEL,              0
-FairQueueTrafficPolicing.Parent,             config_parse_qdisc_parent,                                QDISC_KIND_FQ,                 0
-FairQueueTrafficPolicing.PacketLimit,        config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
-FairQueueTrafficPolicing.FlowLimit,          config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
-FairQueueTrafficPolicing.Quantum,            config_parse_fair_queue_traffic_policing_size,            QDISC_KIND_FQ,                 0
-FairQueueTrafficPolicing.InitialQuantum,     config_parse_fair_queue_traffic_policing_size,            QDISC_KIND_FQ,                 0
-FairQueueTrafficPolicing.MaximumRate,        config_parse_fair_queue_traffic_policing_max_rate,        QDISC_KIND_FQ,                 0
-FairQueueTrafficPolicing.Buckets,            config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
-FairQueueTrafficPolicing.OrphanMask,         config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
-FairQueueTrafficPolicing.Pacing,             config_parse_fair_queue_traffic_policing_bool,            QDISC_KIND_FQ,                 0
-FairQueueTrafficPolicing.CEThresholdSec,     config_parse_fair_queue_traffic_policing_usec,            QDISC_KIND_FQ,                 0
+FairQueueing.Parent,                         config_parse_qdisc_parent,                                QDISC_KIND_FQ,                 0
+FairQueueing.PacketLimit,                    config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
+FairQueueing.FlowLimit,                      config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
+FairQueueing.Quantum,                        config_parse_fair_queue_traffic_policing_size,            QDISC_KIND_FQ,                 0
+FairQueueing.InitialQuantum,                 config_parse_fair_queue_traffic_policing_size,            QDISC_KIND_FQ,                 0
+FairQueueing.MaximumRate,                    config_parse_fair_queue_traffic_policing_max_rate,        QDISC_KIND_FQ,                 0
+FairQueueing.Buckets,                        config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
+FairQueueing.OrphanMask,                     config_parse_fair_queue_traffic_policing_u32,             QDISC_KIND_FQ,                 0
+FairQueueing.Pacing,                         config_parse_fair_queue_traffic_policing_bool,            QDISC_KIND_FQ,                 0
+FairQueueing.CEThresholdSec,                 config_parse_fair_queue_traffic_policing_usec,            QDISC_KIND_FQ,                 0
 FairQueueingControlledDelay.Parent,          config_parse_qdisc_parent,                                QDISC_KIND_FQ_CODEL,           0
 FairQueueingControlledDelay.PacketLimit,     config_parse_fair_queueing_controlled_delay_u32,          QDISC_KIND_FQ_CODEL,           0
 FairQueueingControlledDelay.MemoryLimit,     config_parse_fair_queueing_controlled_delay_size,         QDISC_KIND_FQ_CODEL,           0

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 6f49e2a9f48455d8a3b2a45a5ac60fb8746b168d..1e293dfd64151074af42ccd8d0df6cc092f467a7 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -483,7 +483,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
                               "TrafficControlQueueingDiscipline\0"
                               "CAN\0"
                               "ControlledDelay\0"
-                              "FairQueueTrafficPolicing\0"
+                              "FairQueueing\0"
                               "FairQueueingControlledDelay\0"
                               "NetworkEmulator\0"
                               "StochasticFairnessQueueing\0"

diff --git a/src/network/tc/fq.c b/src/network/tc/fq.c
index 30ec71cbad8445c1af508ed6ea195da5978dbd1e..28ee64fa69ddd5d81322cad00916aba332539882 100644 (file)
--- a/src/network/tc/fq.c
+++ b/src/network/tc/fq.c
@@ -12,7 +12,7 @@
 #include "util.h"
 
 static int fair_queue_traffic_policing_init(QDisc *qdisc) {
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
 
         assert(qdisc);
 
@@ -25,7 +25,7 @@ static int fair_queue_traffic_policing_init(QDisc *qdisc) {
 }
 
 static int fair_queue_traffic_policing_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         int r;
 
         assert(link);
@@ -115,7 +115,7 @@ int config_parse_fair_queue_traffic_policing_u32(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         Network *network = data;
         uint32_t *p;
         int r;
@@ -178,7 +178,7 @@ int config_parse_fair_queue_traffic_policing_size(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         Network *network = data;
         uint64_t sz;
         uint32_t *p;
@@ -245,7 +245,7 @@ int config_parse_fair_queue_traffic_policing_bool(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         Network *network = data;
         int r;
 
@@ -297,7 +297,7 @@ int config_parse_fair_queue_traffic_policing_usec(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         Network *network = data;
         usec_t sec;
         int r;
@@ -356,7 +356,7 @@ int config_parse_fair_queue_traffic_policing_max_rate(
                 void *userdata) {
 
         _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
-        FairQueueTrafficPolicing *fq;
+        FairQueueing *fq;
         Network *network = data;
         uint64_t sz;
         int r;
@@ -404,7 +404,7 @@ int config_parse_fair_queue_traffic_policing_max_rate(
 
 const QDiscVTable fq_vtable = {
         .init = fair_queue_traffic_policing_init,
-        .object_size = sizeof(FairQueueTrafficPolicing),
+        .object_size = sizeof(FairQueueing),
         .tca_kind = "fq",
         .fill_message = fair_queue_traffic_policing_fill_message,
 };

diff --git a/src/network/tc/fq.h b/src/network/tc/fq.h
index 9bce285605318f39d71ea1be6203363423a50899..0e8ced03d0fac32926fa5da54e2c5c12d683c8f8 100644 (file)
--- a/src/network/tc/fq.h
+++ b/src/network/tc/fq.h
@@ -5,7 +5,7 @@
 #include "conf-parser.h"
 #include "qdisc.h"
 
-typedef struct FairQueueTrafficPolicing {
+typedef struct FairQueueing {
         QDisc meta;
 
         uint32_t packet_limit;
@@ -17,9 +17,9 @@ typedef struct FairQueueTrafficPolicing {
         uint32_t orphan_mask;
         int pacing;
         usec_t ce_threshold_usec;
-} FairQueueTrafficPolicing;
+} FairQueueing;
 
-DEFINE_QDISC_CAST(FQ, FairQueueTrafficPolicing);
+DEFINE_QDISC_CAST(FQ, FairQueueing);
 extern const QDiscVTable fq_vtable;
 
 CONFIG_PARSER_PROTOTYPE(config_parse_fair_queue_traffic_policing_u32);

diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network
index 52bf005f1b5944aff95718c7eb4312eaef6273d9..180a30c32cc6db56be0999543401d85e6613a371 100644 (file)
--- a/test/fuzz/fuzz-network-parser/directives.network
+++ b/test/fuzz/fuzz-network-parser/directives.network
@@ -299,7 +299,7 @@ TargetSec=
 IntervalSec=
 CEThresholdSec=
 ECN=
-[FairQueueTrafficPolicing]
+[FairQueueing]
 Parent=
 PacketLimit=
 FlowLimit=

diff --git a/test/test-network/conf/25-qdisc-fq-codel.network b/test/test-network/conf/25-qdisc-fq-codel.network
index f682b426e7858bdd2e883bc4b531ae4db732d12b..de74c1b5d2b2e30891080b3b319ce6fb6d4ef876 100644 (file)
--- a/test/test-network/conf/25-qdisc-fq-codel.network
+++ b/test/test-network/conf/25-qdisc-fq-codel.network
@@ -5,7 +5,7 @@ Name=dummy98
 IPv6AcceptRA=no
 Address=10.1.2.3/16
 
-[FairQueueTrafficPolicing]
+[FairQueueing]
 Parent=root
 PacketLimit=1000
 FlowLimit=200