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

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

Browse source
This commit is contained in:
Bernhard Amann 2012-02-13 02:30:24 -08:00
commit 8a6dfee00c
36 changed files with 414 additions and 304 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/logging/WriterFrontend.cc
View file

@ -1,4 +1,6 @@
#include "Net.h"
#include "WriterFrontend.h"
#include "WriterBackend.h"
#include "../threading/SerializationTypes.h"
@ -159,8 +161,8 @@ void WriterFrontend::Write(int num_fields, Value** vals)
write_buffer[write_buffer_pos++] = vals;
if ( write_buffer_pos >= WRITER_BUFFER_SIZE || ! buf )
// Buffer full (or no bufferin desired).
if ( write_buffer_pos >= WRITER_BUFFER_SIZE || ! buf || terminating )
// Buffer full (or no bufferin desired or termiating).
FlushWriteBuffer();
}