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

GH-572: Mark MemoryAllocation() and related methods deprecated

Browse source
This commit is contained in:
Tim Wojtulewicz 2021-05-26 12:42:44 -07:00
parent e6e41ac5d9
commit a7fd34375f
31 changed files with 158 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Conn.cc
View file

@ -381,17 +381,23 @@ void Connection::FlipRoles()
unsigned int Connection::MemoryAllocation() const
{
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return session::Session::MemoryAllocation() + padded_sizeof(*this)
+ (timers.MemoryAllocation() - padded_sizeof(timers))
+ (conn_val ? conn_val->MemoryAllocation() : 0)
+ (adapter ? adapter->MemoryAllocation(): 0)
// primary_PIA is already contained in the analyzer tree.
;
#pragma GCC diagnostic pop
}
unsigned int Connection::MemoryAllocationVal() const
{
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return conn_val ? conn_val->MemoryAllocation() : 0;
#pragma GCC diagnostic pop
}
void Connection::Describe(ODesc* d) const