mirror of
https://github.com/zeek/zeek.git
synced 2025-10-16 05:28:20 +00:00
0db61f3094
The Zeek code base has very inconsistent #includes. Many sources included a few headers, and those headers included other headers, and in the end, nearly everything is included everywhere, so missing #includes were never noticed. Another side effect was a lot of header bloat which slows down the build. First step to fix it: in each source file, its own header should be included first to verify that each header's includes are correct, and none is missing. After adding the missing #includes, I replaced lots of #includes inside headers with class forward declarations. In most headers, object pointers are never referenced, so declaring the function prototypes with forward-declared classes is just fine. This patch speeds up the build by 19%, because each compilation unit gets smaller. Here are the "time" numbers for a fresh build (with a warm page cache but without ccache): Before this patch: 3144.94user 161.63system 3:02.87elapsed 1808%CPU (0avgtext+0avgdata 2168608maxresident)k 760inputs+12008400outputs (1511major+57747204minor)pagefaults 0swaps After this patch: 2565.17user 141.83system 2:25.46elapsed 1860%CPU (0avgtext+0avgdata 1489076maxresident)k 72576inputs+9130920outputs (1667major+49400430minor)pagefaults 0swaps
85 lines
1.8 KiB
C++
85 lines
1.8 KiB
C++
// See the file "COPYING" in the main distribution directory for copyright.
|
|
|
|
#include "Notifier.h"
|
|
#include "DebugLogger.h"
|
|
|
|
#include <set>
|
|
|
|
notifier::Registry notifier::registry;
|
|
|
|
notifier::Receiver::Receiver()
|
|
{
|
|
DBG_LOG(DBG_NOTIFIERS, "creating receiver %p", this);
|
|
}
|
|
|
|
notifier::Receiver::~Receiver()
|
|
{
|
|
DBG_LOG(DBG_NOTIFIERS, "deleting receiver %p", this);
|
|
}
|
|
|
|
notifier::Registry::~Registry()
|
|
{
|
|
while ( registrations.begin() != registrations.end() )
|
|
Unregister(registrations.begin()->first);
|
|
}
|
|
|
|
void notifier::Registry::Register(Modifiable* m, notifier::Receiver* r)
|
|
{
|
|
DBG_LOG(DBG_NOTIFIERS, "registering object %p for receiver %p", m, r);
|
|
|
|
registrations.insert({m, r});
|
|
++m->num_receivers;
|
|
}
|
|
|
|
void notifier::Registry::Unregister(Modifiable* m, notifier::Receiver* r)
|
|
{
|
|
DBG_LOG(DBG_NOTIFIERS, "unregistering object %p from receiver %p", m, r);
|
|
|
|
auto x = registrations.equal_range(m);
|
|
for ( auto i = x.first; i != x.second; i++ )
|
|
{
|
|
if ( i->second == r )
|
|
{
|
|
--i->first->num_receivers;
|
|
registrations.erase(i);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
void notifier::Registry::Unregister(Modifiable* m)
|
|
{
|
|
DBG_LOG(DBG_NOTIFIERS, "unregistering object %p from all notifiers", m);
|
|
|
|
auto x = registrations.equal_range(m);
|
|
for ( auto i = x.first; i != x.second; i++ )
|
|
--i->first->num_receivers;
|
|
|
|
registrations.erase(x.first, x.second);
|
|
}
|
|
|
|
void notifier::Registry::Modified(Modifiable* m)
|
|
{
|
|
DBG_LOG(DBG_NOTIFIERS, "object %p has been modified", m);
|
|
|
|
auto x = registrations.equal_range(m);
|
|
for ( auto i = x.first; i != x.second; i++ )
|
|
i->second->Modified(m);
|
|
}
|
|
|
|
void notifier::Registry::Terminate()
|
|
{
|
|
std::set<Receiver*> receivers;
|
|
|
|
for ( auto& r : registrations )
|
|
receivers.emplace(r.second);
|
|
|
|
for ( auto& r : receivers )
|
|
r->Terminate();
|
|
}
|
|
|
|
notifier::Modifiable::~Modifiable()
|
|
{
|
|
if ( num_receivers )
|
|
registry.Unregister(this);
|
|
}
|