From 1b29c373e90074f6ba4de36523be7e09d90b6b58 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 15 Feb 2008 14:52:38 -0800 Subject: Add new options to set queue type and queue limit This adds ability to choose the underlying queue type for traffic shaper classes: drop-tail => fifo random-detect => red fair-queue => sfq priority => prio For Red, the values are computed based on the bandwidth so it is much simpler than raw tc usage. --- .../node.tag/class/node.tag/queue-limit/node.def | 2 ++ .../traffic-shaper/node.tag/class/node.tag/queue-type/node.def | 10 ++++++++++ .../traffic-shaper/node.tag/class/node.tag/queue/node.def | 8 -------- .../traffic-shaper/node.tag/default/queue-limit/node.def | 2 ++ .../traffic-shaper/node.tag/default/queue-type/node.def | 10 ++++++++++ 5 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 templates/qos-policy/traffic-shaper/node.tag/class/node.tag/queue-limit/node.def create mode 100644 templates/qos-policy/traffic-shaper/node.tag/class/node.tag/queue-type/node.def delete mode 100644 templates/qos-policy/traffic-shaper/node.tag/class/node.tag/queue/node.def create mode 100644 templates/qos-policy/traffic-shaper/node.tag/default/queue-limit/node.def create mode 100644 templates/qos-policy/traffic-shaper/node.tag/default/queue-type/node.def (limited to 'templates/qos-policy') diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/queue-limit/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/queue-limit/node.def new file mode 100644 index 0000000..4275b7b --- /dev/null +++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/queue-limit/node.def @@ -0,0 +1,2 @@ +type: u32 +help: Maximum queue size (packets) diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/queue-type/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/queue-type/node.def new file mode 100644 index 0000000..295c04c --- /dev/null +++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/queue-type/node.def @@ -0,0 +1,10 @@ +type: txt +default: "fair-queue" +syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect"; "Unknown queue-type" +help: Set the queue type for this class +comp_help:Possible completions + fair-queue\tStochastic Fair Queue (SFQ) + drop-tail\tFirst-In-First-Out (FIFO) + priority\tPriority queueing based on DSCP + random-detect\tRandom Early Detection (RED) + diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/queue/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/queue/node.def deleted file mode 100644 index bfe4544..0000000 --- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/queue/node.def +++ /dev/null @@ -1,8 +0,0 @@ -type: txt -default: "SFQ" -syntax:expression: $VAR(@) in "SFQ", "FIFO", "RED"; "Queue must be SFQ, FIFO, or RED" -help: Set the queue type for this class -comp_help:Possible completions: - FIFO Use FIFO queue - RED Random Exponential Drop - TCP friendly behaviour - SFQ Use Stochastic Fair Queue - fairness by flow (default) diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/queue-limit/node.def b/templates/qos-policy/traffic-shaper/node.tag/default/queue-limit/node.def new file mode 100644 index 0000000..4275b7b --- /dev/null +++ b/templates/qos-policy/traffic-shaper/node.tag/default/queue-limit/node.def @@ -0,0 +1,2 @@ +type: u32 +help: Maximum queue size (packets) diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/queue-type/node.def b/templates/qos-policy/traffic-shaper/node.tag/default/queue-type/node.def new file mode 100644 index 0000000..295c04c --- /dev/null +++ b/templates/qos-policy/traffic-shaper/node.tag/default/queue-type/node.def @@ -0,0 +1,10 @@ +type: txt +default: "fair-queue" +syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect"; "Unknown queue-type" +help: Set the queue type for this class +comp_help:Possible completions + fair-queue\tStochastic Fair Queue (SFQ) + drop-tail\tFirst-In-First-Out (FIFO) + priority\tPriority queueing based on DSCP + random-detect\tRandom Early Detection (RED) + -- cgit v1.2.3