Merge remote-tracking branch 'origin/topic/awelzel/few-more-microbenc…

…hmarks'

* origin/topic/awelzel/few-more-microbenchmarks:
  microbenchmarks: Add record-ops/connection-create
  Update README.md / Makefile
  microbenchmarks: Add table-ops/create.zeek

ci-based/Makefile

@@ -20,3 +20,12 @@ down:
 .PHONY:
 tail-logs:
 	docker-compose logs --follow --tail=100
+
+.PHONY:
+prepare-local-testing: zeek-benchmarker-zeek-runner
+	mkdir -p ./persistent
+	mkdir -p ./testing/builds
+	for v in test_data broker_test_data zeek_install_data app_spool_data ; do \
+		mkdir -p $$(pwd)/testing/volumes/$${v} ; \
+		docker volume create --driver local --opt type=none --opt device=$$(pwd)/testing/volumes/$${v} --opt o=bind $${v} ; \
+	done

ci-based/README.md

@@ -17,6 +17,9 @@ It uses Docker for privilege separation when running the benchmark scripts.
    - zeek_install_data (volume): A volume holding the Zeek installation
    - app_spool_data (volume): Volume holding data while working on jobs.
 
+   As a shortcut, run ``make prepare-local-testing``. This will setup the
+   volumes pointing into ``./testing/volumes/<volume name>``.
+
 2. Create the necessary container images by running the following.
 
     sudo docker-compose build

ci-based/config-tests.yml

@@ -50,6 +50,15 @@ ZEEK_TESTS:
     bench_command: /benchmarker/scripts/tiny-benchmark.sh
     bench_args: -D test-all-policy microbenchmarks/misc/zeek-version.zeek
 
+  - id: micro-record-ops-connection-create
+    bench_command: /benchmarker/scripts/tiny-benchmark.sh
+    bench_args: -D -b microbenchmarks/record-ops/connection-create.zeek
+
+  # Same as above, but not bare and load test-all-policy, too.
+  - id: micro-record-ops-connection-create-all-policy
+    bench_command: /benchmarker/scripts/tiny-benchmark.sh
+    bench_args: -D test-all-policy microbenchmarks/record-ops/connection-create.zeek
+
   - id: micro-vector-ops-simple-value
     bench_command: /benchmarker/scripts/tiny-benchmark.sh
     bench_args: -D -b microbenchmarks/vector-ops/simple-value.zeek
@@ -58,6 +67,10 @@ ZEEK_TESTS:
     bench_command: /benchmarker/scripts/tiny-benchmark.sh
     bench_args: -D -b microbenchmarks/vector-ops/complex-value.zeek
 
+  - id: micro-table-ops-create
+    bench_command: /benchmarker/scripts/tiny-benchmark.sh
+    bench_args: -D -b microbenchmarks/table-ops/create.zeek
+
   - id: micro-table-ops-simple-key-value
     bench_command: /benchmarker/scripts/tiny-benchmark.sh
     bench_args: -D -b microbenchmarks/table-ops/simple-key-value.zeek

ci-based/scripts/microbenchmarks/record-ops/connection-create.zeek

@@ -0,0 +1,32 @@
+global n = 5000000;
+
+global ts = double_to_time(42.0);
+global history = "ShADafF";
+global uid = "C23890741";
+
+event zeek_init()
+	{
+	local i = 0;
+	local s = 0;
+	while ( i < n )
+		{
+		local c: connection = connection(
+			$start_time=ts,
+			$duration=1sec,
+			$history=history,
+			$uid=uid,
+		);
+		c$orig = endpoint($size=i, $state=TCP_CLOSED, $flow_label=0);
+		c$resp = endpoint($size=i*2, $state=TCP_CLOSED, $flow_label=0);
+		c$tunnel = vector();
+
+		s += c$orig$size;
+		s += c$resp$size;
+		s += |c$service|;
+		s += |c$tunnel|;
+
+		++i;
+		}
+
+	print i, s;
+	}

ci-based/scripts/microbenchmarks/table-ops/create.zeek

@@ -0,0 +1,19 @@
+global tbl: table[count] of count;
+global tbl_nested: table[count, count] of table[count] of count;
+global n = 5000000;
+
+event zeek_init()
+	{
+	local i = 0;
+	local s = 0;
+	while ( i < n )
+		{
+		tbl = table([i] = i);
+		tbl_nested = table([i, i] = table([i] = i));
+		tbl_nested[s, s] = table([s] = s);
+		s += (|tbl| + |tbl_nested|);
+		++i;
+		}
+
+	print i, s;
+	}