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

Merge remote-tracking branch 'origin/topic/timw/lazy-allocate-id-option-handlers'

Browse source 
* origin/topic/timw/lazy-allocate-id-option-handlers:
  Move ID::type in structure to fill memory padding
  Use sorted forward_list instead of multimap for ID option change handlers
This commit is contained in:
Tim Wojtulewicz 2025-07-28 13:57:18 -07:00
commit 8aeaed69c5
4 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,9 @@
8.0.0-dev.763 | 2025-07-28 13:57:18 -0700
* Move ID::type in structure to fill memory padding (Tim Wojtulewicz, Corelight)
* Use sorted forward_list instead of multimap for ID option change handlers (Tim Wojtulewicz, Corelight)
8.0.0-dev.760 | 2025-07-28 13:12:47 -0700 8.0.0-dev.760 | 2025-07-28 13:12:47 -0700
* Remove intermediate cipher vectors in ssl-analyzer.pac (Tim Wojtulewicz, Corelight) * Remove intermediate cipher vectors in ssl-analyzer.pac (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.760 8.0.0-dev.763

12
src/ID.cc
View file

@ -576,14 +576,16 @@ void ID::UpdateValID() {
} }
#endif #endif
void ID::AddOptionHandler(FuncPtr callback, int priority) { option_handlers.emplace(priority, std::move(callback)); } void ID::AddOptionHandler(FuncPtr callback, int priority) {
option_handlers.emplace_front(priority, callback);
option_handlers.sort(
[](const OptionHandler& left, const OptionHandler& right) { return left.first < right.first; });
}
std::vector<Func*> ID::GetOptionHandlers() const { std::vector<Func*> ID::GetOptionHandlers() const {
// multimap is sorted // It might be worth caching this if we expect it to be called a lot...
// It might be worth caching this if we expect it to be called
// a lot...
std::vector<Func*> v; std::vector<Func*> v;
for ( auto& element : option_handlers ) for ( const auto& element : option_handlers )
v.push_back(element.second.get()); v.push_back(element.second.get());
return v; return v;
} }

7
src/ID.h
View file

@ -2,7 +2,7 @@
#pragma once #pragma once
#include <map> #include <forward_list>
#include <string> #include <string>
#include <string_view> #include <string_view>
#include <unordered_set> #include <unordered_set>
@ -157,9 +157,9 @@ protected:
#endif #endif
const char* name; const char* name;
TypePtr type;
IDScope scope; IDScope scope;
bool is_export; bool is_export;
TypePtr type;
bool is_capture = false; bool is_capture = false;
bool is_const = false; bool is_const = false;
bool is_enum_const = false; bool is_enum_const = false;
@ -172,7 +172,8 @@ protected:
AttributesPtr attrs; AttributesPtr attrs;
// contains list of functions that are called when an option changes // contains list of functions that are called when an option changes
std::multimap<int, FuncPtr> option_handlers; using OptionHandler = std::pair<int, FuncPtr>;
std::forward_list<OptionHandler> option_handlers;
// Information managed by script optimization. We package this // Information managed by script optimization. We package this
// up into a separate object for purposes of modularity, and, // up into a separate object for purposes of modularity, and,