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

cluster/Telemetry: Cache CallExpr locations

Browse source
This commit is contained in:
Arne Welzel 2025-06-26 17:51:22 +02:00
parent be8b4747c4
commit 73e55fa909
1 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/cluster/Telemetry.cc
View file

@ -127,28 +127,44 @@ void VerboseTelemetry::OnIncomingEvent(std::string_view topic, std::string_view
namespace { namespace {
std::string determine_script_location() {
std::string result = "none";
if ( zeek::detail::call_stack.empty() ) // Cached lookup of a script location.
return result; std::string_view determine_script_location() {
// Global cache for CallExpr pointers to their location.
static std::map<const zeek::detail::CallExpr*, std::string> location_cache;
ssize_t sidx = static_cast<ssize_t>(zeek::detail::call_stack.size()) - 1; ssize_t sidx = static_cast<ssize_t>(zeek::detail::call_stack.size()) - 1;
while ( sidx >= 0 ) { while ( sidx >= 0 ) {
const auto* func = zeek::detail::call_stack[sidx].func; const auto* func = zeek::detail::call_stack[sidx].func;
const auto* ce = zeek::detail::call_stack[sidx].call; const auto* ce = zeek::detail::call_stack[sidx].call;
// without_zeekpath_component looks pretty expensive and might be // Cached?
// better to cache the result using the ce pointer instead of computing if ( auto it = location_cache.find(ce); it != location_cache.end() )
// it over and over again. return it->second;
// Future: Ignore wrapper functions if we ever come across some.
// We only care about Broker::publish() and Cluster::publish() and
// these aren't wrapped, so currently nothing to do here.
//
// if ( ignore func ) {
// --sidx;
// continue;
// }
//
// Check Func.cc::emit_builtin_error_common() for inspiration how to
// remove wrapper function.
const auto* loc = ce->GetLocationInfo(); const auto* loc = ce->GetLocationInfo();
std::string normalized_location = zeek::util::detail::without_zeekpath_component(loc->filename); std::string normalized_location = zeek::util::detail::without_zeekpath_component(loc->filename);
result = normalized_location + ":" + std::to_string(loc->first_line); normalized_location.append(":");
break; normalized_location.append(std::to_string(loc->first_line));
auto [it, inserted] = location_cache.emplace(ce, std::move(normalized_location));
assert(inserted);
return it->second;
} }
return result; return "none";
} }
} // namespace } // namespace
@ -194,11 +210,10 @@ DebugTelemetry::DebugTelemetry(TopicNormalizer topic_normalizer, std::string_vie
void DebugTelemetry::OnOutgoingEvent(std::string_view topic, std::string_view handler_name, void DebugTelemetry::OnOutgoingEvent(std::string_view topic, std::string_view handler_name,
const SerializationInfo& info) { const SerializationInfo& info) {
auto normalized_topic = topic_normalizer(topic); auto normalized_topic = topic_normalizer(topic);
std::string script_location = determine_script_location();
labels_view[topic_idx].second = normalized_topic; labels_view[topic_idx].second = normalized_topic;
labels_view[handler_idx].second = handler_name; labels_view[handler_idx].second = handler_name;
labels_view[script_location_idx].second = script_location; labels_view[script_location_idx].second = determine_script_location();
const auto& hist = out->GetOrAdd(labels_view); const auto& hist = out->GetOrAdd(labels_view);
hist->Observe(static_cast<double>(info.Size())); hist->Observe(static_cast<double>(info.Size()));