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

Fixing threads' DoFinish() method.

Browse source 
It wasn't called reliably. Now, it's always called before the thread
is destroyed (assuming processing has went normally so far).
This commit is contained in:
Robin Sommer 2012-04-03 22:12:44 -07:00
parent 6e7faafdb7
commit 99e3c58494
2 changed files with 50 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/threading/MsgThread.h
View file

@ -171,6 +171,8 @@ public:
protected:
friend class Manager;
friend class HeartbeatMessage;
friend class FinishMessage;
friend class FinishedMessage;
/**
* Pops a message sent by the child from the child-to-main queue.
@ -215,6 +217,12 @@ protected:
*/
virtual bool DoHeartbeat(double network_time, double current_time);
/** Triggered for execution in the child thread just before shutting threads down.
* The child thread shoudl finish its operations and then *must*
* call this class' implementation.
*/
virtual bool DoFinish();
private:
/**
* Pops a message sent by the main thread from the main-to-chold
@ -270,6 +278,8 @@ private:
uint64_t cnt_sent_in; // Counts message sent to child.
uint64_t cnt_sent_out; // Counts message sent by child.
bool finished; // Set to true by Finished message.
};
/**