mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-12-22 13:33:56 +03:00
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.
This commit is contained in:
parent
60ed2dcfc7
commit
ca58d00c68
2
NEWS
2
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.
|
||||
|
@ -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'>
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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,
|
||||
};
|
||||
|
@ -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);
|
||||
|
@ -299,7 +299,7 @@ TargetSec=
|
||||
IntervalSec=
|
||||
CEThresholdSec=
|
||||
ECN=
|
||||
[FairQueueTrafficPolicing]
|
||||
[FairQueueing]
|
||||
Parent=
|
||||
PacketLimit=
|
||||
FlowLimit=
|
||||
|
@ -5,7 +5,7 @@ Name=dummy98
|
||||
IPv6AcceptRA=no
|
||||
Address=10.1.2.3/16
|
||||
|
||||
[FairQueueTrafficPolicing]
|
||||
[FairQueueing]
|
||||
Parent=root
|
||||
PacketLimit=1000
|
||||
FlowLimit=200
|
||||
|
Loading…
Reference in New Issue
Block a user