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

Fix deprecated actor_system_config field usages

Browse source
This commit is contained in:
Jon Siwek 2018-06-26 15:05:23 -05:00
parent 9c0303804d
commit ac495e729b
5 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.5-690 | 2018-06-26 15:05:23 -0500
* Fix deprecated actor_system_config field usages (Corelight)
2.5-689 | 2018-06-26 11:45:52 -0500
* Remove header self-inclusions (Corelight)

2
VERSION
View file

@ -1 +1 @@
2.5-689
2.5-690

2
aux/broker

@ -1 +1 @@
Subproject commit 17fcb73a30388862f0a921040a605ac38f47ff74
Subproject commit 6d5b3c785c3c1e517c4c7596beda23e411edeff2

2
src/3rdparty

@ -1 +1 @@
Subproject commit c78abc8454932019f030045340348560a8ac9b23
Subproject commit 0b10bb2943beaf972ddc494ba34699ed37ef3dbf

10
src/broker/Manager.cc
View file

@ -185,7 +185,7 @@ void Manager::InitPostScript()
auto max_sleep = get_option("Broker::max_sleep")->AsCount();
if ( max_threads )
config.scheduler_max_threads = max_threads;
config.set("scheduler.max-threads", max_threads);
else
{
// On high-core-count systems, spawning one thread per core
@ -193,7 +193,7 @@ void Manager::InitPostScript()
// threads are under-utilized. Related:
// https://github.com/actor-framework/actor-framework/issues/699
if ( reading_pcaps )
config.scheduler_max_threads = 2u;
config.set("scheduler.max-threads", 2u);
else
{
auto hc = std::thread::hardware_concurrency();
@ -203,18 +203,18 @@ void Manager::InitPostScript()
else if ( hc < 4u)
hc = 4u;
config.scheduler_max_threads = hc;
config.set("scheduler.max-threads", hc);
}
}
if ( max_sleep )
config.work_stealing_relaxed_sleep_duration_us = max_sleep;
config.set("work-stealing.relaxed-sleep-duration-us", max_sleep);
else
// 64ms is just an arbitrary amount derived from testing
// the overhead of a unused CAF actor system on a 32-core system.
// Performance was within 2% of baseline timings (w/o CAF)
// when using this sleep duration.
config.work_stealing_relaxed_sleep_duration_us = 64000;
config.set("work-stealing.relaxed-sleep-duration-us", 64000);
bstate = std::make_shared<BrokerState>(std::move(config));
}