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

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

View file

@ -139,6 +139,12 @@ public:
*/
bool Flush(EnumVal* id);
/**
* Prepares the log manager to terminate. This will flush all log
* stream.
*/
void Terminate();
protected:
friend class WriterFrontend;
friend class RotationFinishedMessage;
@ -146,7 +152,7 @@ protected:
friend class ::RotationTimer;
// Instantiates a new WriterBackend of the given type (note that
// doing so creates a new thread!).
// doing so creates a new thread!).
WriterBackend* CreateBackend(WriterFrontend* frontend, bro_int_t type);
//// Function also used by the RemoteSerializer.