matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace rate with jitter 

(Logical change 1.55)
This commit is contained in:
osdl.net!shemminger 2004-07-12 21:03:29 +00:00
parent b2f11a78c0
commit 31fa60e00f
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tc/q_netem.c
View File

@ -26,9 +26,9 @@
static void explain(void) static void explain(void)
{ {
fprintf(stderr, fprintf(stderr,
"Usage: ... netem latency TIME [ gap PACKETS] \n" \ "Usage: ... netem latency TIME [ jitter TIME ] [ limit PACKETS] \n" \
" [ loss PERCENT ] [ duplicate PERCENT ]\n" \ " [ loss PERCENT ] [ duplicate PERCENT ]\n" \
" [ rate KBPS ] [ limit BYTES]\n"); " [ gap PACKETS]\n");
} }
static void explain1(const char *arg) static void explain1(const char *arg)
@ -70,10 +70,8 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv,
} }
ok++; ok++;
} else if (matches(*argv, "gap") == 0) { } else if (matches(*argv, "gap") == 0) {
char *p;
NEXT_ARG(); NEXT_ARG();
opt.gap = strtoul(*argv, &p, 0); if (get_u32(&opt.gap, *argv, 0)) {
if (p == *argv || *p) {
explain1("gap"); explain1("gap");
return -1; return -1;
} }
@ -85,10 +83,10 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv,
return -1; return -1;
} }
ok++; ok++;
} else if (matches(*argv, "rate") == 0) { } else if (matches(*argv, "jitter") == 0) {
NEXT_ARG(); NEXT_ARG();
if (get_rate(&opt.rate, *argv)) { if (get_usecs(&opt.jitter, *argv)) {
explain1("rate"); explain1("jitter");
return -1; return -1;
} }
ok++; ok++;
@ -103,16 +101,13 @@ static int netem_parse_opt(struct qdisc_util *qu, int argc, char **argv,
argc--; argv++; argc--; argv++;
} }
if (ok) return ok ? addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt)) : 0;
addattr_l(n, 1024, TCA_OPTIONS, &opt, sizeof(opt));
return 0;
} }
static int netem_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) static int netem_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
{ {
struct tc_netem_qopt *qopt; struct tc_netem_qopt *qopt;
SPRINT_BUF(b1); SPRINT_BUF(b1);
SPRINT_BUF(b2);
if (opt == NULL) if (opt == NULL)
return 0; return 0;
@ -125,15 +120,16 @@ static int netem_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt)
fprintf(f, "limit %d", qopt->limit); fprintf(f, "limit %d", qopt->limit);
if (qopt->latency) if (qopt->latency)
fprintf(f, " latency %s", fprintf(f, " latency %s",
sprint_usecs(qopt->latency, b2)); sprint_usecs(qopt->latency, b1));
if (qopt->jitter)
fprintf(f, " jitter %s", sprint_usecs(qopt->jitter, b1));
if (qopt->loss) if (qopt->loss)
fprintf(f, " loss %s", fprintf(f, " loss %s",
sprint_percent(qopt->loss, b1)); sprint_percent(qopt->loss, b1));
if (qopt->gap) if (qopt->gap)
fprintf(f, " gap %lu", (unsigned long)qopt->gap); fprintf(f, " gap %lu", (unsigned long)qopt->gap);
if (qopt->rate)
fprintf(f, " rate %s", sprint_rate(qopt->rate, b1));
return 0; return 0;
} }
@ -144,9 +140,8 @@ static int netem_print_xstats(struct qdisc_util *qu, FILE *f, struct rtattr *xst
} }
struct qdisc_util netem_util = { struct qdisc_util netem_util = {
NULL, .id = "netem",
"netem", .parse_qopt = netem_parse_opt,
netem_parse_opt, .print_qopt = netem_print_opt,
netem_print_opt, .print_xstats = netem_print_xstats,
netem_print_xstats,
}; };