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/master' into topic/bernhard/input-threads

Browse source 
Conflicts:
	src/CMakeLists.txt
	testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
	testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
This commit is contained in:
Bernhard Amann 2012-05-18 15:26:36 -07:00
commit 3b82d69eb3
167 changed files with 3528 additions and 1066 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/input/ReaderFrontend.cc
View file

@ -35,14 +35,14 @@ public:
virtual bool Process() { return Object()->Update(); }
};
class FinishMessage : public threading::InputMessage<ReaderBackend>
class CloseMessage : public threading::InputMessage<ReaderBackend>
{
public:
FinishMessage(ReaderBackend* backend)
: threading::InputMessage<ReaderBackend>("Finish", backend)
CloseMessage(ReaderBackend* backend)
: threading::InputMessage<ReaderBackend>("Close", backend)
{ }
virtual bool Process() { Object()->Finish(); return true; }
virtual bool Process() { Object()->Close(); return true; }
};
@ -83,7 +83,7 @@ void ReaderFrontend::Update() {
backend->SendIn(new UpdateMessage(backend));
}
void ReaderFrontend::Finish() {
void ReaderFrontend::Close() {
if ( disabled )
return;
@ -92,7 +92,7 @@ void ReaderFrontend::Finish() {
return;
}
backend->SendIn(new FinishMessage(backend));
backend->SendIn(new CloseMessage(backend));
}
string ReaderFrontend::Name() const