Update batch file. (dc2f6411) · Commits · Toke Høiland-Jørgensen / Bufferbloat test scripts

bufferbloat-tests.batch

+78 −19

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ type = pre
		essential = yes

		[Command::setup_qdiscs]
		exec = ./setup_qdiscs.sh ${qdisc_name} "${qdisc_args_down}" "${qdisc_args_up}" ${rate_down} ${rate_up} ${rtt}
		exec = ./setup_qdiscs.sh ${qdisc_name} "${qdisc_args_down}" "${qdisc_args_up}" ${rate_down} ${rate_up} ${rtt} ${cc}
		type = pre
		essential = yes

		@@ -70,20 +70,26 @@ exec = python tcpdump-wrapper.py stop ${filename} -d /home/data/${batch_name}
		type = post
		essential = yes

		[Command::link_makefile]
		exec = ln -s ../../Makefile batch-${batch_time}/${batch_name}/
		type = post


		[Batch::global]
		# rc file keys
		remote_metadata = ${egress_router_hostname}, ${ingress_router_hostname}, ${end_hostname}, ${delaybox_hostname}
		extended_metadata = yes
		title = qdisc:${qdisc_label} rep:${repetition} rtt:${rtt} rate:${rate_down}/${rate_up}
		filename_extra = ${rtt}-${rate_up}-${qdisc_label}-${repetition}
		save_raw = yes
		local_bind = 10.60.1.1
		control_local_bind = 10.60.1.5
		title = qdisc:${qdisc_label} rep:${repetition} rtt:${rtt} rate:${rate_down}/${rate_up} cc:${cc}
		filename_extra = ${rtt}-${rate_up}-${qdisc_label}-${cc}-${repetition}
		output_path = batch-${batch_time}/${batch_name}/${rate_up}-${repetition}
		ip_version = 4
		length = 60
		commands = clear_caches, setup_qdiscs, tcpdump_client, tcpdump_egress, tcpdump_ingress, tcpdump_server, qdisc_stats
		for_qdiscs = ared, fq_codel, fq_nocodel, codel, pie, pfifo_fast, sfq
		for_bandwidths = 10mbit, 1mbit
		length = 140
		commands = clear_caches, setup_qdiscs, tcpdump_client, tcpdump_egress, tcpdump_ingress, tcpdump_server, qdisc_stats, link_makefile
		for_qdiscs = ared, fq_codel, fq_nocodel, codel, pie, pfifo_fast, pfifo_fast_1000, sfq
		for_bandwidths = 100mbit, 10mbit, 1mbit
		for_rtts = 50ms
		repetitions = 1
		debug_log = yes
		@@ -98,7 +104,9 @@ pause = 5
		[Batch::rrul]
		inherits = global
		test_name = rrul_be
		repetitions = 30
		length = 140
		for_bandwidths = 10mbit, 1mbit
		repetitions = 10

		[Batch::tcp-upload]
		inherits = global
		@@ -109,14 +117,17 @@ disabled = yes
		inherits = global
		test_name = tcp_2up_delay
		for_cap = fullcap
		repetitions = 30
		disabled = yes

		[Batch::rtt-fair]
		inherits = global
		hosts = testserv-01, testserv-02, testserv-03, testserv-04
		for_ccs = cubic, reno
		test_name = rtt_fair_up
		for_rtts = multi
		repetitions = 30
		for_bandwidths = 1mbit, 10mbit, 100mbit
		length = 600
		repetitions = 3

		[Batch::voip]
		inherits = global
		@@ -126,30 +137,48 @@ disabled = yes
		[Batch::voip-1up]
		inherits = global
		test_name = voip-1up
		repetitions = 30

		[Batch::voip-rrul]
		inherits = global
		test_name = voip-rrul
		repetitions = 30

		[Batch::http]
		inherits = global
		filename_extra = ${rtt}-${rate_up}-${http_site}-${qdisc_label}-${repetition}
		title = qdisc:${qdisc_label} rep:${repetition} site:${http_site} rtt:${rtt} rate:${rate_down}/${rate_up}
		filename_extra = ${rtt}-${rate_up}-${http_site}-${qdisc_label}-${cc}-${repetition}
		title = qdisc:${qdisc_label} rep:${repetition} site:${http_site} rtt:${rtt} rate:${rate_down}/${rate_up} cc:${cc}
		test_name = http
		for_rtts = multi
		for_sites = google, huffpost

		[Batch::http-7flow]
		inherits = http
		for_sites = 7flow
		for_bandwidths = 1mbit
		length = 5
		step_size = 2.0
		repetitions = 30

		[Batch::http-1up]
		inherits = http
		test_name = http-1up
		repetitions = 30

		[Batch::http-rrul]
		inherits = http
		test_name = http-rrul
		repetitions = 30

		[Batch::burst-100]
		inherits = global
		test_name = bursts
		test_parameters = burst-ports=100
		for_ccs = cubic
		disabled = true

		[Batch::burst-1000]
		inherits = global
		test_name = bursts
		test_parameters = burst-ports=1000
		for_ccs = cubic
		disabled = true

		[Arg::global]
		egress_router_hostname = testbed-02
		@@ -169,6 +198,13 @@ rate_up = 10Mbit
		rtt = 50ms
		qdisc_args_up = ${qdisc_args}
		qdisc_args_down = ${qdisc_args}
		cc = cubic

		[Arg::cubic]
		cc = cubic

		[Arg::reno]
		cc = reno

		[Arg::fullcap]
		capsize = 0
		@@ -196,6 +232,12 @@ inherits = http
		http_site = dn
		step_size = 1.0

		[Arg::7flow]
		inherits = http
		http_site = 7flow
		step_size = 1.0


		[Arg::1mbit]
		rate_up = 1Mbit
		ared_args_up = min 1514 max 3028
		@@ -204,6 +246,12 @@ codel_args_up = target 13ms
		[Arg::10mbit]
		rate_up = 10Mbit

		[Arg::100mbit]
		rate_up = 100Mbit
		rate_down = 100Mbit
		ared_args_up = min 125000
		ared_args_down = min 125000

		[Arg::50ms]
		rtt = 50ms

		@@ -235,11 +283,17 @@ qdisc_args = limit 127 noecn target 100s
		qdisc_args_up = ${qdisc_args}
		qdisc_label = fq_nocodel

		[Arg::fq_nocodel_1000]
		inherits = fq_codel
		qdisc_args = limit 1000 noecn target 100s
		qdisc_args_up = ${qdisc_args}
		qdisc_label = fq_nocodel

		[Arg::ared]
		inherits = global
		qdisc_name = red
		ared_args_up = min 3125
		ared_args_down = min 3125
		ared_args_up = min 12500
		ared_args_down = min 12500
		qdisc_args = limit 1514000 avpkt 1514 adaptive harddrop
		qdisc_args_up = ${qdisc_args} bandwidth ${rate_up} ${ared_args_up}
		qdisc_args_down = ${qdisc_args} bandwidth ${rate_down} ${ared_args_down}
		@@ -260,9 +314,14 @@ qdisc_args = limit 127
		inherits = global
		qdisc_name = pfifo_fast
		qdisc_args = limit 1000
		qdisc_label = pfifo_fast(1000)
		qdisc_label = pfifo_fast_1000

		[Arg::sfq]
		inherits = global
		qdisc_name = sfq
		qdisc_args =

		[Arg::sfq_1000]
		inherits = global
		qdisc_name = sfq
		qdisc_args = limit 1000