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

Small fixes and tweaks.

Browse source 
- Fixing tiny leak.

    - Fixing threads stat output.
This commit is contained in:
Robin Sommer 2012-03-16 09:11:31 -07:00
parent 89a3bb33c8
commit e3f5cbb670
3 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/logging/Manager.cc
View file

@ -677,11 +677,11 @@ bool Manager::Write(EnumVal* id, RecordVal* columns)
Val* path_arg;
if ( filter->path_val )
path_arg = filter->path_val;
path_arg = filter->path_val->Ref();
else
path_arg = new StringVal("");
vl.append(path_arg->Ref());
vl.append(path_arg);
Val* rec_arg;
BroType* rt = filter->path_func->FType()->Args()->FieldType("rec");
@ -715,7 +715,6 @@ bool Manager::Write(EnumVal* id, RecordVal* columns)
if ( ! filter->path_val )
{
Unref(path_arg);
filter->path = v->AsString()->CheckString();
filter->path_val = v->Ref();
}

6
src/threading/Manager.cc
View file

@ -102,9 +102,8 @@ void Manager::Process()
next_beat = 0;
}
if ( ! t->HasOut() )
continue;
while ( t->HasOut() )
{
Message* msg = t->RetrieveOut();
if ( msg->Process() )
@ -122,6 +121,7 @@ void Manager::Process()
delete msg;
}
}
// fprintf(stderr, "P %.6f %.6f do_beat=%d did_process=%d next_next=%.6f\n", network_time, timer_mgr->Time(), do_beat, (int)did_process, next_beat);
}

4
src/threading/MsgThread.cc
View file

@ -281,7 +281,7 @@ void MsgThread::GetStats(Stats* stats)
{
stats->sent_in = cnt_sent_in;
stats->sent_out = cnt_sent_out;
stats->pending_in = cnt_sent_in - queue_in.Size();
stats->pending_out = cnt_sent_out - queue_out.Size();
stats->pending_in = queue_in.Size();
stats->pending_out = queue_out.Size();
}