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

@ -61,7 +61,7 @@ using namespace logging;
WriterBackend::WriterBackend(WriterFrontend* arg_frontend) : MsgThread()
{
path = "<not set>";
path = "<path not yet set>";
num_fields = 0;
fields = 0;
buffering = true;
@ -113,7 +113,9 @@ bool WriterBackend::Init(string arg_path, int arg_num_fields, const Field* const
num_fields = arg_num_fields;
fields = arg_fields;
SetName(frontend->Name());
string name = Fmt("%s/%s", path.c_str(), frontend->Name().c_str());
SetName(name);
if ( ! DoInit(arg_path, arg_num_fields, arg_fields) )
{
@ -233,6 +235,8 @@ bool WriterBackend::Finish()
bool WriterBackend::DoHeartbeat(double network_time, double current_time)
{
MsgThread::DoHeartbeat(network_time, current_time);
SendOut(new FlushWriteBufferMessage(frontend));
return true;