Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix how Broker/CAF sleep duration options are set

Browse source 
With CAF 0.17.0, these are now reporting an incorrect option name
was being used.
This commit is contained in:
Jon Siwek 2019-08-02 11:30:52 -07:00
parent 6fa0f4ac49
commit b3884de2e5
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CHANGES
View file

@ -1,4 +1,18 @@
2.6-747 | 2019-08-02 11:30:52 -0700
* Fix how Broker/CAF sleep duration options are set (Jon Siwek, Corelight)
* Add duration thresholding to the conn-size analyzer. (Johanna Amann, Corelight)
Now, in addition to setting thresholds for bytes and packet, one can set
a threshold for connection duration. Note that the threshold event is
only raised once the next packet in the connection is seen.
This also fixes a small pre-existing bug, in which a bunch of warnings
were raised if someone just used the lower-level functions without going
through the higher-level scripting API.
2.6-744 | 2019-08-01 13:33:12 -0700 2.6-744 | 2019-08-01 13:33:12 -0700
* Guarantee unique internal name for each lambda function * Guarantee unique internal name for each lambda function

2
VERSION
View file

@ -1 +1 @@
2.6-744 2.6-747

8
src/broker/Manager.cc
View file

@ -195,11 +195,11 @@ void Manager::InitPostScript()
config.set("scheduler.max-threads", config.set("scheduler.max-threads",
get_option("Broker::max_threads")->AsCount()); get_option("Broker::max_threads")->AsCount());
config.set("work-stealing.moderate-sleep-duration-us", config.set("work-stealing.moderate-sleep-duration", caf::timespan(
static_cast<unsigned>(get_option("Broker::moderate_sleep")->AsInterval() / Microseconds)); static_cast<unsigned>(get_option("Broker::moderate_sleep")->AsInterval() * 1e9)));
config.set("work-stealing.relaxed-sleep-duration-us", config.set("work-stealing.relaxed-sleep-duration", caf::timespan(
static_cast<unsigned>(get_option("Broker::relaxed_sleep")->AsInterval() / Microseconds)); static_cast<unsigned>(get_option("Broker::relaxed_sleep")->AsInterval() * 1e9)));
config.set("work-stealing.aggressive-poll-attempts", config.set("work-stealing.aggressive-poll-attempts",
get_option("Broker::aggressive_polls")->AsCount()); get_option("Broker::aggressive_polls")->AsCount());