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/jsiwek/val_mgr'

Browse source 
* origin/topic/jsiwek/val_mgr:
  Pre-allocate and re-use Vals for bool, int, count, enum and empty string
  Preallocate booleans and small counts

I added a tiny change to CompHash to make sure that nothing messes this
up in the future.
This commit is contained in:
Johanna Amann 2019-01-18 15:17:34 -08:00
commit d4f7dae768
136 changed files with 1924 additions and 1776 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/broker/Manager.cc
View file

@ -1212,14 +1212,14 @@ void Manager::ProcessStatus(broker::status stat)
if ( ctx->network )
{
network_info->Assign(0, new StringVal(ctx->network->address.data()));
network_info->Assign(1, port_mgr->Get(ctx->network->port, TRANSPORT_TCP));
network_info->Assign(1, val_mgr->GetPort(ctx->network->port, TRANSPORT_TCP));
}
else
{
// TODO: are there any status messages where the ctx->network
// is not set and actually could be?
network_info->Assign(0, new StringVal("<unknown>"));
network_info->Assign(1, port_mgr->Get(0, TRANSPORT_TCP));
network_info->Assign(1, val_mgr->GetPort(0, TRANSPORT_TCP));
}
endpoint_info->Assign(1, network_info);
@ -1310,7 +1310,7 @@ void Manager::ProcessError(broker::error err)
}
auto vl = new val_list;
vl->append(new EnumVal(ec, BifType::Enum::Broker::ErrorCode));
vl->append(BifType::Enum::Broker::ErrorCode->GetVal(ec));
vl->append(new StringVal(msg));
mgr.QueueEvent(Broker::error, vl);
}