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

Merge remote-tracking branch 'origin/fastpath'

Browse source 
* origin/fastpath:
  Change Input::update_finished lookup to happen at init time.
  Fix format specifier on RemoteSerializer::Connect.
This commit is contained in:
Robin Sommer 2012-05-31 14:27:36 -07:00
commit 36de4bf3f3
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/RemoteSerializer.cc
View file

@ -700,7 +700,8 @@ RemoteSerializer::PeerID RemoteSerializer::Connect(const IPAddr& ip,
const size_t BUFSIZE = 1024; const size_t BUFSIZE = 1024;
char* data = new char[BUFSIZE]; char* data = new char[BUFSIZE];
snprintf(data, BUFSIZE, "%"PRIu64",%s,%s,%"PRIu16",%"PRIu32",%d", p->id, snprintf(data, BUFSIZE,
"%"PRI_PTR_COMPAT_UINT",%s,%s,%"PRIu16",%"PRIu32",%d", p->id,
ip.AsString().c_str(), zone_id.c_str(), port, uint32(retry), ip.AsString().c_str(), zone_id.c_str(), port, uint32(retry),
use_ssl); use_ssl);

7
src/input/Manager.cc
View file

@ -194,6 +194,7 @@ Manager::TableStream::~TableStream()
Manager::Manager() Manager::Manager()
{ {
update_finished = internal_handler("Input::update_finished");
} }
Manager::~Manager() Manager::~Manager()
@ -1199,11 +1200,7 @@ void Manager::EndCurrentSend(ReaderFrontend* reader)
#endif #endif
// Send event that the current update is indeed finished. // Send event that the current update is indeed finished.
EventHandler* handler = event_registry->Lookup("Input::update_finished"); SendEvent(update_finished, 2, new StringVal(i->name.c_str()), new StringVal(i->source.c_str()));
if ( handler == 0 )
reporter->InternalError("Input::update_finished not found!");
SendEvent(handler, 2, new StringVal(i->name.c_str()), new StringVal(i->source.c_str()));
} }
void Manager::Put(ReaderFrontend* reader, Value* *vals) void Manager::Put(ReaderFrontend* reader, Value* *vals)

2
src/input/Manager.h
View file

@ -184,6 +184,8 @@ private:
enum StreamType { TABLE_STREAM, EVENT_STREAM }; enum StreamType { TABLE_STREAM, EVENT_STREAM };
map<ReaderFrontend*, Stream*> readers; map<ReaderFrontend*, Stream*> readers;
EventHandlerPtr update_finished;
}; };