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

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

Browse source 
Conflicts:
	src/threading/Manager.h
This commit is contained in:
Bernhard Amann 2012-03-30 09:24:46 -07:00
commit e789724935
6 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/threading/Manager.h
View file

@ -124,9 +124,8 @@ protected:
*/
virtual const char* Tag() { return "threading::Manager"; }
static const int HEART_BEAT_INTERVAL = 10;
private:
int heart_beat_interval;
typedef std::list<BasicThread*> all_thread_list;
all_thread_list all_threads;