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

Merge remote-tracking branch 'origin/topic/johanna/make-tables-slightly-smaller'

Browse source 
* origin/topic/johanna/make-tables-slightly-smaller:
  Remove last_access_time from TableEntryVal.
This commit is contained in:
Jon Siwek 2020-06-19 13:25:02 -07:00
commit 94ba6303f3
4 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGES
View file

@ -1,4 +1,11 @@
3.2.0-dev.798 | 2020-06-19 13:25:02 -0700
* Remove last_access_time from TableEntryVal. (Johanna Amann, Corelight)
Turns out - this was no longer used. And it takes up at least 8 bytes
of space for every single table/set entry.
3.2.0-dev.796 | 2020-06-18 20:40:59 +0000 3.2.0-dev.796 | 2020-06-18 20:40:59 +0000
* cmake: Make musl support more distro agnostic (Andrew Benson) * cmake: Make musl support more distro agnostic (Andrew Benson)

2
VERSION
View file

@ -1 +1 @@
3.2.0-dev.796 3.2.0-dev.798

1
src/Val.cc
View file

@ -1307,7 +1307,6 @@ unsigned int ListVal::MemoryAllocation() const
TableEntryVal* TableEntryVal::Clone(Val::CloneState* state) TableEntryVal* TableEntryVal::Clone(Val::CloneState* state)
{ {
auto rval = new TableEntryVal(val ? val->Clone(state) : nullptr); auto rval = new TableEntryVal(val ? val->Clone(state) : nullptr);
rval->last_access_time = last_access_time;
rval->expire_access_time = expire_access_time; rval->expire_access_time = expire_access_time;
return rval; return rval;
} }

3
src/Val.h
View file

@ -722,7 +722,6 @@ public:
explicit TableEntryVal(IntrusivePtr<Val> v) explicit TableEntryVal(IntrusivePtr<Val> v)
: val(std::move(v)) : val(std::move(v))
{ {
last_access_time = network_time;
expire_access_time = expire_access_time =
int(network_time - bro_start_network_time); int(network_time - bro_start_network_time);
} }
@ -745,8 +744,6 @@ protected:
friend class TableVal; friend class TableVal;
IntrusivePtr<Val> val; IntrusivePtr<Val> val;
double last_access_time;
// The next entry stores seconds since Bro's start. We use ints here // The next entry stores seconds since Bro's start. We use ints here
// to save a few bytes, as we do not need a high resolution for these // to save a few bytes, as we do not need a high resolution for these
// anyway. // anyway.