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

Merge remote-tracking branch 'origin/topic/robin/log-threads' into topic/bernhard/input-threads

Browse source
This commit is contained in:
Bernhard Amann 2012-03-07 13:43:27 -08:00
commit b31230d429
7 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aux/binpac

@ -1 +1 @@
Subproject commit 43308aab47a3357ca1885e1b6954154a2744d821
Subproject commit 3034da8f082b61157e234237993ffd7a95be6e62

2
aux/bro-aux

@ -1 +1 @@
Subproject commit 139cc2e1e049c4e1cc7e95f20866102be1d3d599
Subproject commit f53bcb2b492cb0db3dd288384040abc2ab711767

2
aux/broccoli

@ -1 +1 @@
Subproject commit d6e36c95e0335f7cc081191c8612085bd12706f9
Subproject commit 2602eb53e70d7f0afae8fac58d7636b9291974a4

2
aux/broctl

@ -1 +1 @@
Subproject commit e908ba686dceb56065bdf569c18dd0f67f662f6b
Subproject commit 954538514d71983e7ef3f0e109960466096e1c1d

2
src/Net.cc
View file

@ -486,6 +486,8 @@ void net_run()
// since Bro timers are not high-precision anyway.)
if ( ! using_communication )
usleep(100000);
else
usleep(1000);
// Flawfinder says about usleep:
//

3
src/threading/Manager.cc
View file

@ -10,7 +10,7 @@ Manager::Manager()
did_process = true;
next_beat = 0;
terminating = false;
idle = false;
idle = true;
}
Manager::~Manager()
@ -58,6 +58,7 @@ void Manager::AddThread(BasicThread* thread)
{
DBG_LOG(DBG_THREADING, "Adding thread %s ...", thread->Name().c_str());
all_threads.push_back(thread);
idle = false;
}
void Manager::AddMsgThread(MsgThread* thread)

4
src/threading/SerialTypes.h
View file

@ -4,6 +4,10 @@
using namespace std;
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include "Type.h"
#include "net_util.h"