Commit graph

16305 commits

Author SHA1 Message Date
Vern Paxson
ecf42e11c7 tie into updates to gen-zam 2024-03-19 10:59:49 -07:00
Vern Paxson
593355cf2c ZAM documentation updated to reflect finer-grained profiling 2024-03-19 10:59:49 -07:00
Vern Paxson
0538c68221 ZAM-specific BTest baseline changes for tweak to how ZAM bodies print 2024-03-19 10:59:49 -07:00
Vern Paxson
378627448d BTest baseline changes for tweak to how ZAM bodies print 2024-03-19 10:59:49 -07:00
Vern Paxson
c29db63fdd ZAM execution changes to support richer profiling 2024-03-19 10:59:49 -07:00
Vern Paxson
c8d15f1eaa use richer block-aware location information for ZAM instructions 2024-03-19 10:59:49 -07:00
Vern Paxson
9f9f01580f better isolation of ZAM instruction elements
hooks for tracking extended ZAM profiling location
2024-03-19 10:59:49 -07:00
Vern Paxson
dc376953fa framework for --enable-ZAM-profiling configuration
profiles go to zprof.log rather than stdout
2024-03-19 10:59:49 -07:00
Vern Paxson
8d762eea54 ZAM classes in support of finer-grained profiling 2024-03-19 10:59:49 -07:00
Vern Paxson
037f76e384 refined ZAM function profiling to include (correct) statement line number blocks 2024-03-19 10:59:49 -07:00
Vern Paxson
f88862f6ce avoid potentially expensive mallinfo() call if result won't be used 2024-03-19 10:59:49 -07:00
Tim Wojtulewicz
5402f22d48 Merge remote-tracking branch 'origin/topic/timw/fix-std-function-stmt'
* origin/topic/timw/fix-std-function-stmt:
  Remove variant from StdFunctionStmt
2024-03-19 10:59:31 -07:00
Tim Wojtulewicz
9de1dd16d5 Remove variant from StdFunctionStmt
The variant ended up conflicting with std::bind, which resulted in failures
on the btest invoking it. Change back to a single function that takes a
flow, and default it to a value in Exec.
2024-03-19 09:07:45 -07:00
Tim Wojtulewicz
8bfe32e931 Merge remote-tracking branch 'origin/topic/timw/std-function-event-handler'
* origin/topic/timw/std-function-event-handler:
  Add a method to register an event handler to a std::function via C++
2024-03-18 16:38:14 -07:00
Tim Wojtulewicz
39890fda5e Add a method to register an event handler to a std::function via C++ 2024-03-18 16:36:25 -07:00
Tim Wojtulewicz
aac723cfe5 Merge remote-tracking branch 'origin/topic/neverlord/broker-bump'
* origin/topic/neverlord/broker-bump:
  Update Broker submodule
2024-03-18 16:16:18 -07:00
Dominik Charousset
015fddd8a1 Update Broker submodule 2024-03-18 15:39:48 -07:00
Arne Welzel
fe91b7f51f Merge remote-tracking branch 'origin/topic/awelzel/remove-superflous-aws-ecr-username'
* origin/topic/awelzel/remove-superflous-aws-ecr-username:
  cirrus: Remove misleading and always empty AWS_ECR_USERNAME
2024-03-18 10:59:21 +01:00
Arne Welzel
bbeb1bf3d9 cirrus: Remove misleading and always empty AWS_ECR_USERNAME 2024-03-18 10:46:59 +01:00
Arne Welzel
a45489de90 Merge remote-tracking branch 'origin/topic/awelzel/3442-evt-port-deprecation'
* origin/topic/awelzel/3442-evt-port-deprecation:
  btest/spicy: Remove most port usages
  spicy: Deprecate port/ports in .evt files
2024-03-18 10:07:54 +01:00
Arne Welzel
f83a1e9109 Merge remote-tracking branch 'origin/topic/awelzel/generate-docs-spicy-pygments-use-cached'
* origin/topic/awelzel/generate-docs-spicy-pygments-use-cached:
  Update doc submodule
2024-03-18 09:55:07 +01:00
Arne Welzel
9bd7c5751a Update doc submodule
For spicy-pygments.py sync.
2024-03-18 09:40:30 +01:00
Arne Welzel
766ed8ab82 github/generate-docs: Only commit if there are staged changes
git diff-index by default includes staged and non-staged changes.
The autogen-spicy-docs script copies over spicy-pygments.py from
the Spicy tree into doc/ext.

The job would attempt to commit scripts and script-reference even
though nothing actually is staged when a spurious diff existed in
ext/spicy-pygments.py. Guard from this by using --cached.
2024-03-18 09:35:28 +01:00
Robin Sommer
139562eb8d
Merge remote-tracking branch 'origin/topic/robin/binary-build-fix'
* origin/topic/robin/binary-build-fix:
  Add a CI test with the same options as we used for binary builds.
  Fix binary build of `spicyz`.
2024-03-16 11:15:33 +01:00
Robin Sommer
c6193658a2
Merge remote-tracking branch 'origin/topic/robin/bump-spicy-raw-pointers'
* origin/topic/robin/bump-spicy-raw-pointers:
  Bump Spicy to latest version reworking AST memory management.
2024-03-16 11:14:12 +01:00
Robin Sommer
977d9190f1
Bump Spicy to latest version reworking AST memory management.
Includes the necessary Zeek-side changes.

