From f78b716bf486e41ea35122c96c666927a5fa3fb0 Mon Sep 17 00:00:00 2001 From: Brant Thomsen Date: Wed, 14 Jun 2017 14:29:50 -0600 Subject: Shaping Fixes Increased the packet size value passed to the Shaper daemon to include the VLAN information. Changed the tc configuration values to correctly handle priorities 2 and 3. Updated the README file to note that the Shaper daemon and IGB are not compatible. --- daemons/shaper/README.rst | 14 +++++++++++++- daemons/shaper/src/shaper_daemon.c | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'daemons') diff --git a/daemons/shaper/README.rst b/daemons/shaper/README.rst index 71aebc42..6847c1d6 100644 --- a/daemons/shaper/README.rst +++ b/daemons/shaper/README.rst @@ -4,7 +4,8 @@ OpenAvnu Traffic Shaping Daemon .. contents:: .. 1 Introduction - 2 Future Updates + 2 Support + 3 Future Updates Introduction ------------ @@ -14,6 +15,17 @@ configure the kernel traffic shaping with the Hierarchy Token Bucket. While tc could be called directly, using the daemon allows for a simpler interface and keeps track of the current traffic shaping configurations in use. +Support +------- + +To enable the Shaper daemon support for AVTP Pipeline, edit the endpoint.ini +file and uncomment the port=15365 line of the shaper section. + +The Shaper daemon does not work (i.e. no shaping occurs) if the Intel IGB +support is loaded for the adapter being used. You may also need to compile +the AVTP Pipeline with PLATFORM_TOOLCHAIN=generic to not include the IGB +features. + Future Updates -------------- diff --git a/daemons/shaper/src/shaper_daemon.c b/daemons/shaper/src/shaper_daemon.c index 40f07088..5169b055 100644 --- a/daemons/shaper/src/shaper_daemon.c +++ b/daemons/shaper/src/shaper_daemon.c @@ -477,7 +477,7 @@ int process_command(int sockfd, char command[]) usage(sockfd); return -1; } - sprintf(tc_command, "tc qdisc add dev %s root handle 1: mqprio num_tc 4 map 0 1 2 3 2 0 0 1 1 1 1 1 3 3 3 3 queues 1@0 1@1 1@2 1@3 hw 0", input.interface); + sprintf(tc_command, "tc qdisc add dev %s root handle 1: mqprio num_tc 4 map 3 3 1 0 2 2 2 2 2 2 2 2 2 2 2 2 queues 1@0 1@1 1@2 1@3 hw 0", input.interface); log_client_debug_message(sockfd, "tc command: \"%s\"", tc_command); if (system(tc_command) < 0) { -- cgit v1.2.1