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

Remove deprecated MemoryAllocation() methods and related code

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-06-15 14:54:47 -07:00
parent d3169e48c0
commit 70e63d4749
39 changed files with 15 additions and 659 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/session/Manager.cc
View file

@ -269,56 +269,6 @@ void Manager::Weird(const char* name, const IP_Hdr* ip, const char* addl)
reporter->Weird(ip->SrcAddr(), ip->DstAddr(), name, addl);
}
unsigned int Manager::SessionMemoryUsage()
{
unsigned int mem = 0;
if ( run_state::terminating )
// Connections have been flushed already.
return 0;
for ( const auto& entry : session_map )
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
mem += entry.second->MemoryAllocation();
#pragma GCC diagnostic pop
return mem;
}
unsigned int Manager::SessionMemoryUsageVals()
{
unsigned int mem = 0;
if ( run_state::terminating )
// Connections have been flushed already.
return 0;
for ( const auto& entry : session_map )
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
mem += entry.second->MemoryAllocationVal();
#pragma GCC diagnostic pop
return mem;
}
unsigned int Manager::MemoryAllocation()
{
if ( run_state::terminating )
// Connections have been flushed already.
return 0;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return SessionMemoryUsage() + padded_sizeof(*this) +
(session_map.size() * (sizeof(SessionMap::key_type) + sizeof(SessionMap::value_type))) +
zeek::detail::fragment_mgr->MemoryAllocation();
// FIXME: MemoryAllocation() not implemented for rest.
;
#pragma GCC diagnostic pop
}
void Manager::InsertSession(detail::Key key, Session* session)
{
session->SetInSessionTable(true);