Goes with https://github.com/zeek/spicy/pull/1691.
2024-03-16 10:15:49 +01:00
Christian Kreibich
c3caa4f6c3 Merge remote-tracking branch 'origin/topic/timw/ci-remove-centos7-debian10'
* origin/topic/timw/ci-remove-centos7-debian10:
  CI: Remove CentOS 7 and Debian 10 builds
2024-03-15 13:15:16 -07:00
Arne Welzel
62928ddb61 btest/spicy: Remove most port usages 2024-03-15 17:36:11 +01:00
Arne Welzel
54f9b76f8e spicy: Deprecate port/ports in .evt files 2024-03-15 17:36:11 +01:00
Arne Welzel
d51613a7b2 Merge remote-tracking branch 'origin/topic/awelzel/fix-cluster-testing-docker-compose-v2'
* origin/topic/awelzel/fix-cluster-testing-docker-compose-v2:
  testing/external/cluster: Switch to docker-compose v2
2024-03-15 13:37:20 +01:00
Arne Welzel
de7292e5f0 testing/external/cluster: Switch to docker-compose v2
The Python docker-compose executable in the docker_builder image is not
functional anymore (TypeError: kwargs_from_env() got an unexpected
keyword argument 'ssl_version').

docker-compose v1 has been sun-setted for quite some time. Do the
minimal to switch to docker compose v2.
2024-03-15 13:19:03 +01:00
Johanna Amann
2745476d13
Add a CI test with the same options as we used for binary builds.
We already do have a test that check static builds, but none that tests
the exact same build flags we use for binary builds on OBS. This commit
fixes this oversight.

Related to GH-3647
2024-03-15 09:50:57 +01:00
Tim Wojtulewicz
17ad726321 CI: Remove CentOS 7 and Debian 10 builds 2024-03-14 13:28:54 -07:00
Robin Sommer
64761527ce
Fix binary build of spicyz.
We need to link against the Spicy toolchain's object libraries but
were linking against static libraries instead.

Closes #3647.
2024-03-14 18:24:51 +01:00
Tim Wojtulewicz
6fa34c202f Merge remote-tracking branch 'origin/topic/christian/news-contributors'
* origin/topic/christian/news-contributors:
  Add community contributions for the 6.2 timeframe to NEWS. [skip ci]
2024-03-13 10:17:59 -07:00
Christian Kreibich
af83f1f1a3 Add community contributions for the 6.2 timeframe to NEWS. [skip ci] 2024-03-12 20:19:52 -07:00
zeek-bot
672eb0dc2c Update doc submodule [nomail] [skip ci] 2024-03-13 00:10:12 +00:00
Arne Welzel
2d1588277e Merge remote-tracking branch 'origin/topic/awelzel/3640-void-size-expr-assign-stmt'
* origin/topic/awelzel/3640-void-size-expr-assign-stmt:
  Expr: Handle TYPE_VOID in SizeExpr and AssignExpr::Typecheck()
2024-03-12 10:31:46 +01:00
Arne Welzel
bbc7272a42 Merge remote-tracking branch 'origin/topic/vern/script-opt-maint.Mar24'
* origin/topic/vern/script-opt-maint.Mar24:
  AST location fixes for -O gen-C++
  script optimization support for clearing tables/vectors using "delete"
  fix for ZAM printing of instructions that modify slots other than slot 1
  fixed bug where appending an empty vector to a vector-of-vector's had no effect
2024-03-08 19:10:13 +01:00
Vern Paxson
99f43d3c8b AST location fixes for -O gen-C++ 2024-03-08 19:09:46 +01:00
Vern Paxson
74d36eb759 script optimization support for clearing tables/vectors using "delete" 2024-03-08 19:09:46 +01:00
Vern Paxson
ce6d77e2ce fix for ZAM printing of instructions that modify slots other than slot 1 2024-03-08 19:09:46 +01:00
Vern Paxson
54877e9dec fixed bug where appending an empty vector to a vector-of-vector's had no effect 2024-03-08 19:09:43 +01:00
Arne Welzel
8cb1a1518f Expr: Handle TYPE_VOID in SizeExpr and AssignExpr::Typecheck()
@vpax reported surprising behavior when working with "void values".
While these are not exposed to script land, plumb the places he
pointed out are causing confusing behavior.

Closes #3640.
2024-03-07 11:24:28 +01:00
Robin Sommer
8b214862c5
Merge remote-tracking branch 'origin/topic/robin/bump-spicy'
* origin/topic/robin/bump-spicy:
  Bump Spicy.
2024-03-07 09:56:03 +01:00
Robin Sommer
732a3e1d9a
Bump Spicy. 2024-03-07 09:08:44 +01:00
Arne Welzel
eeeaffb42c Merge remote-tracking branch 'origin/topic/jgras/fix-cluster-started-btesting'
* origin/topic/jgras/fix-cluster-started-btesting:
  Make worker restart in cluster btest race-proof
2024-03-06 10:39:05 +01:00
Jan Grashoefer
08daef8d42 Make worker restart in cluster btest race-proof 2024-03-05 23:10:18 +01:00
Arne Welzel
3734adef2d Merge remote-tracking branch 'origin/topic/awelzel/bump-highwayhash'
* origin/topic/awelzel/bump-highwayhash:
  highwayhash: Point to github.com/google/highwayhash, bump to master
2024-03-05 19:23:38 +01:00
Arne Welzel
09ad9b193a Merge remote-tracking branch 'origin/topic/awelzel/re-compile-syntax-error-propagation'
* origin/topic/awelzel/re-compile-syntax-error-propagation:
  RE/Specific_RE_Matcher: Make Compile() return false for syntax errors
2024-03-05 19:22:46 +01:00