Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 45115 Details for
Bug 73104
wrong esfq and wrr patches for 20041019 - esfq and wrr in 20041019 not registering with tc command
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Correct esfq patch for 20041019
2.6.9.20041019-esqf.patch (text/plain), 5.50 KB, created by
David Pufer
on 2004-12-01 22:27:47 UTC
(
hide
)
Description:
Correct esfq patch for 20041019
Filename:
MIME Type:
Creator:
David Pufer
Created:
2004-12-01 22:27:47 UTC
Size:
5.50 KB
patch
obsolete
>diff -Naur iproute2-2.6.9.orig/include/linux/pkt_sched.h iproute2-2.6.9.esqf/include/linux/pkt_sched.h >--- iproute2-2.6.9.orig/include/linux/pkt_sched.h 2004-08-31 11:32:14.000000000 -0700 >+++ iproute2-2.6.9.esqf/include/linux/pkt_sched.h 2004-10-26 02:50:26.551530861 -0700 >@@ -127,6 +127,13 @@ > > /* SFQ section */ > >+enum >+{ >+ TCA_SFQ_HASH_CLASSIC, >+ TCA_SFQ_HASH_DST, >+ TCA_SFQ_HASH_SRC, >+}; >+ > struct tc_sfq_qopt > { > unsigned quantum; /* Bytes per round allocated to flow */ >@@ -134,6 +141,7 @@ > __u32 limit; /* Maximal packets in queue */ > unsigned divisor; /* Hash divisor */ > unsigned flows; /* Maximal number of flows */ >+ unsigned hash_kind; /* Hash function to use for flow identification */ > }; > > /* >@@ -143,6 +151,8 @@ > * > * The only reason for this is efficiency, it is possible > * to change these parameters in compile time. >+ * >+ * If you need to play with this values use esfq. > */ > > /* RED section */ >diff -Naur iproute2-2.6.9.orig/tc/Makefile iproute2-2.6.9.esqf/tc/Makefile >--- iproute2-2.6.9.orig/tc/Makefile 2004-08-31 11:32:14.000000000 -0700 >+++ iproute2-2.6.9.esqf/tc/Makefile 2004-10-26 02:49:58.967906374 -0700 >@@ -6,6 +6,7 @@ > TCMODULES := > TCMODULES += q_fifo.o > TCMODULES += q_sfq.o >+TCMODULES += q_esfq.o > TCMODULES += q_red.o > TCMODULES += q_prio.o > TCMODULES += q_tbf.o >diff -Naur iproute2-2.6.9.orig/tc/q_esfq.c iproute2-2.6.9.esqf/tc/q_esfq.c >--- iproute2-2.6.9.orig/tc/q_esfq.c 1969-12-31 16:00:00.000000000 -0800 >+++ iproute2-2.6.9.esqf/tc/q_esfq.c 2004-10-26 02:49:58.969905912 -0700 >@@ -0,0 +1,168 @@ >+/* >+ * q_esfq.c ESFQ. >+ * >+ * This program is free software; you can redistribute it and/or >+ * modify it under the terms of the GNU General Public License >+ * as published by the Free Software Foundation; either version >+ * 2 of the License, or (at your option) any later version. >+ * >+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> >+ * >+ * Changes: Alexander Atanasov, <alex@ssi.bg> >+ * Added depth,limit,divisor,hash_kind options. >+ */ >+ >+#include <stdio.h> >+#include <stdlib.h> >+#include <unistd.h> >+#include <syslog.h> >+#include <fcntl.h> >+#include <math.h> >+#include <sys/socket.h> >+#include <netinet/in.h> >+#include <arpa/inet.h> >+#include <string.h> >+ >+#include "utils.h" >+#include "tc_util.h" >+ >+static void explain(void) >+{ >+ fprintf(stderr, "Usage: ... esfq [ perturb SECS ] [ quantum BYTES ] [ depth FLOWS ]\n\t[ divisor HASHBITS ] [ limit PKTS ] [ hash HASHTYPE]\n"); >+ fprintf(stderr,"Where: \n"); >+ fprintf(stderr,"HASHTYPE := { classic | src | dst }\n"); >+} >+ >+#define usage() return(-1) >+ >+static int esfq_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) >+{ >+ int ok=0; >+ struct tc_sfq_qopt opt; >+ >+ memset(&opt, 0, sizeof(opt)); >+ >+ opt.hash_kind= TCA_SFQ_HASH_CLASSIC; >+ >+ while (argc > 0) { >+ if (strcmp(*argv, "quantum") == 0) { >+ NEXT_ARG(); >+ if (get_size(&opt.quantum, *argv)) { >+ fprintf(stderr, "Illegal \"quantum\"\n"); >+ return -1; >+ } >+ ok++; >+ } else if (strcmp(*argv, "perturb") == 0) { >+ NEXT_ARG(); >+ if (get_integer(&opt.perturb_period, *argv, 0)) { >+ fprintf(stderr, "Illegal \"perturb\"\n"); >+ return -1; >+ } >+ ok++; >+ } else if (strcmp(*argv, "depth") == 0) { >+ NEXT_ARG(); >+ if (get_integer(&opt.flows, *argv, 0)) { >+ fprintf(stderr, "Illegal \"depth\"\n"); >+ return -1; >+ } >+ ok++; >+ } else if (strcmp(*argv, "divisor") == 0) { >+ NEXT_ARG(); >+ if (get_integer(&opt.divisor, *argv, 0)) { >+ fprintf(stderr, "Illegal \"divisor\"\n"); >+ return -1; >+ } >+ if(opt.divisor >= 15) { >+ fprintf(stderr, "Illegal \"divisor\" must be < 15\n"); >+ return -1; >+ } >+ opt.divisor=pow(2,opt.divisor); >+ ok++; >+ } else if (strcmp(*argv, "limit") == 0) { >+ NEXT_ARG(); >+ if (get_integer(&opt.limit, *argv, 0)) { >+ fprintf(stderr, "Illegal \"limit\"\n"); >+ return -1; >+ } >+ ok++; >+ } else if (strcmp(*argv, "hash") == 0) { >+ NEXT_ARG(); >+ if(strcmp(*argv,"classic") == 0) { >+ opt.hash_kind= TCA_SFQ_HASH_CLASSIC; >+ } else >+ if(strcmp(*argv,"dst") == 0) { >+ opt.hash_kind= TCA_SFQ_HASH_DST; >+ } else >+ if(strcmp(*argv,"src") == 0) { >+ opt.hash_kind= TCA_SFQ_HASH_SRC; >+ } else { >+ fprintf(stderr, "Illegal \"hash\"\n"); >+ explain(); >+ return -1; >+ } >+ ok++; >+ } else if (strcmp(*argv, "help") == 0) { >+ explain(); >+ return -1; >+ } else { >+ fprintf(stderr, "What is \"%s\"?\n", *argv); >+ explain(); >+ return -1; >+ } >+ argc--; argv++; >+ } >+ >+ if (ok) >+ addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt)); >+ return 0; >+} >+ >+static int esfq_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) >+{ >+ struct tc_sfq_qopt *qopt; >+ SPRINT_BUF(b1); >+ >+ if (opt == NULL) >+ return 0; >+ >+ if (RTA_PAYLOAD(opt) < sizeof(*qopt)) >+ return -1; >+ qopt = RTA_DATA(opt); >+ fprintf(f, "quantum %s ", sprint_size(qopt->quantum, b1)); >+ if (show_details) { >+ fprintf(f, "limit %up flows %u/%u ", >+ qopt->limit, qopt->flows, qopt->divisor); >+ } >+ if (qopt->perturb_period) >+ fprintf(f, "perturb %dsec ", qopt->perturb_period); >+ >+ fprintf(f,"hash: "); >+ switch(qopt->hash_kind) >+ { >+ case TCA_SFQ_HASH_CLASSIC: >+ fprintf(f,"classic"); >+ break; >+ case TCA_SFQ_HASH_DST: >+ fprintf(f,"dst"); >+ break; >+ case TCA_SFQ_HASH_SRC: >+ fprintf(f,"src"); >+ break; >+ default: >+ fprintf(f,"Unknown"); >+ } >+ return 0; >+} >+ >+static int esfq_print_xstats(struct qdisc_util *qu, FILE *f, struct rtattr *xstats) >+{ >+ return 0; >+} >+ >+ >+struct qdisc_util esfq_qdisc_util = { >+ .id = "esfq", >+ .parse_qopt = esfq_parse_opt, >+ .print_qopt = esfq_print_opt, >+ .print_xstats = esfq_print_xstats, >+};
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 73104
: 45115 |
45116