mirror of
https://github.com/zeek/zeek.git
synced 2025-10-12 11:38: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
38 lines
908 B
C++
38 lines
908 B
C++
// See the file "COPYING" in the main distribution directory for copyright.
|
|
|
|
#include "zeek-config.h"
|
|
#include "PacketDumper.h"
|
|
#include "Reporter.h"
|
|
#include "util.h"
|
|
#include "iosource/PktDumper.h"
|
|
|
|
PacketDumper::PacketDumper(pcap_dumper_t* arg_pkt_dump)
|
|
{
|
|
last_timestamp.tv_sec = last_timestamp.tv_usec = 0;
|
|
|
|
pkt_dump = arg_pkt_dump;
|
|
if ( ! pkt_dump )
|
|
reporter->InternalError("PacketDumper: nil dump file");
|
|
}
|
|
|
|
void PacketDumper::DumpPacket(const struct pcap_pkthdr* hdr,
|
|
const u_char* pkt, int len)
|
|
{
|
|
if ( pkt_dump )
|
|
{
|
|
struct pcap_pkthdr h = *hdr;
|
|
h.caplen = len;
|
|
if ( h.caplen > hdr->caplen )
|
|
reporter->InternalError("bad modified caplen");
|
|
|
|
pcap_dump((u_char*) pkt_dump, &h, pkt);
|
|
}
|
|
}
|
|
|
|
void PacketDumper::SortTimeStamp(struct timeval* timestamp)
|
|
{
|
|
if ( time_compare(&last_timestamp, timestamp) > 0 )
|
|
*timestamp = last_timestamp;
|
|
else
|
|
last_timestamp = *timestamp;
|
|
}
|